From fc0a17f699903340fb003ecb9558810296c44180 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 11 Dec 1998 11:26:07 +0100 Subject: [PATCH] release: 1.0.19.uu3 --- Documentation/faq.yo | 2 +- NEWS | 6 +++ VERSION | 2 +- debian/changelog | 90 ++++++++++++++++++++++++++++++++++++---- debian/copyright | 2 +- debian/postinst | 9 +++- debian/postrm | 2 +- debian/rules | 49 +++++++++++++--------- lily/my-lily-lexer.cc | 1 - lily/parser.yy | 1 - make/out/lelievijver.lsm | 8 ++-- make/out/lilypond.lsm | 8 ++-- make/out/lilypond.spec | 4 +- scripts/ly2dvi.py | 16 +++---- 14 files changed, 149 insertions(+), 51 deletions(-) diff --git a/Documentation/faq.yo b/Documentation/faq.yo index 059cc78381..e8c6c5962b 100644 --- a/Documentation/faq.yo +++ b/Documentation/faq.yo @@ -99,7 +99,7 @@ should be documented, please do so and send in a patch. sect(Language: mudela) -question(Why can't you type code(#c) in stead of code(cis) ?) +question(Why can't you type code(#c) instead of code(cis) ?) We think that code(#c) looks as if you are entering the symbols to print (which you are not; remember, you're entering the musical diff --git a/NEWS b/NEWS index 63288f943f..f42087da40 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +pl 19.uu3 + - debian fixes. + +pl 19.uu2 + - junked \output + pl 19.uu1 - MF fixes. diff --git a/VERSION b/VERSION index ab1e7c0619..071d2adabf 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=19 -MY_PATCH_LEVEL=uu1 +MY_PATCH_LEVEL=uu3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/debian/changelog b/debian/changelog index 26392962b3..e08328d6d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,73 @@ -lilypond (1.0.16-1) unstable; urgency=low - - * New upstream release. +lilypond (1.0.19.uu1-2) frozen unstable; urgency=low + + * [debian/rules]: Now builds the LilyPond documentation in dvi format. + Thanks to Roland Rosenfeld + for the bug report. (closes: Bug#30123). + * [debian/control]: Now also Recommends: tetex-extra (>= 0.9.981030-1) + because the .dvi documentation uses the EC fonts in that package. + + -- Anthony Fok Thu, 10 Dec 1998 17:43:57 -0700 + +lilypond (1.0.19.uu1-1) frozen unstable; urgency=low + + * New upstream bugfix release. + + -- Anthony Fok Mon, 7 Dec 1998 13:12:02 -0700 + +lilypond (1.0.18-2) frozen unstable; urgency=low + + * [debian/rules]: Added symlink /usr/lib/texmf/fonts/afm/public/lilypond. + Thanks to Julian Gilbey for the bug report + (closes: Bug#29407). + * [scripts/ly2dvi.py]: Re-added a patch similar to the one in 1.0.17-1, + but teTeX's default search path is now placed *before* the ones that + ly2dvi adds. Thanks to Roland Rosenfeld + for the bug report. (closes: Bug#29459). + + -- Anthony Fok Mon, 23 Nov 1998 21:29:25 -0700 + +lilypond (1.0.18-1) frozen unstable; urgency=low + + * New upstream bugfix release. + * [debian/control]: + - Upgraded to standards version 2.5.0.0 (no changes). + - Recommends: python-misc (>= 1.5.1) because ly2dvi needs the glob + module in the python-misc package (closes: Bug#29283). + - Updated dependencies on tetex* to the latest versions: + Depends: tetex-bin (>= 0.9.981031-2) + Recommends: tetex-base (>= 0.9.981030-1) + due to changes in tetex's directory structure. + * [debian/rules]: + - The symlink ../../../../../share/lilypond/mf is now named + /usr/lib/texmf/fonts/source/public/lilypond instead of + /usr/lib/texmf/fonts/source/public/mf (Bug#29284). + - In the latest tetex-base package, /usr/lib/texmf/doc is now a + symlink to /usr/doc/texmf. Therefore, we now install lilypond's + documentation into /usr/doc/texmf/musixtex/lilypond. + (closes: Bug#28999, Bug#29326) + * [debian/preinst]: + - The script now removes the directories + /var/spool/texmf/pk/*/public/mf and /var/spool/texmf/tfm/public/mf + created inadvertently by Debian's buggy lilypond 1.0.17-1. :-) + (Bug#29284) + - Since 1.0.17-1, /usr/lib/texmf/tex/lilypond has been changed to a + symbolic directory. The script now removes the old real directory + to prevent problems during upgrade (closes: Bug#29284). + * [debian/postinst]: I copied a few lines from tetex-nonfree's postinst + to remove the old directory /usr/lib/texmf/doc if lilypond is the + last package to use that directory, and create a symlink to + /usr/doc/texmf. :-) + * Rebuilt with yodl (1.31.7-1) installed to ensure the documentations + are compiled properly (closes: Bug#29285). + * Thanks to Fabien Ninoles , Roland Rosenfeld + and Julian Gilbey + for reporting the bugs listed above. :-) + + -- Anthony Fok Thu, 12 Nov 1998 03:14:25 -0700 + +lilypond (1.0.17-1) frozen unstable; urgency=low + + * New upstream "stable" 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]: @@ -11,9 +78,17 @@ lilypond (1.0.16-1) unstable; urgency=low run. Thanks to Roman Hodek 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 Thu, 15 Oct 1998 04:49:40 -0600 + - Now configures with --disable-optimise instead of --enable-optimise, + otherwise it would not compile. + - Added symlinks to directories under /usr/lib/texmf because lilypond + now puts everything under /usr/share/lilypond. + * [Documentation/topdocs/AUTHORS.yo]: Added a trailing "/" on URLs. + * [scripts/ly2dvi.py]: Added a hack to add an extra os.pathsep (":" on + Linux) to TEXINPUTS and MFINPUTS, otherwise ly2dvi and TeX would fail + to find the necessary files. + * Compiled with libstdc++2.9. :-) + + -- Anthony Fok Tue, 3 Nov 1998 14:31:18 -0700 lilypond (1.0.2-1) unstable; urgency=low @@ -73,8 +148,9 @@ lilypond (0.1.60-1) frozen unstable; urgency=medium * New upstream release with lots of bug fixes, including the MIDI generation bug in 0.1.48. Please put this in Hamm. - * debian/rules: + * debian/control: - Upgraded to standards version 2.4.1.0 (no changes). + * debian/rules: - lilypond now also depends on tetex-base (>= 0.9-5) and conflicts with tetex-base (<< 0.9). * Modified postinst and postrm to work with teTeX 0.9 / Web2C 7.2: diff --git a/debian/copyright b/debian/copyright index 551e4d52e1..b97528466c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ This package was debianized by Anthony Fok on Wed, 6 Aug 1997 04:30:28 -0600 It was downloaded from - ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.0.16.tar.gz + ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.0/lilypond-1.0.19.uu1.tar.gz It is also available from: diff --git a/debian/postinst b/debian/postinst index e7f9906b71..7f781eb295 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,7 +4,7 @@ # # by Anthony Fok # Initial release: Sun, 26 Oct 1997 03:23:00 -0700 -# Last modified: Wed, 22 Apr 1998 03:14:10 -0600 +# Last modified: Wed, 11 Nov 1998 22:59:49 -0700 set -e @@ -21,6 +21,13 @@ echo " Running /usr/bin/mktexlsr ..." #DEBHELPER# +# If we are the last package to use the old /usr/lib/texmf/doc, +# we will create the symlink to /usr/doc/texmf. :-) +if rmdir /usr/lib/texmf/doc >/dev/null 2>&1 +then + ln -s /usr/doc/texmf /usr/lib/texmf/doc +fi + echo echo " $pkg_name configuration completed." echo " Please read /usr/doc/$package/README.Debian to get started." diff --git a/debian/postrm b/debian/postrm index 80e1d36c75..6064c39411 100755 --- a/debian/postrm +++ b/debian/postrm @@ -14,7 +14,7 @@ font_typeface=lilypond std_TEXMFMAIN=/usr/lib/texmf std_VARTEXFONTS=/var/spool/texmf -#DEBHELPER# + TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'` : ${TEXMFMAIN:=$std_TEXMFMAIN} diff --git a/debian/rules b/debian/rules index 3a78b27b07..4a6fa779fc 100755 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,22 @@ # for Debian GNU/Linux. package = lilypond + SHELL = /bin/sh r = debian/tmp d = usr/doc/$(package) +strayfiles := stepmake/bin/*.pyc \ + stepmake/stepmake/stepmake \ + stepmake/stepmake/bin \ + GNUmakefile stepmake/GNUmakefile \ + config.h \ + wwwlist \ + Documentation/tex/fonts.aux \ + Documentation/tex/fonts.log \ + Documentation/tex/feta*.tfm \ + Documentation/tex/feta*.*pk + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -21,10 +33,10 @@ build-stamp: dh_testdir CC=egcc ./configure --disable-checking --disable-debugging \ - --enable-printing --prefix=/usr --enable-optimise \ + --enable-printing --prefix=/usr --disable-optimise \ --enable-shared $(MAKE) all - # $(MAKE) htmldoc + $(MAKE) -C Documentation/tex dvi touch build-stamp @@ -33,36 +45,35 @@ clean: dh_testroot rm -f build-stamp install-stamp -$(MAKE) distclean + dh_clean + + # Remove the following line once the *.make files are fixed + rm -f $(strayfiles) # 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 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 - install: install-stamp install-stamp: build-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs usr/lib/texmf/doc \ + dh_installdirs usr/doc/texmf \ usr/lib/emacs/site-lisp \ - usr/doc/$(package)/examples - ln -fs ../../../doc/lilypond $(r)/usr/lib/texmf/doc/lilypond + usr/doc/$(package)/examples \ + usr/lib/texmf/tex \ + usr/lib/texmf/fonts/source/public \ + usr/lib/texmf/fonts/afm/public + ln -fs ../lilypond $(r)/usr/doc/texmf/lilypond $(MAKE) prefix=`pwd`/$(r)/usr install + ln -s ../../../share/lilypond/tex $(r)/usr/lib/texmf/tex/lilypond + ln -s ../../../../../share/lilypond/mf $(r)/usr/lib/texmf/fonts/source/public/lilypond + ln -s ../../../../../share/lilypond/afm $(r)/usr/lib/texmf/fonts/afm/public/lilypond + touch install-stamp # Build architecture-independent files here. @@ -77,8 +88,8 @@ binary-arch: build install BUGS TODO *.txt \ Documentation/pictures/*.xpm \ Documentation/out/*.txt \ - Documentation/tex/*.doc \ - Documentation/tex/*.bib + Documentation/tex/*.bib \ + Documentation/tex/out/*.dvi # dh_installexamples input cp -aP `find input mutopia \( -name '*.ly' -o -name '*.tex' -o -name 'TODO' \)` \ $(r)/$(d)/examples diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 82948a3067..b325fb684a 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -47,7 +47,6 @@ static Keyword_ent the_key_tab[]={ {"name", NAME}, {"notenames", NOTENAMES}, {"notes" , NOTES}, - {"output", OUTPUT}, {"partial", PARTIAL}, {"paper", PAPER}, {"penalty", PENALTY}, diff --git a/lily/parser.yy b/lily/parser.yy index bf82af8ec4..bc3b2e6e0b 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -186,7 +186,6 @@ yylex (YYSTYPE *s, void * v_l) %token NOTENAMES %token NOTES %token OCTAVE -%token OUTPUT %token PAPER %token PARTIAL %token PENALTY diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 6f49b18b36..85a31de124 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.0.19.uu1 -Inschrijf datum: 07DEC98 +Versie: 1.0.19.uu3 +Inschrijf datum: 11DEC98 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.0.19.uu1.tar.gz + 770k lilypond-1.0.19.uu3.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.19.uu1.tar.gz + 770k lilypond-1.0.19.uu3.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index c801d5ccff..12ae846140 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.0.19.uu1 -Entered-date: 07DEC98 +Version: 1.0.19.uu3 +Entered-date: 11DEC98 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 770k lilypond-1.0.19.uu1.tar.gz + 770k lilypond-1.0.19.uu3.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.19.uu1.tar.gz + 770k lilypond-1.0.19.uu3.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 08b33d7219..dda9ff9872 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.0.19.uu1 +Version: 1.0.19.uu3 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.19.uu1.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.19.uu3.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 3fbc2e2155..e92a19652f 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -441,17 +441,17 @@ class Properties: this.__set('include', tmp, 'environment') - t='' + t = os.pathsep if os.environ.has_key ('TEXINPUTS'): - t = os.pathsep + os.environ['TEXINPUTS'] - os.environ['TEXINPUTS'] = os.path.join(this.get('root'), 'share', - 'lilypond', 'tex' ) + t + t = os.environ['TEXINPUTS'] + t + os.environ['TEXINPUTS'] = t + os.path.join(this.get('root'), 'share', + 'lilypond', 'tex' ) - t='' + t = os.pathsep if os.environ.has_key ('MFINPUTS'): - t = os.pathsep + os.environ['MFINPUTS'] - os.environ['MFINPUTS'] = os.path.join(this.get('root'), 'share', - 'lilypond', 'mf' ) + t + t = os.environ['MFINPUTS'] + t + os.environ['MFINPUTS'] = t + os.path.join(this.get('root'), 'share', + 'lilypond', 'mf' ) if os.environ.has_key('TMP'): this.__set('tmp',os.environ['TMP'],'environment') -- 2.39.5