From: fred Date: Tue, 26 Mar 2002 22:46:45 +0000 (+0000) Subject: lilypond-1.3.32 X-Git-Tag: release/1.5.59~1839 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fcd0ccae2324b25febe8fb9ad4d027a3e624a530;p=lilypond.git lilypond-1.3.32 --- diff --git a/Documentation/programmer/GNUmakefile b/Documentation/programmer/GNUmakefile index 25b42eea53..d54746320a 100644 --- a/Documentation/programmer/GNUmakefile +++ b/Documentation/programmer/GNUmakefile @@ -30,7 +30,7 @@ default: localclean: rm -f fonts.aux fonts.log feta*.tfm feta*.*pk -local-WWW: $(HTML_FILES) +local-WWW: $(HTML_FILES) $(addsuffix .gz, $(PS_FILES)) $(PYTHON) $(step-bindir)/ls-latex.py --title 'Hacker documentation' \ $(DOC_FILES) $(TEXI_FILES) $(TELY_FILES) \ | sed "s!$(outdir)/!!g" > $(outdir)/index.html diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 8678c583b1..0a4e7e79e8 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -345,9 +345,10 @@ in addition to the those needed for running: @section Debian GNU/linux -A Debian package is also available; contact Anthony Fok -@email{foka@@debian.org}. The build scripts are in the subdirectory -@file{debian/}. +A Debian package is also available; see +@uref{http://packages.debian.org/lilypond,http://packages.debian.org/lilypond} +or contact Anthony Fok @email{foka@@debian.org} for more information. +The build scripts are in the subdirectory @file{debian/}. @section Windows NT/95 diff --git a/debian/changelog b/debian/changelog index 3236080537..293e0963b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,54 @@ +lilypond1.3 (1.3.24-1) frozen unstable; urgency=low + + * New upstream development release with lots of bug fixes. :-) + * [debian/control]: Added missing build dependencies. Thanks to + Roman Hodek for the bug report and solution (closes: Bug#58078). + + -- Anthony Fok Sat, 19 Feb 2000 15:14:31 -0700 + +lilypond1.3 (1.3.17-1) unstable; urgency=low + + * New upstream release. Merry Christmas! + + -- Anthony Fok Fri, 24 Dec 1999 08:59:21 -0700 + +lilypond1.3 (1.3.16-1) unstable; urgency=low + + * New upstream release. + + -- Anthony Fok Wed, 22 Dec 1999 22:12:30 -0700 + +lilypond1.3 (1.3.12-1) unstable; urgency=low + + * New upstream release. + * [debian/rules]: Commented out "$(MAKE) -C Documentation/programmer ps" + temporarily because of error making lilypond-overview.dvi. + + -- Anthony Fok Fri, 17 Dec 1999 00:33:47 -0700 + +lilypond1.3 (1.3.5-1) unstable; urgency=low + + * New upstream release. lilypond1.3 is the developmental branch. + * [debian/rules]: Removed "install-stamp". + * [debian/control]: + - Standards-Version: 3.1.0 + - Added the Build-Depends field. + - Updated dependencies of tetex-{base,bin,extra} packages to + 1.0*-1. + + -- Anthony Fok Sat, 13 Nov 1999 23:25:42 -0700 + +lilypond (1.2.17-1) unstable; urgency=low + + * New upstream release. + * [debian/rules]: + - Reverted to configuring with --disable-optimise. + - The documentation files are now built properly, and both + ps and dvi versions are included. + * Standards-Version: 3.0.1 + + -- Anthony Fok Sat, 30 Oct 1999 06:57:04 -0600 + lilypond (1.2.2-1) unstable; urgency=low * New upstream release. diff --git a/debian/control.foka b/debian/control.foka index 3ea6fd643d..12d811e790 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -1,18 +1,24 @@ -Source: lilypond +Source: lilypond1.3 +Build-Depends: debhelper (>= 2.0.71), python-base (>= 1.5.2-4), libguile6-dev, tetex-bin (>= 1.0.5-1), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1), flex (>= 2.5.4a-1), bison (>= 1:1.28-1), texinfo (>= 4.0-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.0.0 +Standards-Version: 3.1.0 -Package: lilypond +Package: lilypond1.3 Architecture: any -Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1) -Recommends: python-base (>= 1.5.2-4), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1) -Conflicts: musixtex-fonts, tetex-base (<< 0.9) +Replaces: lilypond +Provides: lilypond +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1) +Recommends: python-base (>= 1.5.2-4), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1) +Conflicts: lilypond, 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 + using a high level description file as input. LilyPond is part of the GNU Project. + . + This is the unstable 1.3 branch of LilyPond. It is not intended for + use with stable projects! . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ diff --git a/debian/control.in b/debian/control.in index 0b48d3e3e1..12d811e790 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,18 +1,24 @@ -Source: lilypond +Source: lilypond1.3 +Build-Depends: debhelper (>= 2.0.71), python-base (>= 1.5.2-4), libguile6-dev, tetex-bin (>= 1.0.5-1), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1), flex (>= 2.5.4a-1), bison (>= 1:1.28-1), texinfo (>= 4.0-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.0.0 +Standards-Version: 3.1.0 -Package: lilypond +Package: lilypond1.3 Architecture: any -Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1) -Recommends: python-base (>= 1.5.2-4), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1) -Conflicts: musixtex-fonts, tetex-base (<< 0.9) -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. - +Replaces: lilypond +Provides: lilypond +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1) +Recommends: python-base (>= 1.5.2-4), tetex-base (>= 1.0-1), tetex-extra (>= 1.0-1) +Conflicts: lilypond, 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. + . + This is the unstable 1.3 branch of LilyPond. It is not intended for + use with stable projects! . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ diff --git a/debian/copyright b/debian/copyright index dd39bc69a0..743e63c34d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,14 @@ This package was Debianized by Anthony Fok on Wed, 6 Aug 1997 04:30:28 -0600 +The development branch, lilypond1.3, is packaged separately +on Tue, 9 Nov 1999 22:30:32 -0700 + It was downloaded from - ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.2.2.tar.gz + ftp://ftp.lilypond.org/pub/LilyPond/v1.3/lilypond-1.3.24.tar.gz -It is also available at: - ftp://ftp.lilypond.org/pub/LilyPond/v1.2/lilypond-1.2.2.tar.gz +It is also available at: + ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.3/lilypond-1.3.24.tar.gz For more information about GNU LilyPond, please visit: http://www.cs.uu.nl/~hanwen/lilypond/ @@ -19,7 +22,7 @@ Authors: Copyright: - GNU LilyPond is Copyright (C) 1996-1999 + GNU LilyPond is Copyright (C) 1996-2000 Jan Nieuwenhuizen & Han-Wen Nienhuys This program is free software; you can redistribute it and/or modify diff --git a/debian/rules b/debian/rules index ad265c71ff..a1f112f953 100644 --- a/debian/rules +++ b/debian/rules @@ -8,12 +8,12 @@ # Currently maintained by Anthony Fok # for Debian GNU/Linux. -package = lilypond +package = lilypond1.3 SHELL = /bin/sh r = debian/tmp TMP = `pwd`/debian/tmp -d = usr/doc/$(package) +d = usr/share/doc/$(package) # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -31,16 +31,11 @@ build-stamp: --infodir='$${prefix}/share/info' \ --mandir='$${prefix}/share/man' $(MAKE) all + $(MAKE) -C Documentation +# $(MAKE) -C Documentation/programmer ps + $(MAKE) -C Documentation/user ps $(MAKE) -C Documentation/pictures pngs - # Remove the "-" and the "-k" once the \times segfault - # bug is fixed. (lilypond-1.1.31, 1999-02-17) - # -$(MAKE) -k -C Documentation/tex dvi - -$(MAKE) -C Documentation/tex dvi - -$(MAKE) -C Documentation info - - # $(MAKE) htmldoc - touch build-stamp clean: @@ -56,19 +51,18 @@ clean: find . -user root | xargs -r chown --dereference $$SUDO_USER.$$SUDO_GID; \ fi -install: install-stamp -install-stamp: build-stamp +install: build dh_testdir dh_testroot dh_clean -k - dh_installdirs usr/doc/texmf \ - usr/lib/emacs/site-lisp \ - usr/doc/$(package)/examples \ + dh_installdirs usr/share/doc/texmf \ + usr/share/emacs/site-lisp \ + $(d)/examples \ usr/share/texmf/tex \ usr/share/texmf/fonts/source/public \ usr/share/texmf/fonts/afm/public \ usr/share/texmf/fonts/tfm/public - ln -fs ../lilypond $(r)/usr/doc/texmf/lilypond + ln -fs ../$(package) $(r)/usr/share/doc/texmf/lilypond $(MAKE) prefix=$(TMP)/usr install @@ -77,8 +71,6 @@ install-stamp: build-stamp ln -s ../../../../lilypond/afm $(r)/usr/share/texmf/fonts/afm/public/lilypond ln -s ../../../../lilypond/tfm $(r)/usr/share/texmf/fonts/tfm/public/lilypond - touch install-stamp - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -86,16 +78,17 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - cp -av mudela-mode.el $(r)/usr/lib/emacs/site-lisp - dh_installdocs AIMS ANNOUNCE* NEWS-* DEDICATION \ - BUGS TASKS TODO *.txt \ + cp -av lilypond-mode.el $(r)/usr/share/emacs/site-lisp + dh_installdocs DEDICATION TODO *.txt \ Documentation/pictures/out/*.png \ Documentation/out/*.txt \ - Documentation/tex/*.doc \ - Documentation/tex/out/*.dvi -# Documentation/tex/*.bib + Documentation/*/out/[a-z]*.dvi \ + Documentation/*/out/*.ps + mkdir $(r)/$(d)/bibliography $(r)/$(d)/misc + cp -a Documentation/bibliography/*.bib $(r)/$(d)/bibliography + cp -a Documentation/misc/[ACN]* $(r)/$(d)/misc # dh_installexamples input - cp -aP `find input mutopia \( -name '*.ly' -o -name '*.tex' -o -name 'TODO' \)` \ + cp -aP `find input mutopia \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \)` \ $(r)/$(d)/examples for i in `find $(r)/$(d)/examples/ -type d -name out`; do \ mv -fv $$i/* $$i/..; rmdir $$i; done @@ -104,12 +97,12 @@ binary-arch: build install # dh_installcron # dh_installmanpages # dh_undocumented - dh_installchangelogs -k NEWS + dh_installchangelogs -k CHANGES dh_link dh_strip dh_compress dh_fixperms - dh_suidregister +# dh_suidregister dh_installdeb dh_shlibdeps dh_gencontrol @@ -117,8 +110,5 @@ binary-arch: build install dh_md5sums dh_builddeb -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - binary: binary-indep binary-arch .PHONY: build clean install binary-indep binary-arch binary diff --git a/mf/GNUmakefile b/mf/GNUmakefile index e1883dc80c..f0c0a7642b 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -51,3 +51,4 @@ $(outdir)/%.afm $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log localclean: rm -f mfplain.mem mfplain.log mpout.log + rm -f *.tfm *.log