From ebf3dacd83a950f5dd4b13bf0386fe288c1ea8bf Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:03:55 +0000 Subject: [PATCH] lilypond-0.1.34 --- Documentation/AUTHORS.pod | 4 ++-- debian/Makefile | 2 +- debian/README.debian | 2 +- debian/TODO | 2 ++ debian/changelog | 34 ++++++++++++++++++++++++++++++++-- debian/control | 2 +- debian/copyright | 4 ++-- debian/postinst | 10 ++++++---- debian/postinst.old.sh | 2 +- debian/postrm | 2 +- debian/preinst | 2 +- debian/rules | 13 +++++++------ 12 files changed, 57 insertions(+), 22 deletions(-) create mode 100644 debian/TODO diff --git a/Documentation/AUTHORS.pod b/Documentation/AUTHORS.pod index 926f5af685..c6fedeb9b0 100644 --- 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 , +=item * Anthony Fok , -debian package: make/debian/* +debian package: debian/* =item * Franc,ois Pinard , diff --git a/debian/Makefile b/debian/Makefile index 06cd03fc6d..9c9e7d683f 100644 --- 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 88675bbb16..ba5d98e908 100644 --- 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 , Thu, 23 Oct 1997 16:59:32 -0600 +Anthony Fok , Thu, 23 Oct 1997 16:59:32 -0600 diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000000..db936a667d --- /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 44850b33a4..7db27bbaae 100644 --- 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 . :) + + -- Anthony Fok 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 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 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 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 500d23d7c4..13de513c09 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: lilypond Section: contrib/tex Priority: optional -Maintainer: Anthony Fok +Maintainer: Anthony Fok Standards-Version: 2.3.0.1 Package: lilypond diff --git a/debian/copyright b/debian/copyright index 17f22e9aca..22c954c0d1 100644 --- 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 0b734060e6..e2bcee306c 100644 --- a/debian/postinst +++ b/debian/postinst @@ -2,9 +2,9 @@ # # postinst script for the Debian GNU/Linux lilypond package # -# by Anthony Fok +# by Anthony Fok # 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 8eb5d7cdf3..55188f11a9 100644 --- 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 +# 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: Wed, 6 Aug 1997 13:42:45 -0600 diff --git a/debian/postrm b/debian/postrm index 5873710c84..86d5a93535 100644 --- 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 +# 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: Mon, 10 Nov 1997 22:44:37 -0700 diff --git a/debian/preinst b/debian/preinst index eba9114d56..71a9d645e6 100644 --- 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 +# 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, 11 Nov 1997 01:25:15 -0700 diff --git a/debian/rules b/debian/rules index 8befb88705..843600e388 100644 --- 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 +# Currently maintained by Anthony Fok # 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 -- 2.39.5