ubuntu-packaging-guide-team team mailing list archive

[Dmitry Shachnev <mitya57@xxxxxxxxx>]

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

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)
Related bugs:
  Bug #1043232 in Ubuntu Packaging Guide: "Japanese translation of Packaging Guide FTBFS"
  https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/1043232

For more details, see:
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/lp1043232/+merge/133819

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

This branch:

- Adds a special case to Makefile to build Japanese PDFs (an example one is attached to the bug report);
- 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.
-- 
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/lp1043232/+merge/133819
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~mitya57/ubuntu-packaging-guide/lp1043232 into lp:ubuntu-packaging-guide.

=== 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 <daniel.holbach@xxxxxxxxxx>  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