* 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 ea9c9fe1c35dee9307ef1e7dd9cb868ae48da77e..6cf360a94fb6367bcda935956151d852f79999ed 100644 (file)
--- 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 b8ee0b709371c7a1411d9dc49052097def19d362..867950f686844cd75d17a3e4854f0bd28d68af11 100644 (file)
--- 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 2d055fa10f9eeb29099b837b89fc10ba13208aef..b365b29ff8f0c042cf02c646870d837a4745d38d 100644 (file)
--- 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 35e682e76ae1ae4c13116411c13b941fea8d28db..be8413a082c58f663a962505d5ac65a4ca8c4d3c 100644 (file)
--- 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 ad29e40c1d9f5b1d696fb1b0bb5c12a2dc3ddebe..0730fea07d05b589e0f5f1391dba07f5de5ecabd 100644 (file)
--- 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 36f3dfe30456ae13068c16a3552f4c3f05a8f8a4..5154671e38fed70f32361ba1995c18042a5a6c1c 100644 (file)
--- 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 deaa561a2532ceabcf1b97ef09f11845e75c0e05..ee355ecf8c4df2c0e0d0ecb85ce36d8ae7dbc6ae 100644 (file)
--- 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 1ddf1bffed867e36be5041d55f1d4c0bc6315c7e..264323778ea03ed22579201e40bdc267128564f7 100644 (file)
--- 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 8849b7e99438612d4b09f85605c1118d1289fd2a..ffd54409f0f97f981d2d9ae0e1dbb911d500031e 100644 (file)
--- 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 71781b44238b747c2c604c2714b3a4680453ea59..67d468d0c3e6701cf84ee8be4b9cd49908301469 100644 (file)
--- 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 d8b744f5716af687b2d4269111a318d45fe3fb77..f9489404fbafbeb77c49d07c858ba2f8d28e15a4 100644 (file)
--- 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 8b2b06285773cfefaddbfbe119fee63d3d88a7fa..f8717b955e4c57b08546743964fffb1ec2925cf2 100644 (file)
--- 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 ce5cf079c9abb7fc97a27f0e9fcb578dabaa0fe9..c6180cd4b25c5129ab6fe9aba6e6bc4a2b4b0a09 100644 (file)
--- 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 9746c1d789acae497fbb1a2a4c9f008448b28bb3..a990e5f49ba9e065631bb3651621cf02cf81478c 100644 (file)
--- 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 25c9414b317af481ef8e3d3bdf02bcc271b3eb0d..19d4c9b7acba3925ca1a63f5754c466ce400295a 100644 (file)
--- 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 e0dfa5640461db78a3777eccf90af2f1a32c0089..ce6f8871a4ad8ca110adb6382d4094bc5a76a3c0 100644 (file)
--- 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 de013fe66766810276dc1cdecc3b4b320428b6e1..fdd0cb4fe7c0b50d0a90e072d7366b72d09cc181 100644 (file)
--- 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 883b2f26f3318ec91cbcb406e47e5d6aa545f4f7..4e28928f7cc34c6e304d4e2dc2d9d0186d346e41 100644 (file)
--- 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