From 9b59c303f902ebbeeeca6f84ff9f3d3544a92945 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 18 Jul 2002 16:04:52 +0000 Subject: [PATCH] * debian/: Debian patch (Anthony Fok). * debian/lilypond.links: Remove, as per Anthony's request. --- ChangeLog | 4 +++ debian/changelog | 79 ++++++++++++++++++++++++++++++++++++++----- debian/control | 17 +++++----- debian/control.foka | 17 +++++----- debian/control.potato | 4 +-- debian/copyright | 6 ++-- debian/lilypond.links | 4 --- debian/rules | 38 +++++++++++++++------ debian/watch | 2 +- 9 files changed, 125 insertions(+), 46 deletions(-) delete mode 100644 debian/lilypond.links diff --git a/ChangeLog b/ChangeLog index eaf343dede..f4a4eac02a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-07-18 Jan Nieuwenhuizen + * debian/: Debian patch (Anthony Fok). + + * debian/lilypond.links: Remove, as per Anthony's request. + * aclocal.m4: Regenerate. * stepmake/aclocal.m4: Add --with-kpathsea-include, diff --git a/debian/changelog b/debian/changelog index 2ad25dfa9c..e74ed06bf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,75 @@ -lilypond (1.6.66-1) unstable; urgency=low +lilypond (1.5.68-2) unstable; urgency=low - * Change python requirement in build-depend to build on unstable. - * Remove this entry: upstream testing build as we're gearing up to 1.6. + * Oops, I was missing Build-Depends on python-dev. Thanks to LaMont + Jones and his hppa build daemon for the report. (Closes: Bug#153402) + * lilypond should Depends instead of Recommends tetex-extra. + Thanks to Russell Neches for the report. (Closes: Bug#152228) + * lilypond-indent.el is now installed in lilypond 1.5.x. + Thanks to Christophe Rhodes for the report. (Closes: Bug#139070) - -- Jan Nieuwenhuizen Wed, 10 Jul 2002 02:54:14 +0200 + -- Anthony Fok Thu, 18 Jul 2002 23:41:44 +0800 + +lilypond (1.5.68-1) unstable; urgency=low + + * New upstream release, gearing up for 1.6.0. + * Thanks to upstream author Jan Nieuwenhuizen for updating the Debian + package to work with 1.5.68. + * As per Jan's suggestion, now Build-Depends: pktrace (>= 1.0.3-1), + pfaedit (>= 0.0.20020312-1), autotrace, t1utils + + -- Anthony Fok Wed, 17 Jul 2002 03:20:23 +0800 + +lilypond (1.4.13-1) unstable; urgency=low + + * New upstream release. + * Depends: pktrace + + -- Anthony Fok Mon, 6 May 2002 04:09:32 +0800 + +lilypond (1.4.12-1) unstable; urgency=high + + * New upstream maintenance release. + * Several important fixes (including our bison-related patch added + to 1.4.10-1) are included since 1.4.11 this release. (Now, I + don't even need to increase teTeX's extra_mem_top, extra_mem_bot + or pool_size! :-) Please include in Woody. + * Fixed a typo in lilypond-doc package description: typestting -> + typesetting. Thanks, Matt Zimmerman! (Closes: Bug#125083) + + -- Anthony Fok Sun, 24 Feb 2002 02:06:15 +0800 + +lilypond (1.4.10-1) unstable; urgency=high + + * New upstream release. + * lilypond failed to build with bison >= 1.30 because bison's output file + has been renamed. Applied an upstream fix. (Closes: Bug#133692) + * lilypond's documentation also failed to build with the latest + tetex or texinfo package. Instead of increasing extra_mem_top and + extra_mem_bot, increasing pool_size does the trick. + + -- Anthony Fok Mon, 18 Feb 2002 11:41:31 +0800 + +lilypond (1.4.9-1) unstable; urgency=high + + * New upstream release. + * Oops, libc6-dev is known as libc6.1-dev and libc-dev on some + architectures. Fixed Build-Depends so that lilypond can be built + on all platforms. Thanks to Colin Watson for reporting the bug. + (Closes: Bug#120208) + + -- Anthony Fok Tue, 27 Nov 2001 23:28:11 +0800 + +lilypond (1.4.8-2) unstable; urgency=high + + * [debian/rules]: Use -s instead of -a so that lilypond would get built + on all architectures even when the dummy lilypond1.3 package isn't + built. Thanks to Ryan Murray for the report. (Closes: Bug#117622) + * Depends on python instead of python-base. The python scripts in + lilypond work with old and new Python versions. + * Build-Depends on "-z combreloc"-enabled binutils (>= 2.11.92.0.10-2) + and libc6-dev (>= 2.2.4-5) so that lily runs faster! :-) + + -- Anthony Fok Sun, 11 Nov 2001 10:45:10 +0800 lilypond (1.4.8-1) unstable; urgency=high @@ -817,8 +883,3 @@ lilypond (0.1.0-1) unstable; urgency=low * Initial Release. -- Anthony Fok Wed, 6 Aug 1997 04:40:57 -0600 - -Local variables: -mode: debian-changelog -add-log-mailing-address: "foka@debian.org" -End: diff --git a/debian/control b/debian/control index a29e81a218..cb2b51f22a 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,17 @@ Source: lilypond -Build-Depends: debhelper (>= 3.0.5), python-base (>= 1.5.2-4) | python1.5 (>= 1.5.2-4) | python, libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison, texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1) +Build-Depends: debhelper (>= 3.0.5), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python-dev, libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison, texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1), pktrace (>= 1.0.3-1), pfaedit (>= 0.0.20020312-1), autotrace, t1utils Build-Depends-Indep: bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.5.5 +Standards-Version: 3.5.6 Package: lilypond Architecture: any Replaces: lilypond1.3 Provides: lilypond1.3 -Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), python-base (>= 1.5.2-4), guile -Recommends: lilypond-doc, tetex-extra (>= 1.0-1) +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), tetex-extra (>= 1.0-1), python, guile +Recommends: lilypond-doc Conflicts: lilypond1.3 (<= 1.3.132-1), musixtex-fonts Description: A program for printing sheet music. LilyPond is a music typesetter. It produces beautiful sheet music @@ -28,17 +28,18 @@ Description: A program for printing sheet music. Package: lilypond-doc Section: doc Architecture: all -Suggests: lilypond (>= 1.4.8-1), postscript-viewer, www-browser +Suggests: lilypond (>= 1.5.68-1), postscript-viewer, www-browser Description: LilyPond Documentation in HTML, PS and DVI formats This package contains the HTML, PostScript and DVI documentation for the - LilyPond music typestting software. + LilyPond music typesetting software. Package: lilypond1.3 Architecture: arm i386 m68k powerpc sparc -Depends: lilypond (>= 1.4.8-1) +Depends: lilypond (>= 1.5.68-1) Description: Dummy package for transition to new stable lilypond. This dummy package provides a transition from the previous lilypond1.3 - package back to a newer lilypond because the stable 1.4 series has arrived. + package back to a newer lilypond because the stable 1.4 series + (soon 1.6 series) has arrived. . Please feel free to remove this dummy package after you have upgraded to the latest lilypond. diff --git a/debian/control.foka b/debian/control.foka index c856770ec1..cb2b51f22a 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -1,17 +1,17 @@ Source: lilypond -Build-Depends: debhelper (>= 3.0.5), python-base (>= 1.5.2-4), libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison, texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1) +Build-Depends: debhelper (>= 3.0.5), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python-dev, libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison, texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1), pktrace (>= 1.0.3-1), pfaedit (>= 0.0.20020312-1), autotrace, t1utils Build-Depends-Indep: bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.5.5 +Standards-Version: 3.5.6 Package: lilypond Architecture: any Replaces: lilypond1.3 Provides: lilypond1.3 -Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), python-base (>= 1.5.2-4), guile -Recommends: lilypond-doc, tetex-extra (>= 1.0-1) +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), tetex-extra (>= 1.0-1), python, guile +Recommends: lilypond-doc Conflicts: lilypond1.3 (<= 1.3.132-1), musixtex-fonts Description: A program for printing sheet music. LilyPond is a music typesetter. It produces beautiful sheet music @@ -28,17 +28,18 @@ Description: A program for printing sheet music. Package: lilypond-doc Section: doc Architecture: all -Suggests: lilypond (>= 1.4.8-1), postscript-viewer, www-browser +Suggests: lilypond (>= 1.5.68-1), postscript-viewer, www-browser Description: LilyPond Documentation in HTML, PS and DVI formats This package contains the HTML, PostScript and DVI documentation for the - LilyPond music typestting software. + LilyPond music typesetting software. Package: lilypond1.3 Architecture: arm i386 m68k powerpc sparc -Depends: lilypond (>= 1.4.8-1) +Depends: lilypond (>= 1.5.68-1) Description: Dummy package for transition to new stable lilypond. This dummy package provides a transition from the previous lilypond1.3 - package back to a newer lilypond because the stable 1.4 series has arrived. + package back to a newer lilypond because the stable 1.4 series + (soon 1.6 series) has arrived. . Please feel free to remove this dummy package after you have upgraded to the latest lilypond. diff --git a/debian/control.potato b/debian/control.potato index c7bd20e761..7d58814faa 100644 --- a/debian/control.potato +++ b/debian/control.potato @@ -28,7 +28,7 @@ Description: A program for printing sheet music. Package: lilypond-doc Section: doc Architecture: all -Suggests: lilypond (>= 1.4.8-1), postscript-viewer, www-browser +Suggests: lilypond (>= 1.4.11-1), postscript-viewer, www-browser Description: LilyPond Documentation in HTML, PS and DVI formats This package contains the HTML, PostScript and DVI documentation for the - LilyPond music typestting software. + LilyPond music typesetting software. diff --git a/debian/copyright b/debian/copyright index 2d49d29f44..aab2254e3c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,10 +7,10 @@ but was merged back into the lilypond package as of Mon, 16 Apr 2001 21:58:42 -0600 It was downloaded from - ftp://ftp.lilypond.org/pub/LilyPond/v1.4/ + ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/ It is also available at: - ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.4/ + ftp://ftp.lilypond.org/pub/LilyPond/ For more information about GNU LilyPond, please visit: http://www.cs.uu.nl/~hanwen/lilypond/ @@ -24,7 +24,7 @@ Authors: Copyright: - GNU LilyPond is Copyright (C) 1996-2001 + GNU LilyPond is Copyright (C) 1996-2002 Jan Nieuwenhuizen & Han-Wen Nienhuys This program is free software; you can redistribute it and/or modify diff --git a/debian/lilypond.links b/debian/lilypond.links deleted file mode 100644 index edd69e82b6..0000000000 --- a/debian/lilypond.links +++ /dev/null @@ -1,4 +0,0 @@ -usr/share/lilypond/tex usr/share/texmf/tex/lilypond -usr/share/lilypond/mf usr/share/texmf/fonts/source/public/lilypond -usr/share/lilypond/afm usr/share/texmf/fonts/afm/public/lilypond -usr/share/lilypond/tfm usr/share/texmf/fonts/tfm/public/lilypond diff --git a/debian/rules b/debian/rules index 6c0904551b..448324c93d 100644 --- a/debian/rules +++ b/debian/rules @@ -15,10 +15,16 @@ r = debian/$(package) r_doc = debian/$(package)-doc d = usr/share/doc/$(package) +include VERSION +VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL) + # "main_memory = 263000" in /etc/texmf/texmf.cnf isn't large enough # for latex to process standchen.dvi.latex, so adding extra_mem_* ... -export extra_mem_top = 100000 -export extra_mem_bot = 100000 +# export extra_mem_top = 100000 +# export extra_mem_bot = 100000 +# But now, building lilypond.dvi requires increased pool_size (2002-02-18) +# export pool_size = 500000 +# But now, it seems that none of the above is needed in 1.4.11 (2002-02-24) export MODE = ljfour export BDPI = 600 export USER_CFLAGS = -DDEBIAN @@ -64,6 +70,7 @@ clean: # Still not clean enough? Let's use... BRUTE STRENGTH! :-) find . -type d -name 'out' -o -name 'out-www' | xargs rm -rf + rm -f debian/lilypond.links dh_clean @@ -75,13 +82,13 @@ install: build # Add here commands to install the package into debian/tmp. dh_installdirs - $(MAKE) prefix=$(PWD)/$(r)/usr MAKE_PFA_FILES=1 install + $(MAKE) prefix=$(PWD)/$(r)/usr MAKE_PFA_FILES=1 install - # Change from an absolute symlink to a relative symlink (Lintian) - if [ -L $(r)/usr/share/lilypond/cmtfm ]; then \ - rm -f $(r)/usr/share/lilypond/cmtfm; \ - ln -s ../texmf/fonts/tfm/public/cm $(r)/usr/share/lilypond/cmtfm; \ - fi +# # Change from an absolute symlink to a relative symlink (Lintian) +# if [ -L $(r)/usr/share/lilypond/cmtfm ]; then \ +# rm -f $(r)/usr/share/lilypond/cmtfm; \ +# ln -s ../texmf/fonts/tfm/public/cm $(r)/usr/share/lilypond/cmtfm; \ +# fi # Build architecture-independent files here. binary-indep: DH_OPTIONS=-i @@ -124,8 +131,8 @@ binary-arch: build install # cp -a Documentation/misc/[ACN]* $(r)/$(d)/misc/ # dh_installexamples input - cp -aP `find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \)` \ - $(r)/$(d)/examples + find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \) \ + -exec cp -a --parents '{}' $(r)/$(d)/examples ';' for i in `find $(r)/$(d)/examples/ -type d -name out`; do \ mv -fv $$i/* $$i/..; rmdir $$i; done # dh_installmenu @@ -134,7 +141,16 @@ binary-arch: build install # dh_installman # dh_undocumented dh_installchangelogs -k CHANGES - dh_link + dh_link usr/share/lilypond/$(VERSION)/tex \ + usr/share/texmf/tex/lilypond \ + usr/share/lilypond/$(VERSION)/fonts/source \ + usr/share/texmf/fonts/source/public/lilypond \ + usr/share/lilypond/$(VERSION)/fonts/afm \ + usr/share/texmf/fonts/afm/public/lilypond \ + usr/share/lilypond/$(VERSION)/fonts/tfm \ + usr/share/texmf/fonts/tfm/public/lilypond \ + usr/share/lilypond/$(VERSION)/dvips/lilypond.map \ + usr/share/texmf/dvips/config/lilypond.map dh_strip dh_compress dh_fixperms diff --git a/debian/watch b/debian/watch index 62a6d3d9f0..153e127a86 100644 --- a/debian/watch +++ b/debian/watch @@ -2,4 +2,4 @@ # Rename this file to "watch" and then you can run the "uscan" command # to check for upstream updates and more. # Site Directory Pattern Version Script -ftp.cs.uu.nl /pub/GNU/LilyPond/v1.4 lilypond-*.tar.gz debian uupdate +ftp.cs.uu.nl /pub/GNU/LilyPond/v1.5 lilypond-*.tar.gz debian uupdate -- 2.39.5