From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 26 Apr 2013 18:10:43 +0000 (-0700)
Subject: * New upstream release (closes: #705895)
X-Git-Tag: debian/2.16.2-2~2^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=87dd3dad1bbb2911e3abe351ecd31a1902bb28ba;p=lilypond.git
* New upstream release (closes: #705895)
* Put languages in their own subdocument to work around doc-base not
having a language specifier (closes: #698435)
---
diff --git a/debian/changelog b/debian/changelog
index ea9c9fe1c3..6cf360a94f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-lilypond (2.16.1-2~exp+1) experimental; urgency=low
+lilypond (2.16.2-1~exp+1) experimental; urgency=low
- * New upstream release
+ * New upstream release (closes: #705895)
+ * Put languages in their own subdocument to work around doc-base not
+ having a language specifier (closes: #698435)
-- Don Armstrong <don@debian.org> Wed, 24 Apr 2013 21:53:13 -0700
diff --git a/debian/lilypond-doc-html-cs.doc-base-special b/debian/lilypond-doc-html-cs.doc-base-special
index b8ee0b7093..867950f686 100644
--- a/debian/lilypond-doc-html-cs.doc-base-special
+++ b/debian/lilypond-doc-html-cs.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.cs
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-html-de.doc-base-special b/debian/lilypond-doc-html-de.doc-base-special
index 2d055fa10f..b365b29ff8 100644
--- a/debian/lilypond-doc-html-de.doc-base-special
+++ b/debian/lilypond-doc-html-de.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.de
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-html-es.doc-base-special b/debian/lilypond-doc-html-es.doc-base-special
index 35e682e76a..be8413a082 100644
--- a/debian/lilypond-doc-html-es.doc-base-special
+++ b/debian/lilypond-doc-html-es.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.es
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-html-fr.doc-base-special b/debian/lilypond-doc-html-fr.doc-base-special
index ad29e40c1d..0730fea07d 100644
--- a/debian/lilypond-doc-html-fr.doc-base-special
+++ b/debian/lilypond-doc-html-fr.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.fr
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-html-hu.doc-base-special b/debian/lilypond-doc-html-hu.doc-base-special
index 36f3dfe304..5154671e38 100644
--- a/debian/lilypond-doc-html-hu.doc-base-special
+++ b/debian/lilypond-doc-html-hu.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.hu
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-html-it.doc-base-special b/debian/lilypond-doc-html-it.doc-base-special
index deaa561a25..ee355ecf8c 100644
--- a/debian/lilypond-doc-html-it.doc-base-special
+++ b/debian/lilypond-doc-html-it.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.it
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-html-ja.doc-base-special b/debian/lilypond-doc-html-ja.doc-base-special
index 1ddf1bffed..264323778e 100644
--- a/debian/lilypond-doc-html-ja.doc-base-special
+++ b/debian/lilypond-doc-html-ja.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.ja
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-html-nl.doc-base-special b/debian/lilypond-doc-html-nl.doc-base-special
index 8849b7e994..ffd54409f0 100644
--- a/debian/lilypond-doc-html-nl.doc-base-special
+++ b/debian/lilypond-doc-html-nl.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.nl
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-html-zh.doc-base-special b/debian/lilypond-doc-html-zh.doc-base-special
index 71781b4423..67d468d0c3 100644
--- a/debian/lilypond-doc-html-zh.doc-base-special
+++ b/debian/lilypond-doc-html-zh.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.zh
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-pdf-de.doc-base-special b/debian/lilypond-doc-pdf-de.doc-base-special
index d8b744f571..f9489404fb 100644
--- a/debian/lilypond-doc-pdf-de.doc-base-special
+++ b/debian/lilypond-doc-pdf-de.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.de
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-pdf-es.doc-base-special b/debian/lilypond-doc-pdf-es.doc-base-special
index 8b2b062857..f8717b955e 100644
--- a/debian/lilypond-doc-pdf-es.doc-base-special
+++ b/debian/lilypond-doc-pdf-es.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.es
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-pdf-fr.doc-base-special b/debian/lilypond-doc-pdf-fr.doc-base-special
index ce5cf079c9..c6180cd4b2 100644
--- a/debian/lilypond-doc-pdf-fr.doc-base-special
+++ b/debian/lilypond-doc-pdf-fr.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.fr
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-pdf-hu.doc-base-special b/debian/lilypond-doc-pdf-hu.doc-base-special
index 9746c1d789..a990e5f49b 100644
--- a/debian/lilypond-doc-pdf-hu.doc-base-special
+++ b/debian/lilypond-doc-pdf-hu.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.hu
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-pdf-it.doc-base-special b/debian/lilypond-doc-pdf-it.doc-base-special
index 25c9414b31..19d4c9b7ac 100644
--- a/debian/lilypond-doc-pdf-it.doc-base-special
+++ b/debian/lilypond-doc-pdf-it.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.it
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc-pdf-nl.doc-base-special b/debian/lilypond-doc-pdf-nl.doc-base-special
index e0dfa56404..ce6f8871a4 100644
--- a/debian/lilypond-doc-pdf-nl.doc-base-special
+++ b/debian/lilypond-doc-pdf-nl.doc-base-special
@@ -1,4 +1,4 @@
-Document: lilypond
+Document: lilypond.nl
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music
diff --git a/debian/lilypond-doc.doc-base-special b/debian/lilypond-doc.doc-base-special
index de013fe667..fdd0cb4fe7 100644
--- a/debian/lilypond-doc.doc-base-special
+++ b/debian/lilypond-doc.doc-base-special
@@ -6,9 +6,9 @@ Abstract: This documentation describes LilyPond (the GNU Project music
a.k.a. "Music To the People."
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
+Format: Text
+Files: /usr/share/doc/lilypond/html/*.txt* /usr/share/doc/lilypond/html/Documentation/*.txt* /usr/share/doc/lilypond/html/Documentation/*/*.txt*
-Format: info
+Format: Info
Index: /usr/share/info/lilypond-usage.info.gz
Files: /usr/share/info/lilypond-*.info*
diff --git a/debian/update_doc_packages b/debian/update_doc_packages
index 883b2f26f3..4e28928f7c 100644
--- a/debian/update_doc_packages
+++ b/debian/update_doc_packages
@@ -93,7 +93,7 @@ EOF
my $docbase_fh = IO::File->new("debian/lilypond-doc-$type-${lang}.doc-base-special",'w') or
die "Unable to open debian/lilypond-doc-$type-${lang}.doc-base-special for writing: $!";
print {$docbase_fh} <<EOF;
-Document: lilypond
+Document: lilypond.${lang}
Title: GNU LilyPond, the music typesetter
Author: Various
Abstract: This documentation describes LilyPond (the GNU Project music