From 00d6b6011ec8e7d2734dc2fc87b2f6948db57eb7 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:47:31 +0000 Subject: [PATCH] lilypond-1.1.33 --- debian/changelog | 17 +++++++++++++++ debian/control.foka | 5 +++-- debian/control.in | 2 +- debian/copyright | 4 ++-- debian/postinst | 9 +++++++- debian/rules | 53 ++++++++++++++++++++++++++++++--------------- stepmake/aclocal.m4 | 47 ++++++++++++++++++++++++++++++++++------ 7 files changed, 107 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0cdc629af7..c31123b6ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +lilypond (1.1.31-1) unstable; urgency=low + + * New upstream release. + * Re-incorporated the changes in debian/rules and debian/postinst + from lilypond_1.0.xx series. I forgot these changes when I moved + from 1.0.19.uu3-1 to 1.1.29-1. Sorry! :-) + * [make/lilypond-vars.make]: Copied the definition of TEX_TFMDIR from + make/toplevel.make.in and added it to LILYINCLUDE... + * Applied the patch lilypond-1.1.31.jcn1.diff from Jan Nieuwenhuizen. + * [debian/rules]: + - Temporarily use "-$(MAKE) -k -C Documentation/tex dvi" to + circumvent the occasional \times segfault problem when building + refman.dvi. + - Added symlink /usr/lib/texmf/fonts/tfm/public/lilypond. + + -- Anthony Fok Thu, 18 Feb 1999 00:25:04 -0700 + lilypond (1.1.29-1) unstable; urgency=low * New upstream release. diff --git a/debian/control.foka b/debian/control.foka index 0dfe808530..52b35a3aca 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -14,11 +14,12 @@ Description: The GNU Project music typesetter. beautiful sheet music from a music definition file. It can also play mechanical performances to a MIDI file. Features include multiple staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas, - beams, slurs, triplets, formatting scores, part extraction. It includes - a nice font of musical symbols. + beams, slurs, triplets, named chords, transposing, formatting scores, + part extraction. It includes a nice font of musical symbols. . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ http://sca.uwaterloo.ca/~praetzel/lilypond/ + http://www.lilypond.org/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/debian/control.in b/debian/control.in index e864f15973..262d03e3ce 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,6 +14,6 @@ Description: The GNU Project music typesetter.@BLURB@ URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ http://sca.uwaterloo.ca/~praetzel/lilypond/ - http://www.lilypond.org/ + http://www.lilypond.org/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/debian/copyright b/debian/copyright index f27e69008b..aa4d619705 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.1.29.tar.gz + ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.1/lilypond-1.1.31.tar.gz It is also available from: @@ -20,7 +20,7 @@ Authors: Copyright: - GNU LilyPond is Copyright (C) 1996-1998 + GNU LilyPond is Copyright (C) 1996-1999 Jan Nieuwenhuizen & Han-Wen Nienhuys This program is free software; you can redistribute it and/or modify diff --git a/debian/postinst b/debian/postinst index e7f9906b71..7f781eb295 100644 --- 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/rules b/debian/rules index adf3d4219c..38207cad73 100644 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,24 @@ # 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 \ + stepmake/stepmake/aclocal.m4 \ + stepmake/GNUmakefile \ + 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 @@ -20,13 +34,16 @@ build: build-stamp build-stamp: dh_testdir - # CC=egcc LIBS=-lqthreads CC=egcc ./configure --disable-checking --disable-debugging \ --enable-printing --prefix=/usr --disable-optimise \ --enable-shared $(MAKE) all # $(MAKE) htmldoc + # 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 + touch build-stamp clean: @@ -34,36 +51,37 @@ 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 --dereference $$SUDO_USER.$$SUDO_GID; \ - else \ - find . -user root | xargs -r chown --dereference $$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 \ + usr/lib/texmf/fonts/tfm/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 + ln -s ../../../../../share/lilypond/afm $(r)/usr/lib/texmf/fonts/tfm/public/lilypond + touch install-stamp # Build architecture-independent files here. @@ -79,7 +97,8 @@ binary-arch: build install 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/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 38ec73410c..3d65f241f9 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -165,8 +165,8 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ # gh_scm2doubles,gh_doubles2scm are new in 1.3 GUILE_FLAGS AC_CHECK_LIB(guile, gh_scm2doubles, - LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[[/-_a-zA-Z0-9]]]\+ //g'` $LIBS"; - AC_DEFINE(HAVE_LIBGUILE), , $GUILE_LDFLAGS dnl + [LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[/-_a-zA-Z0-9]]\+ //g'` $LIBS" + AC_DEFINE(HAVE_LIBGUILE)], , $GUILE_LDFLAGS dnl ) if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then AC_STEPMAKE_WARN(You should install guile 1.3 or newer) @@ -358,8 +358,8 @@ AC_DEFUN(AC_STEPMAKE_LEXYACC, [ AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or newer) if test $BISON != "error"; then - bison_version=`$BISON --version| sed 's/^.*version 1.//g' ` - if test $bison_version -lt 25; then + bison_version=`$BISON --version | sed 's/^.*version 1.//g'` + if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then AC_STEPMAKE_WARN(Your bison is a bit old (1.$bison_version). You might have to install 1.25) fi fi @@ -652,6 +652,39 @@ AC_DEFUN(AC_CHECK_SEARCH_RESULT, [ fi ]) +dnl GUILE_FLAGS --- set flags for compiling and linking with Guile +dnl +dnl This macro runs the `guile-config' script, installed with Guile, +dnl to find out where Guile's header files and libraries are +dnl installed. It sets two variables, marked for substitution, as +dnl by AC_SUBST. +dnl +dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build +dnl code that uses Guile header files. This is almost +dnl always just a -I flag. +dnl +dnl GUILE_LDFLAGS --- flags to pass to the linker to link a +dnl program against Guile. This includes `-lguile' for +dnl the Guile library itself, any libraries that Guile +dnl itself requires (like -lqthreads), and so on. It may +dnl also include a -L flag to tell the compiler where to +dnl find the libraries. + +AC_DEFUN([GUILE_FLAGS],[ +## The GUILE_FLAGS macro. + ## First, let's just see if we can find Guile at all. + AC_MSG_CHECKING(for Guile) + guile-config link > /dev/null || { + echo "configure: cannot find guile-config; is Guile installed?" 1>&2 + exit 1 + } + GUILE_CFLAGS="`guile-config compile`" + GUILE_LDFLAGS="`guile-config link`" + AC_SUBST(GUILE_CFLAGS) + AC_SUBST(GUILE_LDFLAGS) + AC_MSG_RESULT(yes) +]) + # Configure paths for GTK+ # Owen Taylor 97-11-3 @@ -678,7 +711,7 @@ dnl LIBS="$LIBS $GTK_LIBS" dnl dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent +dnl checks the results of gtk-config to some extent) dnl AC_TRY_RUN([ #include @@ -759,7 +792,7 @@ AC_DEFUN(AM_PATH_GTKMM, [dnl dnl -dnl Check check if the installed GTK-- is sufficiently new. +dnl Check if the installed GTK-- is sufficiently new. dnl AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) min_gtkmm_version=ifelse([$1], ,0.9.14,$1) @@ -948,7 +981,7 @@ dnl LIBS="$LIBS $GTK___LIBS" dnl dnl Now check if the installed GTK__ is sufficiently new. (Also sanity -dnl checks the results of gtk__-config to some extent +dnl checks the results of gtk__-config to some extent) dnl AC_TRY_RUN([ #include -- 2.39.5