From 3a640c4e8d13f5460eed698c1a802836b841465b Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:05:42 +0000 Subject: [PATCH] lilypond-0.1.45 --- Documentation/lilypond.pod | 2 +- TODO | 6 ++--- bin/ly2dvi.sh | 46 ++++++++++++++++++-------------------- debian/Makefile | 2 +- debian/TODO | 6 +++-- debian/changelog | 39 ++++++++++++++++++++++++++++++++ debian/control | 14 +++++++----- debian/copyright | 7 +++--- debian/rules | 26 ++++++++++++--------- flower/Makefile | 8 ++++--- flower/TODO | 2 -- flower/configure.in | 5 +++-- input/TODO | 2 +- lib/Makefile | 2 ++ lily/VERSION | 2 +- make/Targets.make | 7 ++++-- make/Toplevel.make.in | 3 ++- make/lilypond.spec.in | 1 + 18 files changed, 115 insertions(+), 65 deletions(-) diff --git a/Documentation/lilypond.pod b/Documentation/lilypond.pod index 20a0e0b436..97e7854e23 100644 --- a/Documentation/lilypond.pod +++ b/Documentation/lilypond.pod @@ -121,7 +121,7 @@ Clef changes, meter changes, cadenza-mode, key changes, repeat bars. =head1 DISCLAIMER AND COPYING POLICY -GNU LilyPond is copyright 1996, 1997 by its authors. GNU LilyPond is +GNU LilyPond is copyright 1996-1998 by its authors. GNU LilyPond is distributed under the terms of the GNU General Public License. GNU LilyPond is provided without any warranty what so ever. GNU LilyPond may be freely distributed. For further information consult diff --git a/TODO b/TODO index 8f1ce7fa1d..7a203a5307 100644 --- a/TODO +++ b/TODO @@ -11,8 +11,6 @@ grep for TODO and ugh/ugr - configure.in - clean-fonts.sh - * check for abs() - * forced breakpoints * --metafont @@ -182,11 +180,11 @@ languages: * cautionary accidental * Output an output format independent (ofi) typeset file; and - make ofi2 TeX, MusixTex, Display PostScript, PostScript, + make ofi2 TeX, MusiXTex, Display PostScript, PostScript, Ascii... interpreters. (difficult) - poor man's ascii output possible? - - MusixTeX output possible? (would have to be done before break calc.) + - MusiXTeX output possible? (would have to be done before break calc.) - NIFF ? - Common Music Notation - PostScript output (esp. Beams, Slurs, etc) diff --git a/bin/ly2dvi.sh b/bin/ly2dvi.sh index ab82f00919..9684014716 100644 --- a/bin/ly2dvi.sh +++ b/bin/ly2dvi.sh @@ -8,7 +8,7 @@ # Original LaTeX file made by Mats Bengtsson, 17/8 1997 # -VERSION="0.6.hwn1" +VERSION="0.6.jaf2" NAME=ly2dvi.sh IDENTIFICATION="$NAME $VERSION" NOW=`date` @@ -16,6 +16,9 @@ echo "$IDENTIFICATION" 1>&2 # NEWS +# 0.6.hwn1.jaf +# - LILYINCLUDE update +# # 0.6.hwn1 # - handle LILYINCLUDE # - --output @@ -420,31 +423,26 @@ $IDENTIFICATION: dvi file name is $RESULT EOF } - # ugh. GF is side-effect. +# ugh. GF is side-effect. findInput() { - # should check for LILYINCLUDE - for lypath in `echo $LILYINCLUDE| sed 's/:/ /g'` - do - if [ x$lypath = x ] - then - lypath="." - fi - - if [ -f "$lypath/$1" ] - then - GF="$lypath/$1" - return - fi +# should check for LILYINCLUDE + for lypath in "." `echo $LILYINCLUDE| sed 's/:/ /g'` + do + if [ -f "$lypath/$1" ] + then + GF="$lypath/$1" + return + fi - if [ -f "$lypath/$1.ly" ] - then - GF="$lypath/$1.ly" - return - fi - done - $debug_echo $IDENTIFICATION": Input file "$GF" not found" - echo $NAME": Input file "$GF" not found" 1>&2 - exit 2 + if [ -f "$lypath/$1.ly" ] + then + GF="$lypath/$1.ly" + return + fi + done + $debug_echo $IDENTIFICATION": Input file "$GF" not found" + echo $NAME": Input file "$GF" not found" 1>&2 + exit 2 } # # Loop through all files diff --git a/debian/Makefile b/debian/Makefile index 7f35925fb6..531f1330c4 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -16,4 +16,4 @@ include ./$(depth)/make/Rules.make EXTRA_DISTFILES = README.Debian TODO changelog control copyright \ - info.ex menu.ex postinst postinst.old.sh postrm preinst rules watch + postinst postinst.old.sh postrm preinst rules watch diff --git a/debian/TODO b/debian/TODO index a4fc50fdbc..8a5f21bd28 100644 --- a/debian/TODO +++ b/debian/TODO @@ -1,2 +1,4 @@ -* Move ly2dvi.sh to a proper place. It is currently placed in - /usr/doc/lilypond. (1997-11-25) +Fri, 6 Feb 1998 17:24:49 -0700: + * 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. :-) diff --git a/debian/changelog b/debian/changelog index dcc446cf8f..a7a0642d11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,42 @@ +lilypond (0.1.44-1) unstable; urgency=low + + * New upstream release + + -- Anthony Fok Fri, 6 Feb 1998 22:07:39 -0700 + +lilypond (0.1.43-1) unstable; urgency=low + + * New upstream release. + * Upgraded to standards version 2.4.0.0 (no changes). + * Minor fixes to the copyright file (GPL.gz -> GPL). + * Revised the package description based on the new lilypond.lsm. + * Now includes *.gif instead of *.xpm files. + * Other minor revisions to debian/rules. + * Added version numbering to the libflower shared library. + * Now installs /usr/lib/emacs/site-lisp/mudela-mode.el, + but I haven't figured out how to use it myself. + + -- Anthony Fok Fri, 6 Feb 1998 17:26:55 -0700 + +lilypond (0.1.42-1) unstable; urgency=low + + * New upstream release. + * Now places ly2dvi in /usr/bin. + + -- Anthony Fok Thu, 29 Jan 1998 02:50:36 -0700 + +lilypond (0.1.41-1) unstable; urgency=low + + * New upstream "The Birthday Release". + + -- Anthony Fok Wed, 21 Jan 1998 02:20:00 -0700 + +lilypond (0.1.40-1) unstable; urgency=low + + * New upstream release. + + -- Anthony Fok Mon, 12 Jan 1998 19:19:50 -0700 + lilypond (0.1.39-2) unstable; urgency=low * debian/control: diff --git a/debian/control b/debian/control index 5da70c7c86..a99665244f 100644 --- a/debian/control +++ b/debian/control @@ -2,18 +2,20 @@ Source: lilypond Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 2.3.0.1 +Standards-Version: 2.4.0.0 Package: lilypond Architecture: any Depends: ${shlibs:Depends} Recommends: tetex-base Conflicts: musixtex-fonts -Description: A music typesetting program. - GNU LilyPond is a program which converts a music-script (mudela) into TeX - output, or MIDI to produce multi-staff scores. Features include multiple - meters, clefs, keys, lyrics, versatile input-language, cadenzas beams, - slurs, triplets, multiple voices. +Description: The GNU Project music typesetter. + LilyPond is the GNU Project music typesetter. The program generates + visual or auditive output from a music definition file: it can typeset + formatted sheet music to a TeX file and play (mechanical) performances + to a MIDI file. Features include multiple staffs, meters, clefs, + keys, lyrics, versatile input-language, cadenzas, beams, slurs, + triplets. It includes a nice font of musical symbols. . URL: http://www.stack.nl/~hanwen/lilypond/ Authors: Han-Wen Nienhuys diff --git a/debian/copyright b/debian/copyright index 613a8d3967..16c78c5b47 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Wed, 6 Aug 1997 04:30:28 -0600 It was downloaded from ftp://pcnov095.win.tue.nl/pub/lilypond/development/ - lilypond-0.1.39.tar.gz + lilypond-0.1.44.tar.gz It is also available from: ftp://alpha.gnu.org/gnu/ @@ -32,8 +32,7 @@ Copyright: You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA All the other scripts and control files for building and installing @@ -41,4 +40,4 @@ GNU LilyPond under Debian GNU/Linux are also under the GNU General Public License (GPL) version 2 or later. On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/doc/copyright/GPL.gz'. +Public License can be found in `/usr/doc/copyright/GPL'. diff --git a/debian/rules b/debian/rules index f0d60cfc7c..b71ba55d43 100644 --- a/debian/rules +++ b/debian/rules @@ -8,9 +8,9 @@ # Currently maintained by Anthony Fok # for Debian GNU/Linux. -package=lilypond +package = lilypond -SHELL=/bin/bash +SHELL = /bin/bash # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -21,7 +21,8 @@ build-stamp: ./configure --disable-checking --disable-debugging \ --enable-printing --prefix=/usr --enable-optimise \ --enable-shared - make all + $(MAKE) all + $(MAKE) -C Documentation gifs touch build-stamp clean: @@ -29,10 +30,7 @@ clean: dh_testroot rm -f build-stamp -$(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. binary-indep: build @@ -41,14 +39,17 @@ binary-indep: build binary-arch: build dh_testdir dh_testroot - dh_installdirs usr/lib/texmf/doc - $(MAKE) prefix=`pwd`/debian/tmp/usr install + dh_installdirs usr/lib/texmf/doc usr/lib/emacs/site-lisp ln -fs ../../../doc/lilypond debian/tmp/usr/lib/texmf/doc/lilypond + $(MAKE) prefix=`pwd`/debian/tmp/usr install + cp -av bin/out/ly2dvi debian/tmp/usr/bin + cp -av mudela-mode.el debian/tmp/usr/lib/emacs/site-lisp dh_installdocs ANNOUNCE ANNOUNCE-0.1 README NEWS ONEWS DEDICATION \ BUGS TODO \ - Documentation/out/*.text Documentation/*.doc \ - Documentation/lelie_logo.xpm bin/ly2dvi.sh - dh_installexamples input/*.ly input/*.tex + Documentation/*.doc Documentation/out/{*.txt,*.gif} + dh_installexamples input/{*.ly,TODO} + cp -aPv `find mutopia \( -name '*.ly' -o -name '*.tex' -o -name 'TODO' \)` \ + debian/tmp/usr/doc/lilypond/examples # dh_installmenu # dh_installcron # dh_installmanpages @@ -66,5 +67,8 @@ binary-arch: build 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 binary-indep binary-arch binary diff --git a/flower/Makefile b/flower/Makefile index 13daeba0b8..0aa02c7cc8 100644 --- a/flower/Makefile +++ b/flower/Makefile @@ -64,16 +64,18 @@ localdist: configure # localdistclean: - rm -f config.cache config.status + rm -f config.cache config.status config.log localinstall: $(LIBFLOWER) ifeq ($(LIB_SUFFIX),.so) $(INSTALL) -d $(libdir) - $(INSTALL) $(LIBFLOWER) $(libdir) + $(INSTALL) $(LIBFLOWER).$(VERSION) $(libdir) + ln -s $(LIB_PREFIX)flower$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)flower$(LIB_SUFFIX).$(MAJOR_VERSION) + ln -s $(LIB_PREFIX)flower$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)flower$(LIB_SUFFIX) endif localuninstall: - rm -f $(libdir)/libflower.{so,a} + rm -f $(libdir)/libflower.{so*,a} $(outdir)/flower-version.o: $(outdir)/version.hh diff --git a/flower/TODO b/flower/TODO index e572af7954..5586845c99 100644 --- a/flower/TODO +++ b/flower/TODO @@ -16,8 +16,6 @@ * Automake, libtool - * version numbering for shared lib. - * LGPL? * disable this auto conv: const pointer -> bool -> string diff --git a/flower/configure.in b/flower/configure.in index dd20827eae..d0bd09bbc2 100644 --- a/flower/configure.in +++ b/flower/configure.in @@ -6,6 +6,7 @@ AC_LANG_CPLUSPLUS optimise_b=yes shared_b=no LIB_SUFFIX=.a +MODULE_CXXFLAGS="$MODULE_CXXFLAGS -D_REENTRANT" if test x$host = xNONE; then OUTDIR_NAME=${OUTDIR_NAME-"out"} @@ -34,8 +35,8 @@ AC_ARG_ENABLE(out-dir, []) if test $shared_b = yes; then - MODULE_CXXFLAGS="$MODULE_CXXFLAGS -fPIC" - MODULE_LDFLAGS="-shared -Wl,-soname,libflower.so " + MODULE_CXXFLAGS="$MODULE_CXXFLAGS -fPIC -DPIC" + MODULE_LDFLAGS="-shared -Wl,-soname,libflower.so.\$(VERSION) " LIB_SUFFIX=.so fi diff --git a/input/TODO b/input/TODO index 94237dfc2d..d1af953ae3 100644 --- a/input/TODO +++ b/input/TODO @@ -1,5 +1,5 @@ - neaten/structure examples - - rename/split into test/exapmles? + - rename/split into test/examples? diff --git a/lib/Makefile b/lib/Makefile index 9538b989ae..83dfc51d4f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -40,6 +40,8 @@ VERSION_DEPENDENCY =# EXTRA_DISTFILES = config.hh.in # +MODULE_CXXFLAGS += -D_REENTRANT + # list of custom libraries: LOADLIBES += diff --git a/lily/VERSION b/lily/VERSION index 5602a9c772..0318f75fa8 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 44 +PATCH_LEVEL = 45 MY_PATCH_LEVEL = diff --git a/make/Targets.make b/make/Targets.make index 60dce8dcdd..f72367cab9 100644 --- a/make/Targets.make +++ b/make/Targets.make @@ -57,8 +57,11 @@ SHAREDLIBRARY=$(outdir)/$(LIB_PREFIX)$(NAME).so $(SHAREDLIBRARY): $(build) $(OFILES) $(MODULE_LIBDEPS) $(INCREASE_BUILD) $(MAKE) $(OFILES) $(SILENT_LOG) - $(LD_COMMAND) $(OFILES) -o $@ -# ln -sf $(outdir)/$(LIB_PREFIX)$(NAME).so.$(VERSION) $(outdir)/$(LIB_PREFIX)$(NAME).so + $(LD_COMMAND) $(OFILES) -o $@.$(VERSION) + rm -f $@ + ln -sf $(outdir)/$(LIB_PREFIX)$(NAME).so.$(VERSION) $@.$(MAJOR_VERSION) + ln -sf $(LIB_PREFIX)$(NAME).so.$(VERSION) $@ + # lib: $(LIBRARY) # diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in index 8f72d5cb62..d000ef9013 100644 --- a/make/Toplevel.make.in +++ b/make/Toplevel.make.in @@ -59,8 +59,9 @@ INSTALL.txt: check-doc-deps check-mf-deps # all machine generated junk resides in out/ distclean: set -e; for i in `find -type d -name 'out'`; do \ - rm -f $$i/*; done + rm -f $$i/* $$i/.build; done rm -rf *-build-dir + ( cd flower && rm -f config.cache config.status config.log ) rm -f Makefile config.cache config.status config.log diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index 799b8758b8..1597e7794c 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -18,6 +18,7 @@ to a TeX file and play (mechanical) performances to a MIDI file. Features include multiple staffs, meters, clefs, keys, lyrics, versatile input-language, cadenzas, beams, slurs, triplets. +It includes a nice font of musical symbols. %prep %setup -- 2.39.5