Debian patch.

diff --git a/ChangeLog b/ChangeLog
index b4a799103e91b0195e340f7cf1e6b45c0fe03c68..9a8cf03a8a379a9d32c6ebdd04c8680eb6c02232 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-22  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * debian/: Debian patch by Anthony Fok.
+
 2002-09-21  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/footer.html.in: How time flies: It's already 2002!

diff --git a/debian/changelog b/debian/changelog
index 1057e905e07a0bdc31a74969d9f4219440848700..696fe077c5a36a65272be3bfce09eeaf7936fd78 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+lilypond (1.6.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Higher urgency because of memory corruption bugs in previous releases.
+
+ -- Anthony Fok <foka@debian.org>  Sun, 22 Sep 2002 01:55:29 +0800
+
+lilypond (1.6.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Sat, 21 Sep 2002 11:14:48 +0800
+
 lilypond (1.6.2-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 5f3571eca34b5a102ab0491cad88f4fef5477067..b12664777d1efcd727e24b722a120807caf75c3b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,14 +28,14 @@ Description: A program for printing sheet music.
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Suggests: lilypond (>= 1.6.2-1), postscript-viewer, www-browser
+Suggests: lilypond (>= ${Source-Version}), postscript-viewer, www-browser
 Description: LilyPond Documentation in HTML, PS and DVI formats
  This package contains the HTML, PostScript and DVI documentation for the
  LilyPond music typesetting software.
 
 Package: lilypond1.3
 Architecture: arm i386 m68k powerpc sparc
-Depends: lilypond (>= 1.6.2-1)
+Depends: lilypond (>= ${Source-Version})
 Description: Dummy package for transition to new stable lilypond.
  This dummy package provides a transition from the previous lilypond1.3
  package back to a newer lilypond because the stable 1.4 and now 1.6 series

diff --git a/debian/control.foka b/debian/control.foka
index 5f3571eca34b5a102ab0491cad88f4fef5477067..b12664777d1efcd727e24b722a120807caf75c3b 100644 (file)
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -28,14 +28,14 @@ Description: A program for printing sheet music.
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Suggests: lilypond (>= 1.6.2-1), postscript-viewer, www-browser
+Suggests: lilypond (>= ${Source-Version}), postscript-viewer, www-browser
 Description: LilyPond Documentation in HTML, PS and DVI formats
  This package contains the HTML, PostScript and DVI documentation for the
  LilyPond music typesetting software.
 
 Package: lilypond1.3
 Architecture: arm i386 m68k powerpc sparc
-Depends: lilypond (>= 1.6.2-1)
+Depends: lilypond (>= ${Source-Version})
 Description: Dummy package for transition to new stable lilypond.
  This dummy package provides a transition from the previous lilypond1.3
  package back to a newer lilypond because the stable 1.4 and now 1.6 series

diff --git a/debian/rules b/debian/rules
index 2c715919c7b9e80766859c7e0ebfa06dcccdf248..b3ade4c133ccb06261767c68534037c29bb6f719 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,8 @@ 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/' \
@@ -148,7 +150,7 @@ binary-arch: build install
 #      dh_installcron
 #      dh_installman
 #      dh_undocumented
-       dh_installchangelogs -k CHANGES
+       dh_installchangelogs ChangeLog
        dh_link usr/share/lilypond/$(VERSION)/tex \
                        usr/share/texmf/tex/lilypond \
                usr/share/lilypond/$(VERSION)/fonts/source \