ubuntu-packaging-guide-team team mailing list archive

[Dmitry Shachnev <mitya57@xxxxxxxxx>]

Dmitry Shachnev has proposed merging lp:~mitya57/ubuntu-packaging-guide/singlehtml-doc-base into lp:ubuntu-packaging-guide.

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)

For more details, see:
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/singlehtml-doc-base/+merge/177260

Currently doc-base prints these warnings whenever it's triggered by dpkg:

Processing 1 changed doc-base file, 6 added doc-base files...
Error while merging /usr/share/doc-base/ubuntu-packaging-guide-html with /usr/share/doc-base/ubuntu-packaging-guide-html-single: format html already defined.
Error while merging /usr/share/doc-base/ubuntu-packaging-guide-html-es with /usr/share/doc-base/ubuntu-packaging-guide-html-es-single: format html already defined.
Error while merging /usr/share/doc-base/ubuntu-packaging-guide-html-ru with /usr/share/doc-base/ubuntu-packaging-guide-html-ru-single: format html already defined.

This branch attempts to fix these warnings by renaming the doc-base document names.
-- 
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/singlehtml-doc-base/+merge/177260
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~mitya57/ubuntu-packaging-guide/singlehtml-doc-base into lp:ubuntu-packaging-guide.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-16 03:40:50 +0000
+++ debian/changelog	2013-07-27 15:14:25 +0000
@@ -1,8 +1,13 @@
 ubuntu-packaging-guide (0.3.3) UNRELEASED; urgency=low
 
+  [ Andrew Starr-Bochicchio ]
   * Use un-minified versions of 960.css and reset.css (Closes: #717008,
     LP: #1201636). 
 
+  [ Dmitry Shachnev ]
+  * Use different name for singlehtml doc-base files, to prevent warnings
+    from doc-base.
+
  -- Andrew Starr-Bochicchio <asb@xxxxxxxxxx>  Sat, 13 Jul 2013 13:40:17 -0400
 
 ubuntu-packaging-guide (0.3.2) unstable; urgency=low

=== modified file 'debian/scripts/add-languages'
--- debian/scripts/add-languages	2013-03-19 12:16:15 +0000
+++ debian/scripts/add-languages	2013-07-27 15:14:25 +0000
@@ -207,7 +207,7 @@
         with open(new_file, "w") as new_file:
             for line in lines:
                 if line.startswith("Document:"):
-                    line = "Document: " + new_package_name + "\n"
+                    line += ("-%s" % self.fix_name(language))
                 elif line.startswith("Index:") | line.startswith("Files:"):
                     line = line.replace("-%s" % doc_type,
                            "-%s-%s" % (doc_type, self.fix_name(language)))

=== modified file 'debian/ubuntu-packaging-guide-html-de.doc-base.single'
--- debian/ubuntu-packaging-guide-html-de.doc-base.single	2013-07-13 08:44:43 +0000
+++ debian/ubuntu-packaging-guide-html-de.doc-base.single	2013-07-27 15:14:25 +0000
@@ -1,4 +1,4 @@
-Document: ubuntu-packaging-guide-html-de
+Document: ubuntu-packaging-guide-singlehtml-de
 Title: Ubuntu Packaging Guide - German Version
 Author: Ubuntu Developers
 Abstract: The Ubuntu Packaging Guide is a set of articles that should help 

=== modified file 'debian/ubuntu-packaging-guide-html-es.doc-base.single'
--- debian/ubuntu-packaging-guide-html-es.doc-base.single	2013-03-19 12:16:50 +0000
+++ debian/ubuntu-packaging-guide-html-es.doc-base.single	2013-07-27 15:14:25 +0000
@@ -1,4 +1,4 @@
-Document: ubuntu-packaging-guide-html-es
+Document: ubuntu-packaging-guide-singlehtml-es
 Title: Ubuntu Packaging Guide - Spanish Version
 Author: Ubuntu Developers
 Abstract: The Ubuntu Packaging Guide is a set of articles that should help 

=== modified file 'debian/ubuntu-packaging-guide-html-pt-br.doc-base.single'
--- debian/ubuntu-packaging-guide-html-pt-br.doc-base.single	2013-03-18 20:05:35 +0000
+++ debian/ubuntu-packaging-guide-html-pt-br.doc-base.single	2013-07-27 15:14:25 +0000
@@ -1,4 +1,4 @@
-Document: ubuntu-packaging-guide-html-pt-br
+Document: ubuntu-packaging-guide-singlehtml-pt-br
 Title: Ubuntu Packaging Guide - Brazilian Portuguese Version
 Author: Ubuntu Developers
 Abstract: The Ubuntu Packaging Guide is a set of articles that should help 

=== modified file 'debian/ubuntu-packaging-guide-html-ru.doc-base.single'
--- debian/ubuntu-packaging-guide-html-ru.doc-base.single	2013-03-19 12:16:50 +0000
+++ debian/ubuntu-packaging-guide-html-ru.doc-base.single	2013-07-27 15:14:25 +0000
@@ -1,4 +1,4 @@
-Document: ubuntu-packaging-guide-html-ru
+Document: ubuntu-packaging-guide-singlehtml-ru
 Title: Ubuntu Packaging Guide - Russian Version
 Author: Ubuntu Developers
 Abstract: The Ubuntu Packaging Guide is a set of articles that should help 

=== modified file 'debian/ubuntu-packaging-guide-html.doc-base.single'
--- debian/ubuntu-packaging-guide-html.doc-base.single	2012-09-05 14:02:24 +0000
+++ debian/ubuntu-packaging-guide-html.doc-base.single	2013-07-27 15:14:25 +0000
@@ -1,4 +1,4 @@
-Document: ubuntu-packaging-guide-html
+Document: ubuntu-packaging-guide-singlehtml
 Title: Ubuntu Packaging Guide
 Author: Ubuntu Developers
 Abstract: The Ubuntu Packaging Guide is a set of articles that should help