Debian patches by Anthony Fok

diff --git a/ChangeLog b/ChangeLog
index 9b7e701ec769e068dcfe2f072549947847a86f9d..d92445e498c93a0d8795c7d9628cb815a2f20011 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-08-31  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * debian/control: Debian patches by Anthony Fok
+
        * input/regression/lyric-combine-polyphonic.ly: new file.
 
        * ly/engraver-init.ly (VoiceContext): add Grob_pq_engraver to

diff --git a/THANKS b/THANKS
index 9fee96c98006d6f3387956dbfbbb9737b4d5f47b..aa960dff5ae34ab7a091153eaa38fe25be7f5461 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,6 +1,13 @@
 
-Karl Berry
+CONTRIBUTORS
+
 Graham Percival
+
+
+BUG HUNTERS
+
+Karl-Johan Karlsson 
+Karl Berry
 Jeremie Lumbroso
 
 

diff --git a/debian/changelog b/debian/changelog
index e74ed06bf65105180af3e832578b5084cf1d177d..eaa2a170a04626b64cd78d79b0d46d7c40efb00a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+lilypond (1.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Sat, 31 Aug 2002 18:15:53 +0800
+
+lilypond (1.6.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * binary-arch: Changed "DH_OPTIONS=-a" to "DH_OPTIONS=-s" so that
+    dpkg-gencontrol would not 't choke on lilypond1.3 for unlisted
+    architectures.  Thanks to Ryan Murray for the report and suggested
+    fix.  (Closes: Bug#157766)
+
+ -- Anthony Fok <foka@debian.org>  Sun, 25 Aug 2002 11:59:01 +0800
+
 lilypond (1.5.68-2) unstable; urgency=low
 
   * Oops, I was missing Build-Depends on python-dev.  Thanks to LaMont

diff --git a/debian/control b/debian/control
index cb2b51f22a69b04c1e313eff2dfd8b3eb4c8a8c8..3bc46450f9d95a61c50644c85c7ab3f4be5140fa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,18 +28,18 @@ Description: A program for printing sheet music.
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Suggests: lilypond (>= 1.5.68-1), postscript-viewer, www-browser
+Suggests: lilypond (>= 1.6.1-1), 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.5.68-1)
+Depends: lilypond (>= 1.6.1-1)
 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 series
- (soon 1.6 series) has arrived.
+ package back to a newer lilypond because the stable 1.4 and now 1.6 series
+ have arrived.
  .
  Please feel free to remove this dummy package after you have upgraded
  to the latest lilypond.

diff --git a/debian/control.foka b/debian/control.foka
index cb2b51f22a69b04c1e313eff2dfd8b3eb4c8a8c8..3bc46450f9d95a61c50644c85c7ab3f4be5140fa 100644 (file)
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -28,18 +28,18 @@ Description: A program for printing sheet music.
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Suggests: lilypond (>= 1.5.68-1), postscript-viewer, www-browser
+Suggests: lilypond (>= 1.6.1-1), 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.5.68-1)
+Depends: lilypond (>= 1.6.1-1)
 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 series
- (soon 1.6 series) has arrived.
+ package back to a newer lilypond because the stable 1.4 and now 1.6 series
+ have arrived.
  .
  Please feel free to remove this dummy package after you have upgraded
  to the latest lilypond.

diff --git a/debian/rules b/debian/rules
index 448324c93d093ef0f015a336688f3458364edcd8..e618d46f2f8f3ba29a20b8bb00287f5c5c06ac0b 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -114,7 +114,7 @@ binary-indep: build-doc install
        dh_md5sums
        dh_builddeb
 
-binary-arch: DH_OPTIONS=-a
+binary-arch: DH_OPTIONS=-s
 binary-arch: build install
        dh_testdir
        dh_testroot