* debian/: Late Debian update (sorry Anthony).

diff --git a/ChangeLog b/ChangeLog
index 5bbc0166d0255b8b26b75d6a67493cb14da209e8..e1e1f0a9a07574d49a7a72076b4d5bcce5c6e49c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-02-10  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * debian/: Late Debian update (sorry Anthony).
+
        * scripts/lilypond-book.py (do_file): Look for input_file in
        include path, or ask kpathsea if LATEX.
 

diff --git a/debian/changelog b/debian/changelog
index 7b8c5aec6dd12f733d8e4455773d0510eef26c2e..d4c384b66d7a366aee0258700c19bd2f5ec454b0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-lilypond (1.9.9-jcn1) unstable; urgency=low
+lilypond (2.1.0-1) unstable; urgency=low
 
-  * Testing.
+  * New upstream release.
+  * Build-Requires: pfaedit (>= 0.0.20031020-3) to prevent FTBFS on alpha.
+    Thanks to Petter Reinholdtsen for the bug report, and thanks to
+     Peter Hawkins for adopting the PfaEdit package!  (Closes: Bug#217216)
+  * Build process used to redirect to /dev/stderr which does not exist in
+    all environments.  Upstream replaced it with ">&2" in 1.9.0 in August.
+    Thanks to Daniel Schepler for the bug report.  (Closes: #215481)
+  * Added symlink from /usr/share/lilypond/$(VERSION)/fonts/type1 to
+    /usr/share/texmf/fonts/type1/public/lilypond.  Thanks to Pedro Kroger
+    and Mats Bengtsson's discussion on the lilypond-devel:
+    http://mail.gnu.org/archive/html/lilypond-devel/2003-10/msg00016.html
 
- -- Jan Nieuwenhuizen <janneke@gnu.org>  Tue, 23 Sep 2003 23:06:05 +0200
+ -- Anthony Fok <foka@debian.org>  Sat, 25 Oct 2003 19:34:41 +0800
 
 lilypond (1.8.1-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index fb529529cee26e601a94845a190cb79bf3e6cd85..d7f0c16c96cfbaa99fa7be1d5ce1201b68c8cd95 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
 Source: lilypond
-Build-Depends: debhelper (>= 4.0.0), 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, guile-1.6-dev | libguile-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14) | flex-old, bison (<< 1:1.50) | bison (>> 1:1.75-1), texinfo (>= 4.6-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.17-1), pfaedit (>= 0.0.20020312-1), autotrace (>= 0.29-1.4), t1utils
+Build-Depends: debhelper (>= 4.0.0), 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, guile-1.6-dev | libguile-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14) | flex-old, bison (<< 1:1.50) | bison (>> 1:1.75-1), texinfo (>= 4.6-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.17-1), pfaedit (>= 0.0.20031020-3), autotrace (>= 0.29-1.4), t1utils
 Build-Depends-Indep: gs | gs-aladdin, netpbm (>= 2:9.10-1)
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 3.6.0
+Standards-Version: 3.6.1
 
 Package: lilypond
 Architecture: any

diff --git a/debian/control.foka b/debian/control.foka
index fb529529cee26e601a94845a190cb79bf3e6cd85..d7f0c16c96cfbaa99fa7be1d5ce1201b68c8cd95 100644 (file)
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -1,10 +1,10 @@
 Source: lilypond
-Build-Depends: debhelper (>= 4.0.0), 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, guile-1.6-dev | libguile-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14) | flex-old, bison (<< 1:1.50) | bison (>> 1:1.75-1), texinfo (>= 4.6-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.17-1), pfaedit (>= 0.0.20020312-1), autotrace (>= 0.29-1.4), t1utils
+Build-Depends: debhelper (>= 4.0.0), 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, guile-1.6-dev | libguile-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14) | flex-old, bison (<< 1:1.50) | bison (>> 1:1.75-1), texinfo (>= 4.6-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.17-1), pfaedit (>= 0.0.20031020-3), autotrace (>= 0.29-1.4), t1utils
 Build-Depends-Indep: gs | gs-aladdin, netpbm (>= 2:9.10-1)
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 3.6.0
+Standards-Version: 3.6.1
 
 Package: lilypond
 Architecture: any

diff --git a/debian/rules b/debian/rules
index fb06f3b809d4c5d63c0a5c54490d019bc5a70f34..c95956fbd1527b66f56ed386c86d740d2674e8d8 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -158,6 +158,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)/fonts/type1 \
+                       usr/share/texmf/fonts/type1/public/lilypond \
                etc/texmf/dvips/lilypond.map \
                        usr/share/lilypond/$(VERSION)/dvips/lilypond.map
        dh_strip