ubuntu-packaging-guide-team team mailing list archive

[Daniel Holbach <daniel.holbach@xxxxxxxxxx>]

Daniel Holbach has proposed merging lp:~dholbach/ubuntu-packaging-guide/enable-spanish into lp:ubuntu-packaging-guide.

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)
Related bugs:
  Bug #1068493 in Ubuntu Packaging Guide: "Can't build html with footnotes when using i18n"
  https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/1068493

For more details, see:
https://code.launchpad.net/~dholbach/ubuntu-packaging-guide/enable-spanish/+merge/137770
-- 
https://code.launchpad.net/~dholbach/ubuntu-packaging-guide/enable-spanish/+merge/137770
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~dholbach/ubuntu-packaging-guide/enable-spanish into lp:ubuntu-packaging-guide.

=== modified file 'Makefile'
--- Makefile	2012-12-04 08:14:28 +0000
+++ Makefile	2012-12-04 08:29:18 +0000
@@ -14,7 +14,7 @@
 # the i18n builder cannot share the environment and doctrees with the others
 PODIR         = po
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-LANGS = 
+LANGS =  es
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext locale
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-03 13:04:41 +0000
+++ debian/changelog	2012-12-04 08:29:18 +0000
@@ -3,6 +3,7 @@
   [ Daniel Holbach ]
   * Added some additional information to the autopkgtest article.
   * Updated autopkgtest article to current tools. (LP: #1080805)
+  * Enable Spanish translations. (LP: #1068493)
 
   [ Andrew Starr-Bochicchio ]
   * debian/scripts/add-languages:

=== modified file 'debian/control'
--- debian/control	2012-12-03 12:12:05 +0000
+++ debian/control	2012-12-04 08:29:18 +0000
@@ -78,3 +78,45 @@
  understand articles.
  .
  This package contains the EPUB version of the guide.
+
+Package: ubuntu-packaging-guide-html-es
+Depends: ubuntu-packaging-guide-common, ${misc:Depends}
+Architecture: all
+Description: Ubuntu Packaging Guide - HTML guide - 'es' version
+ The Ubuntu Packaging Guide is a set of articles that should help you to get
+ involved with packaging and development of Ubuntu. It's not meant to replace
+ other great documentation like the Debian New Maintainer's Guide or the
+ Debian policy, but serve as a starting point with easy and simple to
+ understand articles.
+ .
+ This package contains the HTML version of the guide.
+ .
+ This is the 'es' version.
+
+Package: ubuntu-packaging-guide-pdf-es
+Depends: ${misc:Depends}
+Architecture: all
+Description: Ubuntu Packaging Guide - PDF guide - 'es' version
+ The Ubuntu Packaging Guide is a set of articles that should help you to get
+ involved with packaging and development of Ubuntu. It's not meant to replace
+ other great documentation like the Debian New Maintainer's Guide or the
+ Debian policy, but serve as a starting point with easy and simple to
+ understand articles.
+ .
+ This package contains the PDF version of the guide.
+ .
+ This is the 'es' version.
+
+Package: ubuntu-packaging-guide-epub-es
+Depends: libjs-sphinxdoc, ${misc:Depends}
+Architecture: all
+Description: Ubuntu Packaging Guide - EPUB guide - 'es' version
+ The Ubuntu Packaging Guide is a set of articles that should help you to get
+ involved with packaging and development of Ubuntu. It's not meant to replace
+ other great documentation like the Debian New Maintainer's Guide or the
+ Debian policy, but serve as a starting point with easy and simple to
+ understand articles.
+ .
+ This package contains the EPUB version of the guide.
+ .
+ This is the 'es' version.

=== added file 'debian/ubuntu-packaging-guide-epub-es.docs'
--- debian/ubuntu-packaging-guide-epub-es.docs	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-epub-es.docs	2012-12-04 08:29:18 +0000
@@ -0,0 +1,1 @@
+_build/epub/es/ubuntu-packaging-guide.epub

=== added file 'debian/ubuntu-packaging-guide-html-es.doc-base'
--- debian/ubuntu-packaging-guide-html-es.doc-base	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-html-es.doc-base	2012-12-04 08:29:18 +0000
@@ -0,0 +1,11 @@
+Document: ubuntu-packaging-guide-html-es
+Title: Ubuntu Packaging Guide - es Version
+Author: Ubuntu Developers
+Abstract: The Ubuntu Packaging Guide is a set of articles that should help 
+ you to get involved with packaging and development of Ubuntu. It tries to 
+ serve as a starting point with easy and simple to understand articles.
+Section: Text
+
+Format: HTML
+Index: /usr/share/doc/ubuntu-packaging-guide-html-es/index.html
+Files: /usr/share/doc/ubuntu-packaging-guide-html-es/*.html

=== added file 'debian/ubuntu-packaging-guide-html-es.doc-base.single'
--- debian/ubuntu-packaging-guide-html-es.doc-base.single	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-html-es.doc-base.single	2012-12-04 08:29:18 +0000
@@ -0,0 +1,11 @@
+Document: ubuntu-packaging-guide-html-es
+Title: Ubuntu Packaging Guide - es Version
+Author: Ubuntu Developers
+Abstract: The Ubuntu Packaging Guide is a set of articles that should help 
+ you to get involved with packaging and development of Ubuntu. It tries to 
+ serve as a starting point with easy and simple to understand articles.
+Section: Text
+
+Format: HTML
+Index: /usr/share/doc/ubuntu-packaging-guide-html-es/singlehtml/index.html
+Files: /usr/share/doc/ubuntu-packaging-guide-html-es/singlehtml/index.html

=== added file 'debian/ubuntu-packaging-guide-html-es.docs'
--- debian/ubuntu-packaging-guide-html-es.docs	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-html-es.docs	2012-12-04 08:29:18 +0000
@@ -0,0 +1,5 @@
+_build/html/es/*.html
+_build/html/es/searchindex.js
+_build/html/es/_images
+_build/html/es/_static
+_build/html/es/_sources

=== added file 'debian/ubuntu-packaging-guide-html-es.install'
--- debian/ubuntu-packaging-guide-html-es.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-html-es.install	2012-12-04 08:29:18 +0000
@@ -0,0 +1,3 @@
+_build/singlehtml/es/_images	usr/share/doc/ubuntu-packaging-guide-html-es/singlehtml/
+_build/singlehtml/es/_static	usr/share/doc/ubuntu-packaging-guide-html-es/singlehtml/
+_build/singlehtml/es/index.html	usr/share/doc/ubuntu-packaging-guide-html-es/singlehtml/

=== added file 'debian/ubuntu-packaging-guide-pdf-es.doc-base'
--- debian/ubuntu-packaging-guide-pdf-es.doc-base	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-pdf-es.doc-base	2012-12-04 08:29:18 +0000
@@ -0,0 +1,10 @@
+Document: ubuntu-packaging-guide-pdf-es
+Title: Ubuntu Packaging Guide - es Version
+Author: Ubuntu Developers
+Abstract: The Ubuntu Packaging Guide is a set of articles that should help 
+ you to get involved with packaging and development of Ubuntu. It tries to 
+ serve as a starting point with easy and simple to understand articles.
+Section: Text
+
+Format: PDF
+Files: /usr/share/doc/ubuntu-packaging-guide-pdf-es/ubuntu-packaging-guide.pdf.gz

=== added file 'debian/ubuntu-packaging-guide-pdf-es.docs'
--- debian/ubuntu-packaging-guide-pdf-es.docs	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-pdf-es.docs	2012-12-04 08:29:18 +0000
@@ -0,0 +1,1 @@
+_build/pdf/es/ubuntu-packaging-guide.pdf

=== modified file 'ubuntu-packaging-guide/udd-merging.rst'
--- ubuntu-packaging-guide/udd-merging.rst	2012-09-09 09:05:44 +0000
+++ ubuntu-packaging-guide/udd-merging.rst	2012-12-04 08:29:18 +0000
@@ -5,7 +5,7 @@
 Merging is one of the strengths of Bazaar, and something we do often in Ubuntu
 development.  Updates can be merged from Debian, from a new upstream release,
 and from other Ubuntu developers.  Doing it in Bazaar is pretty simple, and
-all based around the ``bzr merge`` command [#]_.
+all based around the ``bzr merge`` command.
 
 While you are in any branch's working directory, you can merge in a branch
 from a different location.  First check that you have no uncommitted changes::
@@ -118,10 +118,3 @@
 
 .. _`package importer`:  http://package-import.ubuntu.com/status/
 .. _Squeeze: http://wiki.debian.org/DebianSqueeze
-
-.. [#] You will need newer versions of ``bzr`` and the ``bzr-builddeb`` for
-   the ``merge`` command to work.  Use the versions from Ubuntu 12.04
-   (Precise) or the development versions from the ``bzr`` PPA.  Specifically,
-   you need ``bzr`` version 2.5 beta 5 or newer, and ``bzr-builddeb`` version
-   2.8.1 or newer.  For older versions, use the ``bzr merge-package`` command
-   instead.