Merge lp:~mitya57/ubuntu-packaging-guide/lp1043232 into lp:ubuntu-packaging-guide

[Dmitry Shachnev]

I hope you are not much tired of my MPs ;)

This branch:

- Adds a special case to Makefile to build Japanese PDFs (see https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/1043232/+attachment/3430256/+files/ubuntu-packaging-guide.pdf);
- Adds some build-dependencies so that platex works. I'm not sure we want to do that at this point, though — feel free to comment them out for now.

[Dmitry Shachnev (mitya57)]

Note: texlive-latex-extra depends on texlive-latex-recommended which depends on texlive-latex-base, so we don't need to build-depend on all three.

[Daniel Holbach (dholbach)]

After enabling 'ja' in LANGS and running make (html-ja|latexpdf-ja) I get the following crash:
Exception occurred:
  File "/usr/lib/python2.7/dist-packages/sphinx/application.py", line 204, in build
    self.builder.build_update()
  File "/usr/lib/python2.7/dist-packages/sphinx/builders/__init__.py", line 191, in build_update
    self.build(['__all__'], to_build)
  File "/usr/lib/python2.7/dist-packages/sphinx/builders/__init__.py", line 216, in build
    purple, length):
  File "/usr/lib/python2.7/dist-packages/sphinx/builders/__init__.py", line 120, in status_iterator
    for item in iterable:
  File "/usr/lib/python2.7/dist-packages/sphinx/environment.py", line 617, in update_generator
    self.read_doc(docname, app=app)
  File "/usr/lib/python2.7/dist-packages/sphinx/environment.py", line 765, in read_doc
    pub.publish()
  File "/usr/lib/python2.7/dist-packages/docutils/core.py", line 212, in publish
    self.apply_transforms()
  File "/usr/lib/python2.7/dist-packages/docutils/core.py", line 193, in apply_transforms
    self.document.transformer.apply_transforms()
  File "/usr/lib/python2.7/dist-packages/docutils/transforms/__init__.py", line 171, in apply_transforms
    transform.apply(**kwargs)
  File "/usr/lib/python2.7/dist-packages/sphinx/environment.py", line 232, in apply
    node.children[i] = child
IndexError: list assignment index out of range

Which sphinx version do you use?

Thanks a lot for your work on this.

review: Approve

[Daniel Holbach (dholbach)]

Sorry, should have been 'Needs Information'.

review: Needs Information

[Dmitry Shachnev (mitya57)]

I use my own version of Sphinx — which will become -5ubuntu1 :)

It seems that you have the (buggy) patch from bug 1068493 applied — please try unapplying it (upstream says they are working on fixing it).

[lp:~mitya57/ubuntu-packaging-guide/lp1043232]

209. By Daniel Holbach on 2012-11-12

* Remove unnecessary build-dependencies.
* Makefile: add a special case for building Japanese PDF files
  (LP: #1043232).
* Build-depend on texlive-lang-cjk and latex-cjk-japanese.

[Daniel Holbach (dholbach)]

Good work.

review: Approve

[Dmitry Shachnev (mitya57)]

Ah, and you may also want to delete the precise/quantal sphinx packages from the PPA if they break the build.

=== modified file 'Makefile'
--- Makefile	2012-11-04 12:14:30 +0000
+++ Makefile	2012-11-11 10:00:28 +0000
@@ -172,6 +172,13 @@
 	make -C $(BUILDDIR)/latex/$* all-pdf
 	mkdir -p $(BUILDDIR)/pdf/$*; cp $(BUILDDIR)/latex/$*/*pdf $(BUILDDIR)/pdf/$*
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/pdf/$*."
+latexpdf-ja: locale-ja
+	# Special case, selecting all-pdf-ja target instead of all-pdf
+	$(SPHINXBUILD) -Dlanguage=ja -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/ja
+	@echo "Running LaTeX files through pdflatex..."
+	make -C $(BUILDDIR)/latex/ja all-pdf-ja
+	mkdir -p $(BUILDDIR)/pdf/ja; cp $(BUILDDIR)/latex/ja/*pdf $(BUILDDIR)/pdf/ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/pdf/ja."
 
 text: $(foreach lang,$(LANGS),text-$(lang))
 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text/en

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-04 12:18:11 +0000
+++ debian/changelog	2012-11-11 10:00:28 +0000
@@ -13,7 +13,7 @@
   * Fix search not working (LP: #814679).
   * Introduce -common package (LP: #1067338).
   * Better resources linking.
-  * Remove build-dependency on fdupes.
+  * Remove unnecessary build-dependencies.
   * Add CSS styling for code blocks and search results page.
   * Link JS files with the libjs-sphinxdoc package.
   * Do not install websupport.js.
@@ -22,6 +22,9 @@
     blocks look inconsistent with other ones.
   * Make some links easier to translate.
   * Makefile: fix sed breaking "Grab the source" URL.
+  * Makefile: add a special case for building Japanese PDF files
+    (LP: #1043232).
+  * Build-depend on texlive-lang-cjk and latex-cjk-japanese.
   * Miscellaneous fixes.
 
  -- Daniel Holbach <[e-mail]>  Fri, 12 Oct 2012 16:52:11 +0200

=== modified file 'debian/control'
--- debian/control	2012-10-17 18:04:07 +0000
+++ debian/control	2012-11-11 10:00:28 +0000
@@ -9,9 +9,9 @@
                doc-base,
                python-sphinx (>= 1.1~),
                texlive-fonts-recommended,
-               texlive-latex-base,
                texlive-latex-extra,
-               texlive-latex-recommended
+               texlive-lang-cjk,
+               latex-cjk-japanese
 Homepage: https://launchpad.net/ubuntu-packaging-guide
 Standards-Version: 3.9.3