ubuntu-packaging-guide-team team mailing list archive
-
ubuntu-packaging-guide-team team
-
Mailing list archive
-
Message #00929
[Merge] lp:~andrewsomething/ubuntu-packaging-guide/961936 into lp:ubuntu-packaging-guide
Andrew Starr-Bochicchio has proposed merging lp:~andrewsomething/ubuntu-packaging-guide/961936 into lp:ubuntu-packaging-guide.
Requested reviews:
Andrew Starr-Bochicchio (andrewsomething)
For more details, see:
https://code.launchpad.net/~andrewsomething/ubuntu-packaging-guide/961936/+merge/110541
A few more details regarding bug #961936.
There's still actually an issue with the singlehtml stuff. It's getting installed to /usr/share/doc/ubuntu-packaging-guide-html/index.html and then overwritten by the multipage html's index.html by dh_installdocs. I'm not entirely sure how to go about fixing that right now...
--
https://code.launchpad.net/~andrewsomething/ubuntu-packaging-guide/961936/+merge/110541
Your team Ubuntu Packaging Guide Team is subscribed to branch lp:ubuntu-packaging-guide.
=== modified file 'debian/rules'
--- debian/rules 2012-05-10 19:32:37 +0000
+++ debian/rules 2012-06-15 15:36:19 +0000
@@ -9,7 +9,7 @@
make epub
override_dh_compress:
- dh_compress -X usr/share/doc/ubuntu-packaging-guide/html/
+ dh_compress -X usr/share/doc/ubuntu-packaging-guide-html/_sources
override_dh_link:
# symlink identical resources.
=== modified file 'debian/scripts/add-languages'
--- debian/scripts/add-languages 2012-06-13 07:28:34 +0000
+++ debian/scripts/add-languages 2012-06-15 15:36:19 +0000
@@ -132,12 +132,12 @@
line))
def add_docbase_files(self, language, template_name):
+ new_package_name = "%s-%s" % (template_name, language)
+ docbase_template = os.path.join(self.base_path,
+ "debian/" + template_name + ".doc-base")
+ new_docbase_file = os.path.join(self.base_path,
+ "debian/" + new_package_name + ".doc-base")
if template_name.endswith("html"):
- new_package_name = "%s-%s" % (template_name, language)
- docbase_template = os.path.join(self.base_path,
- "debian/" + template_name + ".doc-base")
- new_docbase_file = os.path.join(self.base_path,
- "debian/" + new_package_name + ".doc-base")
single_template = os.path.join(self.base_path,
"debian/" + template_name + ".doc-base.single")
new_single_file = os.path.join(self.base_path,
@@ -146,24 +146,27 @@
docbase_template, new_docbase_file)
self.write_docbase_file(language, template_name, new_package_name,
single_template, new_single_file)
+ elif template_name.endswith("pdf"):
+ self.write_docbase_file(language, template_name, new_package_name,
+ docbase_template, new_docbase_file)
else:
pass
def write_docbase_file(self, language, template_name, new_package_name,template_file, new_file):
+ doc_type = template_name.split("-")[-1]
with open(template_file, "r") as template_file:
lines = template_file.readlines()
with open(new_file, "w") as new_file:
for line in lines:
- if line.startswith("Document:"):
- line = "Document: " + new_package_name + "\n"
- elif line.startswith("Index:") | line.startswith("Files:"):
- line = re.sub("/html", "/html/%s" % language, line)
- line = re.sub("-html", "-html-%s" % language, line)
- elif line.startswith("Title:"):
- line = "Title: Ubuntu Packaging Guide - %s Version\n" % language
- else:
- line = line
- new_file.write(line)
+ if line.startswith("Document:"):
+ line = "Document: " + new_package_name + "\n"
+ elif line.startswith("Index:") | line.startswith("Files:"):
+ line = re.sub("-%s" % doc_type, "-%s-%s" % (doc_type, language), line)
+ elif line.startswith("Title:"):
+ line = "Title: Ubuntu Packaging Guide - %s Version\n" % language
+ else:
+ line = line
+ new_file.write(line)
def add_package(self, package_name):
base_template = "-".join(package_name.split("-")[0:-1])
=== modified file 'debian/ubuntu-packaging-guide-epub.docs'
--- debian/ubuntu-packaging-guide-epub.docs 2012-05-22 13:18:17 +0000
+++ debian/ubuntu-packaging-guide-epub.docs 2012-06-15 15:36:19 +0000
@@ -1,9 +1,1 @@
-_build/epub/content.opf
-_build/epub/_images
-_build/epub/META-INF
-_build/epub/mimetype
-_build/epub/search.html
-_build/epub/_static
-_build/epub/toc.ncx
-_build/epub/ubuntu-packaging-guide
_build/epub/ubuntu-packaging-guide.epub
=== modified file 'debian/ubuntu-packaging-guide-html.doc-base'
--- debian/ubuntu-packaging-guide-html.doc-base 2012-05-10 16:29:25 +0000
+++ debian/ubuntu-packaging-guide-html.doc-base 2012-06-15 15:36:19 +0000
@@ -7,5 +7,5 @@
Section: Text
Format: HTML
-Index: /usr/share/doc/ubuntu-packaging-guide-html/html/index.html
-Files: /usr/share/doc/ubuntu-packaging-guide-html/html/*.html
+Index: /usr/share/doc/ubuntu-packaging-guide-html/index.html
+Files: /usr/share/doc/ubuntu-packaging-guide-html/*.html
=== modified file 'debian/ubuntu-packaging-guide-html.docs'
--- debian/ubuntu-packaging-guide-html.docs 2012-05-22 13:18:17 +0000
+++ debian/ubuntu-packaging-guide-html.docs 2012-06-15 15:36:19 +0000
@@ -5,3 +5,4 @@
_build/html/*.html
_build/html/_images
_build/html/_static
+_build/html/_sources
=== modified file 'debian/ubuntu-packaging-guide-pdf.doc-base'
--- debian/ubuntu-packaging-guide-pdf.doc-base 2012-05-10 16:29:25 +0000
+++ debian/ubuntu-packaging-guide-pdf.doc-base 2012-06-15 15:36:19 +0000
@@ -7,4 +7,4 @@
Section: Text
Format: PDF
-Files: /usr/share/doc/ubuntu-packaging-guide-pdf/pdf/ubuntu-packaging-guide.pdf.gz
+Files: /usr/share/doc/ubuntu-packaging-guide-pdf/ubuntu-packaging-guide.pdf.gz
Follow ups