Hello Han-Wen and Jan!  :-)

Here's a patch for lilypond-0.1.16 from Debian.  :-)  Note that
lilypond-0.1.16 may not actually make it into Debian 2.1, because I am
having trouble compiling the program on my computer with egcs 1.1b,
libstdc++2.9, libc6 2.0.7u etc.  (I wonder which of them is at fault.  :-)
c++ splits out a bunch of error when it is trying to link all the *.o files
to lily/out/lilypond.  It compiles fine on master.debian.org, which uses
older egcs/libstdc++/libc6.  However, I don't quite have time to play with
remote-package-building before the freeze.  (trying to juggle school and
Debian and other activities.  :-)

Anyway, version 1.0.2 (compiled with older egcs/libstdc++/libc6) is
currently in Debian unstable (to be freezed within a day), so I hope it is
not too outdated.  :-)

Cheers,

Anthony

-- 
Anthony Fok Tung-Ling                Civil and Environmental Engineering
[EMAIL PROTECTED], [EMAIL PROTECTED]    University of Alberta, Canada
[EMAIL PROTECTED]             Keep smiling!  *^_^*
Come visit Our Lady of Victory Camp -- http://olvc.home.ml.org/
                                    or http://www.ualberta.ca/~foka/OLVC/
--- lilypond-1.0.16.orig/debian/TODO
+++ lilypond-1.0.16/debian/TODO
@@ -2,6 +2,3 @@
  * Compile mudela-mode.el into mudela-mode.elc
  * Install /etc/emacs/site-start.d/50lilypond.el
  * Figure out how to make mudela-mode work on my computer.  :-)
-
-Sun, 26 Apr 1998 21:11:32 -0600:
- * Remove preinst from upstream source
--- lilypond-1.0.16.orig/debian/changelog
+++ lilypond-1.0.16/debian/changelog
@@ -1,8 +1,53 @@
+lilypond (1.0.16-1) unstable; urgency=low
+
+  * New upstream release.
+  * [debian/{copyright,control}]: pcnov095.win.tue.nl -> ftp.cs.uu.nl
+      (New upstream master FTP site).  Also updated JCN's web site URL.
+  * [debian/rules]: 
+      - Now, in the "clean:" target, runs either 
+        "find . -user root | xargs -r chown $$SUDO_USER.$$SUDO_GID" or
+        "find . -user root | xargs -r chown $$LOGNAME" to deal with all those
+        root-owned "out/*" files generated during a "sudo debian/rules clean"
+        run.  Thanks to Roman Hodek <[EMAIL PROTECTED]>
+        for reporting the problem!  (closes: Bug#27044)
+      - Updated debian/rules according to the new debhelper rules example.
+  * [Documentation/topdocs/AUTHORS.yo]: Added a trailing "/" on URLs.
+
+ -- Anthony Fok <[EMAIL PROTECTED]>  Thu, 15 Oct 1998 04:49:40 -0600
+
+lilypond (1.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <[EMAIL PROTECTED]>  Sat, 15 Aug 1998 04:32:08 -0600
+
+lilypond (1.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * [aclocal.m4]: Temporarily changed OPTIMIZE="-O2" to OPTIMIZE="-O"
+      to avoid egcs (c++) complaint of "Internal compiler error"
+      on my computer.
+  * [scripts/mudela-book.py]: Added "#!@PYTHON@" at the top.  This string
+      expands to "#!/usr/bin/python" in /usr/bin/mudela-book.
+      (Thanks to Lintian.  :-)
+  * [debian/control]: Recommends: python-base (>= 1.5.1).
+      (Again, thanks to Lintian.  :-)
+  * [debian/postrm]: Now also removes the generated LilyPond fonts
+      *.{tfm,pk} under /var/spool/texmf when called as "postrm remove".
+  * [debian/preinst]: Yes, have to bring this back to remove the generated
+      LilyPond fonts in /var/spool/texmf because "postrm remove" didn't do
+      its jobs in previous versions.  Oops.  :-)
+  * [debian/rules]: Installs a few new upstream documentation files, and
+      the example files in out/ directories are moved to parent directories.
+
+ -- Anthony Fok <[EMAIL PROTECTED]>  Fri, 14 Aug 1998 03:30:05 -0600
+
 lilypond (0.1.76-1) unstable; urgency=low
 
   * support for 'make deb' target
+  * Not uploaded to Debian's FTP site.
 
- -- Jan Nieuwenhuizen <[EMAIL PROTECTED]> Fri,  3 Jul 1998 17:53:37 +0200
+ -- Jan Nieuwenhuizen <[EMAIL PROTECTED]>  Fri,  3 Jul 1998 17:53:37 +0200
 
 lilypond (0.1.71-1) unstable; urgency=low
 
--- lilypond-1.0.16.orig/debian/copyright
+++ lilypond-1.0.16/debian/copyright
@@ -2,18 +2,19 @@
 Wed,  6 Aug 1997 04:30:28 -0600
 
 It was downloaded from
-      ftp://pcnov095.win.tue.nl/pub/lilypond/development/
-          lilypond-0.1.71.tar.gz
+      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.0.16.tar.gz
 
 It is also available from:
+
       ftp://sca.uwaterloo.ca/pub/lilypond/development/
 
 For more information about GNU LilyPond, please visit:
-      http://www.cs.ruu.nl/people/hanwen/lilypond/
-  or  http://sca.uwaterloo.ca/~praetzel/lilypond/
+      http://www.cs.uu.nl/~hanwen/lilypond/
+  or  http://www.xs4all.nl/~jantien/
+  or  http://sca.uwaterloo.ca/lilypond/
 
 Authors:
-      Han-Wen Nienhuys <[EMAIL PROTECTED]>
+      Han-Wen Nienhuys <[EMAIL PROTECTED]>
       Jan Nieuwenhuizen <[EMAIL PROTECTED]>
  
 Copyright:
--- lilypond-1.0.16.orig/debian/postrm
+++ lilypond-1.0.16/debian/postrm
@@ -4,7 +4,7 @@
 #   by Anthony Fok <[EMAIL PROTECTED]>
 #   This is free software; see the GNU General Public Licence
 #   version 2 or later for copying conditions.  There is NO warranty.
-#   Last modified:  Wed, 22 Apr 1998 05:55:58 -0600
+#   Last modified:  Fri, 14 Aug 1998 00:07:07 -0600
 
 set -e
 
@@ -22,17 +22,13 @@
 : ${VARTEXFONTS=$std_VARTEXFONTS}
 
 case "$1" in
-    remove)
-       /usr/bin/mktexlsr
-    ;;
-
     upgrade)
        # 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
     ;;
 
