From 578eef0c2a7f49521d37727a8933e2f200a73086 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Mon, 11 Nov 2013 10:07:24 -0800 Subject: [PATCH] Do not include non-existant paths in lilypond-doc.doc-base-special (closes: #693238) * Do not include non-existant paths in lilypond-doc.doc-base-special (closes: #693238) * Breaks/Replaces lilypond-doc in html packages to stop problems on wheezy upgrade. (Closes: #718013) --- debian/changelog | 9 ++++++++ debian/control | 32 ++++++++++++++++++++++++++++ debian/lilypond-doc.doc-base-special | 2 +- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c47b10a7fd..8f92182639 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +lilypond (2.16.2-3) UNRELEASED; urgency=low + + * Do not include non-existant paths in lilypond-doc.doc-base-special + (closes: #693238) + * Breaks/Replaces lilypond-doc in html packages to stop problems on + wheezy upgrade. (Closes: #718013) + + -- Don Armstrong Mon, 11 Nov 2013 09:57:06 -0800 + lilypond (2.16.2-2) unstable; urgency=low * Fix bad syntax in texinfo documentation exposed by texinfo >= 5.1 diff --git a/debian/control b/debian/control index 77b17bc503..9b60bf8db8 100644 --- a/debian/control +++ b/debian/control @@ -93,6 +93,8 @@ Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info Recommends: mozilla-browser | www-browser Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond HTML Documentation LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -105,6 +107,8 @@ Section: doc Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond HTML Documentation in Czech LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -117,6 +121,8 @@ Section: doc Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond HTML Documentation in German LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -129,6 +135,8 @@ Section: doc Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond HTML Documentation in Spanish LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -141,6 +149,8 @@ Section: doc Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond HTML Documentation in French LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -153,6 +163,8 @@ Section: doc Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond HTML Documentation in Hungarian LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -165,6 +177,8 @@ Section: doc Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond HTML Documentation in Italian LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -177,6 +191,8 @@ Section: doc Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond HTML Documentation in Japanese LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -189,6 +205,8 @@ Section: doc Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond HTML Documentation in Dutch LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -201,6 +219,8 @@ Section: doc Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond HTML Documentation in Chinese LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -214,6 +234,8 @@ Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info Recommends: evince | pdf-viewer Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond PDF Documentation in German LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -227,6 +249,8 @@ Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info Recommends: evince | pdf-viewer Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond PDF Documentation in Spanish LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -240,6 +264,8 @@ Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info Recommends: evince | pdf-viewer Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond PDF Documentation in French LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -253,6 +279,8 @@ Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info Recommends: evince | pdf-viewer Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond PDF Documentation in Hungarian LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -266,6 +294,8 @@ Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info Recommends: evince | pdf-viewer Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond PDF Documentation in Italian LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. @@ -279,6 +309,8 @@ Architecture: all Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info Recommends: evince | pdf-viewer Suggests: lilypond (>= ${source:Version}) +Replaces: lilypond-doc (< 2.16.2-1~exp+1) +Breaks: lilypond-doc (< 2.16.2-1~exp+1) Description: LilyPond PDF Documentation in Dutch LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. diff --git a/debian/lilypond-doc.doc-base-special b/debian/lilypond-doc.doc-base-special index fdd0cb4fe7..54cfa743cc 100644 --- a/debian/lilypond-doc.doc-base-special +++ b/debian/lilypond-doc.doc-base-special @@ -7,7 +7,7 @@ Abstract: This documentation describes LilyPond (the GNU Project music Section: Typesetting Format: Text -Files: /usr/share/doc/lilypond/html/*.txt* /usr/share/doc/lilypond/html/Documentation/*.txt* /usr/share/doc/lilypond/html/Documentation/*/*.txt* +Files: /usr/share/doc/lilypond/html/Documentation/*.txt* Format: Info Index: /usr/share/info/lilypond-usage.info.gz -- 2.39.2