Merge lp:~andrewsomething/ubuntu-packaging-guide/lp1093447 into lp:ubuntu-packaging-guide

Proposed by Andrew Starr-Bochicchio
Status: Merged
Merged at revision: 428
Proposed branch: lp:~andrewsomething/ubuntu-packaging-guide/lp1093447
Merge into: lp:ubuntu-packaging-guide
Diff against target: 63 lines (+27/-2)
2 files modified
conf.py (+20/-2)
ubuntu-packaging-guide/index.rst (+7/-0)
To merge this branch: bzr merge lp:~andrewsomething/ubuntu-packaging-guide/lp1093447
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+181926@code.launchpad.net

Description of the change

This gets the license information into the PDFs and EPUBs. It also adds some text mentioning the LP project to the end of the index page so it is findable on the PDFs and EPUBs.

I also just figured out that the EPUB can use html templates just like the html version. Unfortunately, our html template doesn't work so well there. It really needs to be fluid for ebook readers. So for now, I enabled one of the themes shipped with Sphinx by default since the unthemed version we've been using is awfully ugly.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Great work! Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'conf.py'
2--- conf.py 2013-04-21 04:31:44 +0000
3+++ conf.py 2013-08-23 20:53:29 +0000
4@@ -42,7 +42,8 @@
5 # General information about the project.
6 project = u'ubuntu-packaging-guide'
7 authors = 'Ubuntu Developers'
8-copyright = u'2010-2013, '+authors
9+licence = 'Creative Commons Attribution-ShareAlike 3.0'
10+copyright = u'2010-2013 , ' + authors + ', ' + licence
11
12
13 changelog = "debian/changelog"
14@@ -219,8 +220,23 @@
15 # If false, no module index is generated.
16 #latex_domain_indices = True
17
18+custom_preamble = u"""
19+\\makeatletter
20+ \\fancypagestyle{normal}{
21+ \\fancyhf{}
22+ \\fancyhead[LE,RO]{{\\py@HeaderFamily \\@title}}
23+ \\fancyhead[LO]{{\\py@HeaderFamily\\nouppercase{\\rightmark}}}
24+ \\fancyhead[RE]{{\\py@HeaderFamily\\nouppercase{\\leftmark}}}
25+ \\fancyfoot[LE,RO]{{\\py@HeaderFamily\\thepage}}
26+ \\fancyfoot[LO,RE]{\\footnotesize © %s}
27+ \\renewcommand{\\headrulewidth}{0.4pt}
28+ \\renewcommand{\\footrulewidth}{0.4pt}
29+ }
30+\\makeatother
31+""" % copyright
32+
33 # Disable useless index in PDFs (only one item).
34-latex_elements = {'printindex': ''}
35+latex_elements = {'printindex': '', 'preamble': custom_preamble}
36
37 # -- Options for manual page output --------------------------------------------
38
39@@ -253,6 +269,8 @@
40 epub_publisher = authors
41 epub_copyright = copyright
42
43+epub_theme = 'nature'
44+
45 # The language of the text. It defaults to the language option
46 # or en if the language is not set.
47 #epub_language = ''
48
49=== modified file 'ubuntu-packaging-guide/index.rst'
50--- ubuntu-packaging-guide/index.rst 2013-06-18 12:31:13 +0000
51+++ ubuntu-packaging-guide/index.rst 2013-08-23 20:53:29 +0000
52@@ -100,3 +100,10 @@
53 — available in many languages;
54 * `Packaging tutorial <http://www.debian.org/doc/manuals/packaging-tutorial/>`_ (also
55 available as a `package <https://launchpad.net/ubuntu/+source/packaging-tutorial>`_).
56+
57+We are always looking to improve this guide. If you find any problems or have
58+some suggestions, please `report a bug on Launchpad
59+<https://bugs.launchpad.net/ubuntu-packaging-guide>`_. If you'd like to help
60+work on the guide, `grab the source
61+<https://code.launchpad.net/~ubuntu-packaging-guide-team/ubuntu-packaging-guide/trunk>`_
62+there as well.
63\ No newline at end of file

Subscribers

People subscribed via source and target branches