From: Han-Wen Nienhuys Date: Sat, 31 Aug 2002 11:44:09 +0000 (+0000) Subject: Debian patches by Anthony Fok X-Git-Tag: release/1.6.2~14 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=18b49bfeb25d0437057fd145a4472932d7ecf945;p=lilypond.git Debian patches by Anthony Fok --- diff --git a/ChangeLog b/ChangeLog index 9b7e701ec7..d92445e498 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-08-31 Han-Wen Nienhuys + * 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 9fee96c980..aa960dff5a 100644 --- 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 e74ed06bf6..eaa2a170a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +lilypond (1.6.1-1) unstable; urgency=low + + * New upstream release. + + -- Anthony Fok 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 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 cb2b51f22a..3bc46450f9 100644 --- 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 cb2b51f22a..3bc46450f9 100644 --- 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 448324c93d..e618d46f2f 100644 --- 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