From: Jan Nieuwenhuizen Date: Tue, 15 Apr 2003 14:32:17 +0000 (+0000) Subject: * (debian): Update. X-Git-Tag: release/1.6.10~5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=15981a8228be272fc9d7ae6b8418e9ca419b5402;p=lilypond.git * (debian): Update. --- diff --git a/ChangeLog b/ChangeLog index 08e4632b9f..6c437023e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-04-15 Jan Nieuwenhuizen + + * (debian): Update. + 2003-04-14 Jan Nieuwenhuizen * Backport flex issue: diff --git a/debian/changelog b/debian/changelog index 696fe077c5..f6f5318564 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +lilypond (1.6.9-1) unstable; urgency=low + + * New upstream release. + * Depend on mftrace iso pktrace. + * Add guile-1.6-dev as alternative dependency to libguile-dev + * Remove netpbm, bibtex2html dependencies. + * Remove gcc-3.x/lexer kludge. + + -- Tue, 15 Apr 2003 14:25:54 +0200 + +lilypond (1.6.6-2) unstable; urgency=high + + * Hmm, so /usr/share/texmf/dvips/config is an symlink, and thus + /usr/share/lilypond/1.6.6/dvips/lilypond.map conflicts with tetex-base. + Let's move it to /etc/texmf/dvips/lilypond.map then, and make it a + conffile. Thanks for all the (duplicate) bug reports! ;-) + (Closes: Bug#169811, #169812, #169877, #169946) + + -- Anthony Fok Sat, 23 Nov 2002 19:21:04 +0800 + +lilypond (1.6.6-1) unstable; urgency=medium + + * New upstream release. + * Updated Debian section in Documentation/topdocs/INSTALL.texi. + * FTBFS bug due to bugs in bison-1.50. Now explicitly Build-Depends + on bison << 1:1.50 or >= 1:1.75-1. (Closes: Bug#165662) + + -- Anthony Fok Tue, 22 Oct 2002 02:05:33 +0800 + lilypond (1.6.4-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index b12664777d..47bbbcc933 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: lilypond -Build-Depends: debhelper (>= 3.0.5), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python-dev, libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison, texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1), pktrace (>= 1.0.3-1), pfaedit (>= 0.0.20020312-1), autotrace, t1utils -Build-Depends-Indep: bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1) +Build-Depends: debhelper (>= 3.0.5), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python-dev, libguile-dev (>= 1:1.4-9) | guile-1.6-dev (>= 1.6), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison (<< 1:1.50) | bison (>= 1:1.75-1), texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.12-2), pfaedit (>= 0.0.20020312-1), autotrace, t1utils +Build-Depends-Indep: gs | gs-aladdin Section: tex Priority: optional Maintainer: Anthony Fok diff --git a/debian/control.foka b/debian/control.foka index b12664777d..5f9d34177d 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -1,5 +1,5 @@ Source: lilypond -Build-Depends: debhelper (>= 3.0.5), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python-dev, libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison, texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1), pktrace (>= 1.0.3-1), pfaedit (>= 0.0.20020312-1), autotrace, t1utils +Build-Depends: debhelper (>= 3.0.5), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python-dev, libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison (<< 1:1.50) | bison (>= 1:1.75-1), texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1), pktrace (>= 1.0.3-1), pfaedit (>= 0.0.20020312-1), autotrace, t1utils Build-Depends-Indep: bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1) Section: tex Priority: optional diff --git a/debian/lilypond.dirs b/debian/lilypond.dirs index 188c688e7c..69698c0923 100644 --- a/debian/lilypond.dirs +++ b/debian/lilypond.dirs @@ -5,3 +5,4 @@ usr/share/texmf/tex usr/share/texmf/fonts/source/public usr/share/texmf/fonts/afm/public usr/share/texmf/fonts/tfm/public +etc/texmf/dvips diff --git a/debian/preinst b/debian/preinst index 270b2db61d..c9f6599c46 100644 --- a/debian/preinst +++ b/debian/preinst @@ -4,7 +4,7 @@ # 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, 5 Apr 1999 20:30:12 -0600 +# Last modified: Sat, 23 Nov 2002 19:08:54 +0800 set -e @@ -36,6 +36,11 @@ case "$1" in rm -rf $VARTEXFONTS/tfm/$font_supplier/mf rm -rf $VARTEXFONTS/pk/*/$font_supplier/mf fi + + # Since 1.6.6-2, /etc/texmf/dvips/lilypond.map is no longer a symlink + if [ -L /etc/texmf/dvips/lilypond.map ]; then + rm -f /etc/texmf/dvips/lilypond.map + fi ;; abort-upgrade) diff --git a/debian/rules b/debian/rules index b3ade4c133..f14364b547 100644 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,5 @@ #!/usr/bin/make -f -# Made with the aid of debhelper by Joey Hess, -# based on the sample debian/rules file for GNU hello by Ian Jackson. +# debian/rules for LilyPond in Debian. # # This is free software; see the GNU General Public Licence # version 2 or later for copying conditions. There is NO warranty. @@ -18,13 +17,6 @@ d = usr/share/doc/$(package) include VERSION VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL) -#export CC = gcc-3.2 -#export CXX = g++-3.2 -gcc_version = $(shell g++ --version 2>&1 \ - | grep '[0-9]\.[0-9]' | head -1 \ - | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \ - -e 's/^\([0-9]\+\).*/\1/') - # "main_memory = 263000" in /etc/texmf/texmf.cnf isn't large enough # for latex to process standchen.dvi.latex, so adding extra_mem_* ... # export extra_mem_top = 100000 @@ -50,16 +42,11 @@ export DH_OPTIONS build: build-stamp build-stamp: dh_testdir - - if [ "$(gcc_version)" = "3" ]; then ./lexer-gcc-3.1.sh; fi - CPPFLAGS=-I`pwd`/lily/out \ ./configure --enable-checking --enable-debugging \ --prefix=/usr --enable-optimise \ --infodir='$${prefix}/share/info' \ --mandir='$${prefix}/share/man' - if [ "$(gcc_version)" = "3" ]; then ./lexer-gcc-3.1.sh; fi $(MAKE) MAKE_PFA_FILES=1 - touch build-stamp build-doc: build build-doc-stamp @@ -151,6 +138,9 @@ binary-arch: build install # dh_installman # dh_undocumented dh_installchangelogs ChangeLog + + mv $(r)/usr/share/lilypond/$(VERSION)/dvips/lilypond.map \ + $(r)/etc/texmf/dvips/lilypond.map dh_link usr/share/lilypond/$(VERSION)/tex \ usr/share/texmf/tex/lilypond \ usr/share/lilypond/$(VERSION)/fonts/source \ @@ -159,8 +149,8 @@ binary-arch: build install usr/share/texmf/fonts/afm/public/lilypond \ usr/share/lilypond/$(VERSION)/fonts/tfm \ usr/share/texmf/fonts/tfm/public/lilypond \ - usr/share/lilypond/$(VERSION)/dvips/lilypond.map \ - usr/share/texmf/dvips/config/lilypond.map + etc/texmf/dvips/lilypond.map \ + usr/share/lilypond/$(VERSION)/dvips/lilypond.map dh_strip dh_compress dh_fixperms