From 992a021d628177d3d4f18ce9cd58fb95cb6766ab Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 4 Aug 2003 17:16:05 +0000 Subject: [PATCH] * Debian patch, see debian/changelog (Anthony Fok). --- ChangeLog | 4 ++ debian/changelog | 65 +++++++++++++++++++++--------- debian/control | 42 +++++++++++-------- debian/control.foka | 19 ++++----- debian/rules | 35 +++++++++++----- stepmake/bin/add-html-footer.py | 2 +- stepmake/stepmake/omf-targets.make | 2 +- 7 files changed, 110 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68878d03a9..f235314556 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-08-04 Jan Nieuwenhuizen + + * Debian patch, see debian/changelog (Anthony Fok). + 2003-08-04 Jan Nieuwenhuizen * buildscripts/lilypond-profile.sh: Add workaround for zsh posix diff --git a/debian/changelog b/debian/changelog index 04c0135542..f3a894564e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,22 +1,49 @@ -lilypond1.7 (1.7.16-1) unstable; urgency=low - - * New upstream release. - * Change package name to lilypond1.7. - * Add Conflicts with lilypond. - - -- Jan Nieuwenhuizen Tue, 15 Apr 2003 16:39:26 +0200 - -lilypond (1.6.9-1) unstable; urgency=low - - * New upstream release. - * Depend on mftrace iso pktrace. - * Add guile-1.6-dev as alternative dependency to libguile-dev - * Install lilypond.words too. - * Bugfix for docdir when with changed package name. - * Remove netpbm, bibtex2html dependencies. - * Remove gcc-3.x/lexer kludge. - - -- Jan Nieuwenhuizen Tue, 15 Apr 2003 14:25:54 +0200 +lilypond (1.7.29-1) unstable; urgency=medium + + * New upstream release, preparing for lilypond-1.8. :-) + * stepmake/bin/add-html-footer.py: Use LOGNAME only if it exists. + pbuilder unsets LOGNAME and Python returns KeyError. + Thanks to Daniel Schepler for the report. (Closes: Bug#193065) + * debian/rules: Revert to calling ./configure rather than ./autogen.sh. + * An issue with autoconf <= 2.57 and g++ >= 3.3 has been preventing + getopt-long.cc from compiling. A workaround was checked in by upstream + author Jan Nieuwenhuizen on 2003-06-08, and the fix in aclocal.m4 was + backported from 1.7.29. (Closes: Bug#197761) + * Mark Brown says 1.7.27 has fixed FTBFS on m86k too. Thanks for the + note! (Closes: Bug#200510) + * Run dh_scrollkeeper to register *.omf files. + + -- Anthony Fok Fri, 1 Aug 2003 05:40:04 +0800 + +lilypond (1.6.9-2) unstable; urgency=medium + + * CVS updates as of 2003-04-29. (Thanks, Jan!) + * "Empty midi2ly.1" problem has been fixed upstream. (Closes: Bug#181927) + * Build-Depends: autoconf2.13 and run autogen.sh in debian/rules + to ensure this package passes the auto-build daemons. :-) + + -- Anthony Fok Thu, 1 May 2003 13:18:57 +0800 + +lilypond (1.6.9-1) unstable; urgency=medium + + * New upstream release with CVS updates as of 2003-04-15. + Jan Nieuwenhuizen has backported fixes to deal with build problems + with flex (>= 2.5.29). + * Rebuild with guile-1.6 packages. + * Merged debian/* fixes by upstream author Jan Nieuwenhuizen (Thanks!): + - Depend on mftrace (>= 1.0.17-1) instead of pktrace. + - Add guile-1.6-dev as alternative dependency to libguile-dev + - Bugfix for docdir when with changed package name. + - Remove bibtex2html dependencies. (LilyPond has come with its own + bib2html for some time now. However, xpmtoppm and pnmtopng from + netpbm is still needed - foka) + - Remove gcc-3.x/lexer kludge. + * midi2ly.1 was empty because help2man calls midi2ly but it couldn't + "import midi": python/out/midi.so wasn't built until later. Added + a kludge in debian/rules to regenerate midi2ly.1 manually. + Thanks to Colin Watson for reporting the bug. (See Bug#181927) + + -- Anthony Fok Mon, 28 Apr 2003 03:50:50 +0800 lilypond (1.6.6-2) unstable; urgency=high diff --git a/debian/control b/debian/control index 610e571034..5362371512 100644 --- a/debian/control +++ b/debian/control @@ -1,34 +1,42 @@ -Source: lilypond1.7 -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) | guile-1.6-dev (>= 1.6), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison (<< 1:1.50) | bison (>= 1:1.75-1), texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.12-2), pfaedit (>= 0.0.20020312-1), autotrace, t1utils -Build-Depends-Indep: gs | gs-aladdin +Source: lilypond +Build-Depends: debhelper (>= 4.0.0), 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, guile-1.6-dev | libguile-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison (<< 1:1.50) | bison (>= 1:1.75-1), texinfo (>= 4.6-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.17-1), pfaedit (>= 0.0.20020312-1), autotrace (>= 0.29-1.4), t1utils +Build-Depends-Indep: gs | gs-aladdin, netpbm (>= 2:9.10-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.5.7 +Standards-Version: 3.5.10 -Package: lilypond1.7 +Package: lilypond Architecture: any -Replaces: lilypond -Provides: lilypond -Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), tetex-extra (>= 1.0-1), python, guile -Recommends: lilypond1.7-doc -Conflicts: lilypond -Description: A program for printing sheet music. +Replaces: lilypond1.3 +Provides: lilypond1.3 +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), tetex-extra (>= 1.0-1), python, guile-1.6 | guile, ${misc:Depends} +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 using a high level description file as input. LilyPond is part of the GNU Project. . - URLs: http://www.cs.uu.nl/~hanwen/lilypond/ - http://www.xs4all.nl/~jantien/lilypond/ - http://sca.uwaterloo.ca/lilypond/ - http://www.lilypond.org/ + Home Page: http://lilypond.org/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen -Package: lilypond1.7-doc +Package: lilypond-doc Section: doc Architecture: all -Suggests: lilypond1.7 (>= ${Source-Version}), postscript-viewer, www-browser +Suggests: lilypond (>= ${Source-Version}), 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 typesetting software. + +Package: lilypond1.3 +Architecture: arm i386 m68k powerpc sparc +Depends: lilypond (>= ${Source-Version}) +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/1.6 series + have 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 b12664777d..5362371512 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -1,27 +1,24 @@ Source: lilypond -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) +Build-Depends: debhelper (>= 4.0.0), 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, guile-1.6-dev | libguile-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison (<< 1:1.50) | bison (>= 1:1.75-1), texinfo (>= 4.6-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.17-1), pfaedit (>= 0.0.20020312-1), autotrace (>= 0.29-1.4), t1utils +Build-Depends-Indep: gs | gs-aladdin, netpbm (>= 2:9.10-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.5.7 +Standards-Version: 3.5.10 Package: lilypond Architecture: any Replaces: lilypond1.3 Provides: lilypond1.3 -Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), tetex-extra (>= 1.0-1), python, guile +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), tetex-extra (>= 1.0-1), python, guile-1.6 | guile, ${misc:Depends} Recommends: lilypond-doc Conflicts: lilypond1.3 (<= 1.3.132-1), musixtex-fonts -Description: A program for printing sheet music. +Description: A program for printing sheet music LilyPond is a music typesetter. It produces beautiful sheet music using a high level description file as input. LilyPond is part of the GNU Project. . - URLs: http://www.cs.uu.nl/~hanwen/lilypond/ - http://www.xs4all.nl/~jantien/lilypond/ - http://sca.uwaterloo.ca/lilypond/ - http://www.lilypond.org/ + Home Page: http://lilypond.org/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen @@ -36,9 +33,9 @@ Description: LilyPond Documentation in HTML, PS and DVI formats Package: lilypond1.3 Architecture: arm i386 m68k powerpc sparc Depends: lilypond (>= ${Source-Version}) -Description: Dummy package for transition to new stable lilypond. +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 and now 1.6 series + package back to a newer lilypond because the stable 1.4/1.6 series have arrived. . Please feel free to remove this dummy package after you have upgraded diff --git a/debian/rules b/debian/rules index 5a5ad205a2..4df410873e 100644 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ # Currently maintained by Anthony Fok # for Debian GNU/Linux. -package = lilypond1.7 +package = lilypond SHELL = /bin/sh r = debian/$(package) @@ -34,7 +34,7 @@ export MAILADDRESS = lilypond@packages.debian.org #export DH_VERBOSE=1 # This is the debhelper compatibility version to use. -export DH_COMPAT=3 +export DH_COMPAT=4 # This has to be exported to make some magic below work. export DH_OPTIONS @@ -42,20 +42,25 @@ export DH_OPTIONS build: build-stamp build-stamp: dh_testdir + ./configure --enable-checking --enable-debugging \ --prefix=/usr --enable-optimise \ --infodir='$${prefix}/share/info' \ --mandir='$${prefix}/share/man' $(MAKE) MAKE_PFA_FILES=1 + touch build-stamp build-doc: build build-doc-stamp build-doc-stamp: dh_testdir + # make info $(MAKE) -C Documentation + # make html $(MAKE) web - find . -type d -name 'out-www' | xargs rm -rf + $(MAKE) -C Documentation/user omf +# find . -type d -name 'out-www' | xargs rm -rf touch build-doc-stamp @@ -68,7 +73,6 @@ 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 @@ -82,15 +86,21 @@ install: build dh_installdirs $(MAKE) prefix=$(PWD)/$(r)/usr MAKE_PFA_FILES=1 install # Ugh, remove hundred music-glossary copies - find . -name 'music-glossary.info-*' | xargs rm -f +# find . -name 'music-glossary.info-*' | xargs rm -f + +# # 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 binary-indep: build-doc install dh_testdir dh_testroot - # Extract LilyPond website tarball ... - tar -C $(r_doc)/$(d)/html -xvzf out/web.tar.gz + # Install LilyPond web documentation... + $(MAKE) prefix=$(PWD)/$(r_doc)/usr webdir=$(PWD)/$(r_doc)/$(d)/html out=www web-install # Add symlinks to the PostScript docs and LilyPond logo PNGs ... cd $(r_doc)/$(d) \ && cp -s `find html/Documentation -name '*.ps.gz'` . \ @@ -115,7 +125,9 @@ binary-arch: build install cp -av lilypond-mode.el lilypond-font-lock.el lilypond-indent.el \ lilypond.words \ $(r)/usr/share/emacs/site-lisp/ - dh_installdocs DEDICATION ROADMAP *.txt + dh_installdocs AUTHORS.txt NEWS.txt README.txt \ + DEDICATION THANKS \ + README.mandrake # dh_installdocs DEDICATION NEWS ROADMAP *.txt \ # Documentation/pictures/out/*.png @@ -126,12 +138,15 @@ binary-arch: build install # cp -a Documentation/misc/[ACN]* $(r)/$(d)/misc/ # dh_installexamples input -# find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \) \ -# -exec cp -a --parents '{}' $(r)/$(d)/examples ';' + + find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \) ! -regex '.*/out-www/.*' \ + -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 dh_installemacsen + dh_scrollkeeper # dh_installcron # dh_installman # dh_undocumented diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index eb2b32df3e..7f1e834957 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -111,7 +111,7 @@ def set_gcos (): pw = ntpwd.getpwname(os.environ['USERNAME']) else: import pwd - if os.environ.has_key('FAKEROOTKEY'): + if os.environ.has_key('FAKEROOTKEY') and os.environ.has_key('LOGNAME'): pw = pwd.getpwnam (os.environ['LOGNAME']) else: pw = pwd.getpwuid (os.getuid()) diff --git a/stepmake/stepmake/omf-targets.make b/stepmake/stepmake/omf-targets.make index fa82e1a64d..99be618d47 100644 --- a/stepmake/stepmake/omf-targets.make +++ b/stepmake/stepmake/omf-targets.make @@ -3,7 +3,7 @@ omf: $(OMF_FILES) omf-local-install: $(OMF_FILES) - $(foreach a, $(OMF_FILES), $(INSTALL) $(a) $(local_package_omfdir)/$(notdir $(a)) && ) true + $(foreach a, $(OMF_FILES), $(INSTALL) -m 644 $(a) $(local_package_omfdir)/$(notdir $(a)) && ) true @echo "Run scrollkeeper-update to register newly installed OMF files." local-install: omf-local-install -- 2.39.5