From 3f79ec4b58ff9311b0acad8ddccc893215120394 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:50:57 +0000 Subject: [PATCH] lilypond-1.1.55 --- debian/GNUmakefile | 2 +- debian/README.Debian | 7 +++-- debian/changelog | 38 +++++++++++++++++++++++-- debian/control.foka | 6 ++-- debian/copyright | 7 +++-- debian/doc-base | 11 +++++++ debian/postinst | 18 ++++-------- debian/postrm | 5 ++-- debian/preinst | 13 ++------- debian/prerm | 6 ++++ debian/rules | 36 ++++++++++++++--------- stepmake/stepmake/toplevel-targets.make | 3 +- 12 files changed, 100 insertions(+), 52 deletions(-) create mode 100644 debian/doc-base create mode 100644 debian/prerm diff --git a/debian/GNUmakefile b/debian/GNUmakefile index b49c007234..740dafc961 100644 --- a/debian/GNUmakefile +++ b/debian/GNUmakefile @@ -9,7 +9,7 @@ at-dir = $(outdir)/ at-ext = EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES) $(OUT_DIST_FILES) control.foka -CONF_FILES = changelog copyright preinst postinst postrm rules watch +CONF_FILES = changelog copyright doc-base preinst postinst postrm prerm rules watch #OUTCONF_FILES = $(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES) OUTCONF_FILES = $(OUTIN_FILES) OUT_DIST_FILES = $(OUTIN_FILES) diff --git a/debian/README.Debian b/debian/README.Debian index 320703b028..c257da906c 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -8,6 +8,9 @@ Dear music lover: Hope you enjoy producing beautiful music scores with GNU LilyPond and other related packages! ^_^ + Note: + If you experience problems about missing EC fonts during the TeX run, + please make sure you have the tetex-extra package installed. Old LilyPond Fonts Issue: ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -33,8 +36,8 @@ Old LilyPond Fonts Issue: Nonetheless, GNU LilyPond now comes with the standard "feta" fonts, and they are already listed in the latest teTeX 0.9 / Web2C 7.2 - /usr/lib/texmf/fontname/special.map file, so there shouldn't be any + /usr/share/texmf/fontname/special.map file, so there shouldn't be any more problems! Enjoy! :-) -Anthony Fok , Wed, 22 Apr 1998 03:37:00 -0600 +Anthony Fok , Wed, 7 Jul 1999 15:19:48 -0600 diff --git a/debian/changelog b/debian/changelog index 804e47bb20..81437d0d42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,35 @@ -lilypond (1.1.36-1) unstable; urgency=low +lilypond (1.1.53-1) unstable; urgency=low * New upstream release. + * Partially upgraded to standards version 3.0.0: + - Updated copyright to point to /usr/share/common-licenses + - First step towards FHS-compliance: Man pages are now installed + under /usr/share/man. + + -- Anthony Fok Wed, 7 Jul 1999 15:23:57 -0600 + +lilypond (1.1.47-1) unstable; urgency=low + + * New upstream release. + + -- Anthony Fok Thu, 10 Jun 1999 18:10:13 -0600 + +lilypond (1.1.42-1) unstable; urgency=low + + * New upstream release. + * [postinst]: Runs "/usr/bin/mktexlsr /usr/share/texmf" to save time. + * [postrm]: Removed the unnecessary "/usr/bin/mktexlsr" call. + * The segfault problem has disappeared on my computer (running + the latest potato system). Please test. + + -- Anthony Fok Tue, 11 May 1999 11:16:58 -0600 + +lilypond (1.1.37-1) unstable; urgency=low + + * New upstream release. + * Known problem: LilyPond simply segfaults under glibc 2.1 on my i386 + system, and I don't know how to fix the problem yet. I hope users of + other platforms have better luck. * [debian/rules]: - Make and install info files. - Removed "CC=egcc" because the default gcc on all platforms is @@ -9,8 +38,13 @@ lilypond (1.1.36-1) unstable; urgency=low - Minor clean-ups. * Added debian/compress to make sure *.png are not compressed. * Added debian/doc-base and postinst/prerm for the LilyPond info files. + * s!usr/lib/texmf!usr/share/texmf!g and cleaned up old hacks + in {pre,post}{inst,rm} files due to tetex's new FHS-compliant + directory structure. + * [debian/control]: Now Depends/Recommends the latest FHS-compliant + tetex-{bin,base,extra} (>= 0.9.99031{0,1}-1) packages. - -- Anthony Fok Sun, 21 Mar 1999 13:39:39 -0700 + -- Anthony Fok Mon, 5 Apr 1999 20:43:30 -0600 lilypond (1.1.31-1) unstable; urgency=low diff --git a/debian/control.foka b/debian/control.foka index 52b35a3aca..9161ab70bf 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -2,12 +2,12 @@ Source: lilypond Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 2.5.0.0 +Standards-Version: 3.0.0 Package: lilypond Architecture: any -Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2) -Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1) +Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1) +Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1) Conflicts: musixtex-fonts, tetex-base (<< 0.9) Description: The GNU Project music typesetter. LilyPond is the GNU Project music typesetter. This program can print diff --git a/debian/copyright b/debian/copyright index dcd268aca5..9fcb608cd0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,10 @@ This package was Debianized by Anthony Fok on Wed, 6 Aug 1997 04:30:28 -0600 It was downloaded from - ftp://ftp.lilypond.org/pub/LilyPond/v1.1/lilypond-1.1.36.tar.gz + ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.1.53.tar.gz + +It is also available at: + ftp://ftp.lilypond.org/pub/LilyPond/v1.1/lilypond-1.1.53.tar.gz For more information about GNU LilyPond, please visit: http://www.cs.uu.nl/~hanwen/lilypond/ @@ -46,4 +49,4 @@ GNU LilyPond under Debian GNU/Linux are also under the GNU General Public License (GPL) version 2 or later. On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/doc/copyright/GPL'. +Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/doc-base b/debian/doc-base new file mode 100644 index 0000000000..13016d1aad --- /dev/null +++ b/debian/doc-base @@ -0,0 +1,11 @@ +Document: lilypond +Title: LilyPond, the GNU Project music typesetter +Author: Various +Abstract: This documentation describes LilyPond (the GNU Project music + typesetter), its language Mudela, and the Mutopia project, a.k.a. + "Music To the People." +Section: Apps/Music + +Format: info +Index: /usr/share/info/lilypond.info.gz +Files: /usr/share/info/lilypond.info* diff --git a/debian/postinst b/debian/postinst index ac8e261b95..8f096b4772 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,29 @@ #!/bin/sh # # postinst script for the Debian GNU/Linux lilypond package -# # by Anthony Fok # Initial release: Sun, 26 Oct 1997 03:23:00 -0700 -# Last modified: Wed, 11 Nov 1998 22:59:49 -0700 +# Last modified: Wed, 7 Jul 1999 19:36:36 -0600 set -e package=lilypond # This is used for filenames! Don't change it! pkg_name="GNU LilyPond" -std_TEXMFMAIN=/usr/lib/texmf # Debian's standard $TEXMFMAIN +std_TEXMFMAIN=/usr/share/texmf # Debian's standard $TEXMFMAIN TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'` : ${TEXMFMAIN:=$std_TEXMFMAIN} -echo " Running /usr/bin/mktexlsr ..." -/usr/bin/mktexlsr +echo " Running /usr/bin/mktexlsr $TEXMFMAIN..." +/usr/bin/mktexlsr $TEXMFMAIN install-info --description='LilyPond, the GNU Project music typesetter' \ --section "Music" "Music" \ - --quiet /usr/info/lilypond.info.gz + --quiet /usr/share/info/lilypond.info.gz #DEBHELPER# -# If we are the last package to use the old /usr/lib/texmf/doc, -# we will create the symlink to /usr/doc/texmf. :-) -if rmdir /usr/lib/texmf/doc >/dev/null 2>&1 -then - ln -s /usr/doc/texmf /usr/lib/texmf/doc -fi - echo echo " $pkg_name configuration completed." echo " Please read /usr/doc/$package/README.Debian to get started." diff --git a/debian/postrm b/debian/postrm index 80e1d36c75..51f571a4f0 100644 --- a/debian/postrm +++ b/debian/postrm @@ -4,14 +4,14 @@ # by Anthony Fok # This is free software; see the GNU General Public Licence # version 2 or later for copying conditions. There is NO warranty. -# Last modified: Fri, 14 Aug 1998 00:07:07 -0600 +# Last modified: Tue, 11 May 1999 11:16:35 -0600 set -e package=lilypond font_supplier=public font_typeface=lilypond -std_TEXMFMAIN=/usr/lib/texmf +std_TEXMFMAIN=/usr/share/texmf std_VARTEXFONTS=/var/spool/texmf #DEBHELPER# @@ -32,7 +32,6 @@ case "$1" in # Clear out the old TFM and PK files in case the fonts were modified rm -rf $VARTEXFONTS/tfm/$font_supplier/$font_typeface rm -rf $VARTEXFONTS/pk/*/$font_supplier/$font_typeface - /usr/bin/mktexlsr ;; failed-upgrade|abort-install|abort-upgrade|disappear) diff --git a/debian/preinst b/debian/preinst index cf27f6b936..270b2db61d 100644 --- a/debian/preinst +++ b/debian/preinst @@ -4,14 +4,14 @@ # by Anthony Fok # This is free software; see the GNU General Public Licence # version 2 or later for copying conditions. There is NO warranty. -# Last modified: Tue, 10 Nov 1998 23:47:00 -0700 +# Last modified: Mon, 5 Apr 1999 20:30:12 -0600 set -e package=lilypond font_supplier=public font_typeface=lilypond -std_TEXMFMAIN=/usr/lib/texmf +std_TEXMFMAIN=/usr/share/texmf std_VARTEXFONTS=/var/spool/texmf #DEBHELPER# @@ -36,15 +36,6 @@ case "$1" in rm -rf $VARTEXFONTS/tfm/$font_supplier/mf rm -rf $VARTEXFONTS/pk/*/$font_supplier/mf fi - - # Since 1.0.17-1, /usr/lib/texmf/tex/lilypond has been changed - # to a symbolic directory. Remove the old real directory to - # prevent problems during upgrade. - for i in $LILYTEXINPUTS $LILYMFINPUTS; do - if [ -d $i -a ! -L $i ]; then - rm -rf $i - fi - done ;; abort-upgrade) diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 0000000000..0c665397e0 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,6 @@ +#!/bin/sh +set -e + +install-info --quiet --remove /usr/share/info/lilypond.info.gz + +#DEBHELPER# diff --git a/debian/rules b/debian/rules index 7a94ca326f..6dc4374714 100644 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# Made with the aid of debhelper by by Joey Hess, +# Made with the aid of debhelper by Joey Hess, # based on the sample debian/rules file for GNU hello by Ian Jackson. # # This is free software; see the GNU General Public Licence @@ -12,24 +12,31 @@ package = lilypond SHELL = /bin/sh r = debian/tmp +TMP = `pwd`/debian/tmp d = usr/doc/$(package) # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# This is the debhelper compatability version to use. +export DH_COMPAT=1 + build: build-stamp build-stamp: dh_testdir ./configure --disable-checking --disable-debugging \ --enable-printing --prefix=/usr --disable-optimise \ - --enable-shared + --enable-shared \ + --infodir='$${prefix}/share/info' \ + --mandir='$${prefix}/share/man' $(MAKE) all $(MAKE) -C Documentation/pictures pngs # Remove the "-" and the "-k" once the \times segfault # bug is fixed. (lilypond-1.1.31, 1999-02-17) - -$(MAKE) -k -C Documentation/tex dvi + # -$(MAKE) -k -C Documentation/tex dvi + -$(MAKE) -C Documentation/tex dvi -$(MAKE) -C Documentation info # $(MAKE) htmldoc @@ -57,18 +64,18 @@ install-stamp: build-stamp dh_installdirs usr/doc/texmf \ usr/lib/emacs/site-lisp \ usr/doc/$(package)/examples \ - usr/lib/texmf/tex \ - usr/lib/texmf/fonts/source/public \ - usr/lib/texmf/fonts/afm/public \ - usr/lib/texmf/fonts/tfm/public + usr/share/texmf/tex \ + usr/share/texmf/fonts/source/public \ + usr/share/texmf/fonts/afm/public \ + usr/share/texmf/fonts/tfm/public ln -fs ../lilypond $(r)/usr/doc/texmf/lilypond - $(MAKE) prefix=`pwd`/$(r)/usr install + $(MAKE) prefix=$(TMP)/usr install - ln -s ../../../share/lilypond/tex $(r)/usr/lib/texmf/tex/lilypond - ln -s ../../../../../share/lilypond/mf $(r)/usr/lib/texmf/fonts/source/public/lilypond - ln -s ../../../../../share/lilypond/afm $(r)/usr/lib/texmf/fonts/afm/public/lilypond - ln -s ../../../../../share/lilypond/tfm $(r)/usr/lib/texmf/fonts/tfm/public/lilypond + ln -s ../../lilypond/tex $(r)/usr/share/texmf/tex/lilypond + ln -s ../../../../lilypond/mf $(r)/usr/share/texmf/fonts/source/public/lilypond + ln -s ../../../../lilypond/afm $(r)/usr/share/texmf/fonts/afm/public/lilypond + ln -s ../../../../lilypond/tfm $(r)/usr/share/texmf/fonts/tfm/public/lilypond touch install-stamp @@ -80,8 +87,8 @@ binary-arch: build install dh_testdir dh_testroot cp -av mudela-mode.el $(r)/usr/lib/emacs/site-lisp - dh_installdocs ANNOUNCE* NEWS-* DEDICATION \ - BUGS TODO *.txt \ + dh_installdocs AIMS ANNOUNCE* NEWS-* DEDICATION \ + BUGS TASKS TODO *.txt \ Documentation/pictures/out/*.png \ Documentation/out/*.txt \ Documentation/tex/*.doc \ @@ -98,6 +105,7 @@ binary-arch: build install # dh_installmanpages # dh_undocumented dh_installchangelogs -k NEWS + dh_link dh_strip dh_compress dh_fixperms diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make index 6a627fe2d5..5f4602b707 100644 --- a/stepmake/stepmake/toplevel-targets.make +++ b/stepmake/stepmake/toplevel-targets.make @@ -5,7 +5,8 @@ local-dist: configure local-distclean: rm -f config.h config.hh config.make Makefile GNUmakefile \ - config.cache config.status config.log index.html + config.cache config.status config.log index.html \ + afm tfm cmtfm share/locale/*/LC_MESSAGES/lilypond.mo local-maintainerclean: rm -f configure -- 2.39.5