-    purge)
+    remove|purge)
        # 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
--- lilypond-1.0.16.orig/debian/rules
+++ lilypond-1.0.16/debian/rules
@@ -9,8 +9,9 @@
 # for Debian GNU/Linux.
 
 package = lilypond
-
-SHELL = /bin/bash
+SHELL = /bin/sh
+r = debian/tmp
+d = usr/doc/$(package)
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -19,57 +20,81 @@
 build-stamp:
        dh_testdir
 
-       ./configure --disable-checking --disable-debugging \
+       CC=egcc ./configure --disable-checking --disable-debugging \
                --enable-printing --prefix=/usr --enable-optimise \
                --enable-shared
        $(MAKE) all
+       # $(MAKE) htmldoc
 
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp
+       rm -f build-stamp install-stamp
        -$(MAKE) distclean
-       -$(MAKE) local-distclean
+
+       # Correct the owner of the out/dummy.dep files when built with sudo.
+       if [ -n "$$SUDO_USER" -a -n "$$SUDO_GID" ]; then \
+               find . -user root | xargs -r chown $$SUDO_USER.$$SUDO_GID; \
+       else \
+               find . -user root | xargs -r chown $$LOGNAME; \
+       fi
 
        # Remove the following line once the *.make files are fixed
-       rm -f bin/*.pyc
-       rm -f debian/preinst
+       rm -f stepmake/bin/*.pyc
+       rm -f stepmake/stepmake/stepmake
+       rm -f stepmake/stepmake/bin
+       rm -f GNUmakefile stepmake/GNUmakefile
+       rm -f config.h
+       rm -f wwwlist
 
        dh_clean
 
-# Build architecture-independent files here.
-binary-indep: build
-# We have nothing to do by default.
-
-binary-arch: build
+install: install-stamp
+install-stamp: build-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
-
        dh_installdirs usr/lib/texmf/doc \
                usr/lib/emacs/site-lisp \
                usr/doc/$(package)/examples
-       ln -fs ../../../doc/lilypond debian/tmp/usr/lib/texmf/doc/lilypond
-       $(MAKE) prefix=`pwd`/debian/tmp/usr install
-       cp -av mudela-mode.el debian/tmp/usr/lib/emacs/site-lisp
-       dh_installdocs ANNOUNCEMENT ANNOUNCE-0.1 README.txt NEWS ONEWS DEDICATION \
-               BUGS TODO \
+       ln -fs ../../../doc/lilypond $(r)/usr/lib/texmf/doc/lilypond
+
+       $(MAKE) prefix=`pwd`/$(r)/usr install
+
+       touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       cp -av mudela-mode.el $(r)/usr/lib/emacs/site-lisp
+       dh_installdocs ANNOUNCEMENT ANNOUNCE-0.1 NEWS* DEDICATION \
+               BUGS TODO *.txt \
                Documentation/pictures/*.xpm \
                Documentation/out/*.txt \
                Documentation/tex/*.doc \
                Documentation/tex/*.bib
 #      dh_installexamples input
        cp -aP `find input mutopia \( -name '*.ly' -o -name '*.tex' -o -name 'TODO' 
\)` \
-               debian/tmp/usr/doc/lilypond/examples
+               $(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_installcron
 #      dh_installmanpages
 #      dh_undocumented
        dh_installchangelogs
 #      dh_strip
        dh_compress
+       ( cd $(r)/$(d) && \
+               if [ -f NEWS ]; then gzip -9vf NEWS; fi )
+       ln -s NEWS.gz $(r)/$(d)/changelog.gz
        dh_fixperms
        dh_suidregister
        dh_installdeb
@@ -83,4 +108,4 @@
        @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean install binary-indep binary-arch binary
--- lilypond-1.0.16.orig/debian/watch
+++ lilypond-1.0.16/debian/watch
@@ -1,5 +1,5 @@
 # Example watch control file for uscan
 # 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
-pcnov095.win.tue.nl    /pub/lilypond/development       lilypond-*.tar.gz       debian 
 uupdate
+# Site         Directory                       Pattern                 Version Script
+ftp.cs.uu.nl   /pub/GNU/LilyPond/development   lilypond-*.tar.gz       debian  uupdate
--- lilypond-1.0.16.orig/debian/control
+++ lilypond-1.0.16/debian/control
@@ -7,8 +7,9 @@
 Package: lilypond
 Architecture: any
 Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
+Recommends: python-base (>= 1.5.1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
-Description: The GNU Project music typesetter.  
+Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print
  beautiful sheet music from a music definition file.  It can also play
  mechanical performances to a MIDI file.  Features include multiple
@@ -16,7 +17,8 @@
  beams, slurs, triplets, formatting scores, part extraction.  It includes
  a nice font of musical symbols.
  .
-  URL: http://www.cs.ruu.nl/people/hanwen/lilypond
-       http://sca.uwaterloo.ca/~praetzel/lilypond/
+  URLs: http://www.cs.uu.nl/~hanwen/lilypond/
+        http://www.xs4all.nl/~jantien/lilypond/
+        http://sca.uwaterloo.ca/~praetzel/lilypond/
   Authors: Han-Wen Nienhuys <[EMAIL PROTECTED]>
            Jan Nieuwenhuizen <[EMAIL PROTECTED]>
--- lilypond-1.0.16.orig/debian/control.foka
+++ lilypond-1.0.16/debian/control.foka
@@ -7,6 +7,7 @@
 Package: lilypond
 Architecture: any
 Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
+Recommends: python-base (>= 1.5.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
@@ -24,7 +25,8 @@
  cadensa, balken, boogjes, triolen, partituren, en losse partijen.  Een
  fraai font met muzikeksymbolen wordt meegeleverd.
  .
-  URL: http://www.cs.ruu.nl/people/hanwen/lilypond/
-       http://sca.uwaterloo.ca/~praetzel/lilypond/
-  Authors: Han-Wen Nienhuys <[EMAIL PROTECTED]>
+  URLs: http://www.cs.uu.nl/~hanwen/lilypond/
+        http://www.digicash.com/~jan/lilypond/
+        http://sca.uwaterloo.ca/lilypond/
+  Authors: Han-Wen Nienhuys <[EMAIL PROTECTED]>
            Jan Nieuwenhuizen <[EMAIL PROTECTED]>
--- lilypond-1.0.16.orig/debian/control.in
+++ lilypond-1.0.16/debian/control.in
@@ -7,10 +7,12 @@
 Package: lilypond
 Architecture: any
 Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
+Recommends: python-base (>= 1.5.1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
-Description: The GNU Project music typesetter.  @BLURB@
+Description: The GNU Project music typesetter.@BLURB@
  .
-  URL: http://www.cs.ruu.nl/people/hanwen/lilypond
-       http://sca.uwaterloo.ca/~praetzel/lilypond/
+  URLs: http://www.cs.uu.nl/~hanwen/lilypond/
+        http://www.xs4all.nl/~jantien/lilypond/
+        http://sca.uwaterloo.ca/~praetzel/lilypond/
   Authors: Han-Wen Nienhuys <[EMAIL PROTECTED]>
            Jan Nieuwenhuizen <[EMAIL PROTECTED]>
--- lilypond-1.0.16.orig/debian/preinst
+++ lilypond-1.0.16/debian/preinst
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# preinst script for the Debian GNU/Linux lilypond package
+#   by Anthony Fok <[EMAIL PROTECTED]>
+#   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:15:40 -0600
+
+set -e
+
+package=lilypond
+font_supplier=public
+font_typeface=lilypond
+std_TEXMFMAIN=/usr/lib/texmf
+std_VARTEXFONTS=/var/spool/texmf
+
+#DEBHELPER#
+
+TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'`
+: ${TEXMFMAIN:=$std_TEXMFMAIN}
+VARTEXFONTS=`/usr/bin/kpsewhich -expand-var '$VARTEXFONTS'`
+: ${VARTEXFONTS=$std_VARTEXFONTS}
+
+case "$1" in
+    install|upgrade)
+       # Clear out the old TFM and PK files in case the fonts were
+       # left-over from previous installations
+       rm -rf $VARTEXFONTS/tfm/$font_supplier/$font_typeface
+       rm -rf $VARTEXFONTS/pk/*/$font_supplier/$font_typeface
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+       echo "$0 called with unknown argument \`$1'" >&2
+       exit 0
+    ;;
+
+esac
--- lilypond-1.0.16.orig/Documentation/topdocs/AUTHORS.yo
+++ lilypond-1.0.16/Documentation/topdocs/AUTHORS.yo
@@ -7,7 +7,7 @@
 it()nemail(Tom Cato Amundsen)([EMAIL PROTECTED]),
     cembalo-partita in mudela.
 it()nemail(Mats Bengtsson)([EMAIL PROTECTED]),
