lilypond-0.1.34

diff --git a/Documentation/AUTHORS.pod b/Documentation/AUTHORS.pod
index 926f5af6852b6100c43cf4eea9221b036c6cdc61..c6fedeb9b0704d83827018b450a54c3ba923e036 100644 (file)
--- a/Documentation/AUTHORS.pod
+++ b/Documentation/AUTHORS.pod
@@ -49,9 +49,9 @@ mf/ital-*.mf (these were taken from the CM fonts)
 
 testing
 
-=item * Anthony Fok <foka@gpu.srv.ualberta.ca>, 
+=item * Anthony Fok <foka@debian.org>, 
 
-debian package: make/debian/*
+debian package: debian/*
 
 =item * Franc,ois Pinard <pinard@iro.umontreal.ca>, 
 

diff --git a/debian/Makefile b/debian/Makefile
index 06cd03fc6dcd87ae575f7c0d60ae8bc97e8ee212..9c9e7d683f9ae20a403dfa9f0abea98c20cd9e05 100644 (file)
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -15,5 +15,5 @@ include ./$(depth)/make/Rules.make
 #
 
 
-EXTRA_DISTFILES = README.debian changelog control copyright examples\
+EXTRA_DISTFILES = README.debian TODO changelog control copyright\
        info.ex menu.ex postinst postinst.old.sh postrm preinst rules watch

diff --git a/debian/README.debian b/debian/README.debian
index 88675bbb162e945b93e95d2392b9d446ff32b9e8..ba5d98e90876687fc9cb0aeb9e2f9a90a086b6d5 100644 (file)
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -19,4 +19,4 @@ LilyPond is still in active development, and many things may still change.
 When it is stablized in the future, these new fonts will probably be
 added into the standard special.map file.
 
-Anthony Fok <foka@gpu.srv.ualberta.ca>, Thu, 23 Oct 1997 16:59:32 -0600
+Anthony Fok <foka@debian.org>, Thu, 23 Oct 1997 16:59:32 -0600

diff --git a/debian/TODO b/debian/TODO
new file mode 100644 (file)
index 0000000..db936a6
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,2 @@
+* Move lytodvi.sh to a proper place.  It is currently placed in
+  /usr/doc/lilypond.  (1997-11-25)

diff --git a/debian/changelog b/debian/changelog
index 44850b33a4f92766f864045e698a6a7cbc06dffe..7db27bbaae52a917be13cff9b8cc0f4d53426182 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+lilypond (0.1.33-1) unstable; urgency=low
+
+  * New upstream release
+  * Changed my maintainer e-mail address to <foka@debian.org>.  :)
+
+ -- Anthony Fok <foka@debian.org>  Tue, 25 Nov 1997 00:22:57 -0700
+
+lilypond (0.1.32-2) unstable; urgency=low
+
+  * Commented out run_texhash() in postinst by mistake.  Fixed.
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Sun, 23 Nov 1997 03:04:29 -0700
+
+lilypond (0.1.32-1) unstable; urgency=low
+
+  * New upstream release
+  * Applied a small fix to postinst.  The font-entries-search-and-replace
+    add_fonts() subroutine was slightly buggy.
+  * Unpatched ./configure.  It turned out that I spelt "--enable-optimise"
+    as "--enable-optimize" in debian/rules by mistake.  Oops!  :)  Thanks
+    to the upstream author for pointing this out!  :)
+  * The upstream authors has included the ./debian/* files in the pristine
+    source archive!  They also fixed some minor errors in README.debian
+    and copyright.  Thanks a lot!  :)
+  * Removed the line "dh_clean" from "binary-arch:" and switched the order
+    of dh_clean in "clean:" in debian/rules.  dh_clean was deleting
+    the zero-byte file ./make/out/Site.make, causing the build to fail.
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Sun, 23 Nov 1997 01:39:31 -0700
+
 lilypond (0.1.29-1) unstable; urgency=low
 
   * New upstream release
@@ -11,7 +41,7 @@ lilypond (0.1.29-1) unstable; urgency=low
     "stray" automatically generated TFM and PK font files were placed in
     the wrong directories because they were not listed in
     /usr/lib/texmf/fontname/special.map.
-  * Did some minor clean-up in debian/rules.
+  * Did some minor clean-up in debian/rules and switched to debhelper.
   * Updated Standards-Version to 2.3.0.1
 
  -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Tue, 11 Nov 1997 02:31:33 -0700
@@ -113,5 +143,5 @@ lilypond (0.1.0-1) unstable; urgency=low
 
 Local variables:
 mode: debian-changelog
-add-log-mailing-address: "foka@gpu.srv.ualberta.ca"
+add-log-mailing-address: "foka@debian.org"
 End:

diff --git a/debian/control b/debian/control
index 500d23d7c48c2a6c469cc8b8595227853d9f4f7b..13de513c092d34281f4a630706387cc9f00fe3b1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: lilypond
 Section: contrib/tex
 Priority: optional
-Maintainer: Anthony Fok <foka@gpu.srv.ualberta.ca>
+Maintainer: Anthony Fok <foka@debian.org>
 Standards-Version: 2.3.0.1
 
 Package: lilypond

diff --git a/debian/copyright b/debian/copyright
index 17f22e9aca8d6a0000b90131011dad8db19d1e49..22c954c0d184c8aee732d54515a787f559adf661 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
-This package was debianized by Anthony Fok foka@gpu.srv.ualberta.ca on
+This package was debianized by Anthony Fok foka@debian.org on
 Wed,  6 Aug 1997 04:30:28 -0600
 
 It was downloaded from
-    ftp://pcnov095.win.tue.nl/pub/lilypond/development/lilypond-0.1.29.tar.gz
+    ftp://pcnov095.win.tue.nl/pub/lilypond/development/lilypond-0.1.33.tar.gz
 
 It is also available from:
     ftp://alpha.gnu.org/gnu/

diff --git a/debian/postinst b/debian/postinst
index 0b734060e6e84fcdc33ce6831803aaf413917213..e2bcee306c196c2f3dfcdb41e7873140b9e97343 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,9 +2,9 @@
 #
 # postinst script for the Debian GNU/Linux lilypond package
 #
-#   by Anthony Fok <foka@gpu.srv.ualberta.ca>
+#   by Anthony Fok <foka@debian.org>
 #   Initial release:  Sun, 26 Oct 1997 03:23:00 -0700
-#     Last modified:  Mon, 10 Nov 1997 22:26:10 -0700
+#     Last modified:  Sun, 23 Nov 1997 03:04:16 -0700
 
 use strict;
 use File::Copy;
@@ -30,7 +30,6 @@ $pkg_name = "GNU LilyPond";
 
 $font_supplier = "public";
 $font_typeface = "lilypond";
-# @fonts = qw( dyn10 font-en-tja vette-beam );
 @fonts = qw( feta );
 
 $std_TEXMF = "/usr/lib/texmf";  # Debian's standard $TEXMF
@@ -154,7 +153,10 @@ sub add_fonts ($$$$@) {
        if (length($font) < 8) { $font .= "\t"; }
        $entries .= "$font\t$supplier\t\t$typeface\n";
     }
-    if ($_[0] !~ /$entries/m) {
+
+    $_[0] =~ /((^\w+\s+$supplier\s+$typeface\n)+)/m;
+
+    if ($1 ne $entries) {
        ($_[0] =~ s/(^\w+\s+$supplier\s+$typeface\n)+/$entries/m)
            or ($_[0] =~ s/(?=^beam\s+public\s+music\n)/$entries/m)
            or die " Can't add font entries to $specialmap: $!";

diff --git a/debian/postinst.old.sh b/debian/postinst.old.sh
index 8eb5d7cdf3acc16659df8e8baefaf06994560689..55188f11a9e52ff5f4d5d9faa15f40c82b4b9188 100644 (file)
--- a/debian/postinst.old.sh
+++ b/debian/postinst.old.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 #
 # postinst script for the Debian GNU/Linux lilypond package
-#   by Anthony Fok <foka@gpu.srv.ualberta.ca>
+#   by Anthony Fok <foka@debian.org>
 #   This is free software; see the GNU General Public Licence
 #   version 2 or later for copying conditions.  There is NO warranty.
 #   Last modified:  Wed,  6 Aug 1997 13:42:45 -0600

diff --git a/debian/postrm b/debian/postrm
index 5873710c84168447152b951b31d59a0062c447a4..86d5a9353591c3a3a6e65250d5179462cc24db6a 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 #
 # postrm script for the Debian GNU/Linux lilypond package
-#   by Anthony Fok <foka@gpu.srv.ualberta.ca>
+#   by Anthony Fok <foka@debian.org>
 #   This is free software; see the GNU General Public Licence
 #   version 2 or later for copying conditions.  There is NO warranty.
 #   Last modified:  Mon, 10 Nov 1997 22:44:37 -0700

diff --git a/debian/preinst b/debian/preinst
index eba9114d562fc95a58ef8755b929e9db42a95238..71a9d645e6ba646c252da4c31c98ea7b6fba921c 100644 (file)
--- a/debian/preinst
+++ b/debian/preinst
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 #
 # preinst script for the Debian GNU/Linux lilypond package
-#   by Anthony Fok <foka@gpu.srv.ualberta.ca>
+#   by Anthony Fok <foka@debian.org>
 #   This is free software; see the GNU General Public Licence
 #   version 2 or later for copying conditions.  There is NO warranty.
 #   Last modified:  Tue, 11 Nov 1997 01:25:15 -0700

diff --git a/debian/rules b/debian/rules
index 8befb887050076672060548f2edc10c4beacf1b5..843600e3889665433d25b83e000c5afbd5308e39 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 # This is free software; see the GNU General Public Licence
 # version 2 or later for copying conditions.  There is NO warranty.
 #
-# Currently maintained by Anthony Fok <foka@gpu.srv.ualberta.ca>
+# Currently maintained by Anthony Fok <foka@debian.org>
 # for Debian GNU/Linux.
 
 package=lilypond
@@ -13,7 +13,7 @@ package=lilypond
 SHELL=/bin/bash
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 
 build: build-stamp
 build-stamp:
@@ -28,8 +28,10 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp
-       dh_clean
        -$(MAKE) distclean
+       # Don't put dh_clean before "make distclean"!  dh_clean is
+       # "too smart" and it deletes too many files!
+       dh_clean
        rm -f {,*/}out/{*,.build} flower/config.{log,status}
 
 # Build architecture-independent files here.
@@ -39,14 +41,13 @@ binary-indep: build
 binary-arch: build
        dh_testdir
        dh_testroot
-       dh_clean
        dh_installdirs usr/lib/texmf/doc
        $(MAKE) prefix=`pwd`/debian/tmp/usr install
        ln -fs ../../../doc/lilypond debian/tmp/usr/lib/texmf/doc/lilypond
        dh_installdocs BUGS TODO NEWS DEDICATION ANNOUNCE README \
                Documentation/out/*.text Documentation/*.doc \
-               Documentation/lelie_logo.xpm
-       dh_installexamples
+               Documentation/lelie_logo.xpm bin/lytodvi.sh
+       dh_installexamples input/*.ly input/*.tex
 #      dh_installmenu
 #      dh_installcron
 #      dh_installmanpages