-    lurl(http://www.s3.kth.se/~matsb)
+    lurl(http://www.s3.kth.se/~matsb/)
     clef stuff, key stuff, swedish notenames, testing, general
     comments.
 it()nemail(Eric Bullinger)([EMAIL PROTECTED]),
@@ -18,7 +18,7 @@
     debian package: debian/*
 it()nemail(Neil Jerram)([EMAIL PROTECTED]). 
     parts of Documentation/Vocab*
-it()Donald Ervin Knuth,  lurl(http://www.cs-staff.stanford.edu/~knuth)
+it()Donald Ervin Knuth,  lurl(http://www.cs-staff.stanford.edu/~knuth/)
     mf/ital-*.mf (these were taken from the CM fonts)
 it()nemail(Werner Lemberg)([EMAIL PROTECTED]),
     misc bugfixes, some Beam and Stem code. 
@@ -27,15 +27,15 @@
 it()nemail(Adrian Moriano)()
     Documentation fixes, glossary.
 it()nemail(Han-Wen Nienhuys)([EMAIL PROTECTED]), 
-    lurl(http://www.cs.uu.nl/~hanwen)
+    lurl(http://www.cs.uu.nl/~hanwen/)
     nl()
     Main author (initials: HWN).
 it()nemail(Jan Nieuwenhuizen)([EMAIL PROTECTED]), 
-    lurl(http://www.xs4all.nl/~jantien)
+    lurl(http://www.xs4all.nl/~jantien/)
     nl()
     Main author (initials: JCN).
 it()nemail(Alexandre Oliva)([EMAIL PROTECTED]), 
-    lurl(http://sunsite.unicamp.br/~oliva)
+    lurl(http://sunsite.unicamp.br/~oliva/)
     testing
 it()nemail(Franc,ois Pinard)([EMAIL PROTECTED]), 
     parts of Documentation/Vocab*, started internationalization stuff
--- lilypond-1.0.16.orig/make/stepmake.make
+++ lilypond-1.0.16/make/stepmake.make
@@ -33,7 +33,7 @@
 
 -include $(addprefix $(depth)/make/,$(addsuffix -inclusions.make, 
$(LOCALSTEPMAKE_TEMPLATES)))
 
--include $(addprefix $(depth)/make/,$(addsuffix -inclusions.make, 
$(STEPMAKE_TEMPLATES)))
+-include $(addprefix $(stepdir)/,$(addsuffix -inclusions.make, $(STEPMAKE_TEMPLATES)))
 
 
 include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES)))

Reply via email to