[Python-modules-commits] r22883 - in packages/python-docutils/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, November 4, 2012 @ 10:44:52
  Author: jwilk
Revision: 22883

Make order of languages in \setotherlanguages deterministic.

Added:
  packages/python-docutils/trunk/debian/patches/deterministic-setotherlanguages.diff
Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/series

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2012-11-04 09:56:26 UTC (rev 22882)
+++ packages/python-docutils/trunk/debian/changelog	2012-11-04 10:44:52 UTC (rev 22883)
@@ -8,8 +8,10 @@
       upstream tests.
   * Fix FTBFS with Python 3.3 (closes: #681723):
     + Use relative __import__ (python3.3-import-compat.diff).
+    + Make order of languages in \setotherlanguages deterministic
+      (deterministic-setotherlanguages.diff).
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 04 Nov 2012 10:42:24 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 04 Nov 2012 11:01:10 +0100
 
 python-docutils (0.9.1-1) experimental; urgency=low
 

Added: packages/python-docutils/trunk/debian/patches/deterministic-setotherlanguages.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/deterministic-setotherlanguages.diff	                        (rev 0)
+++ packages/python-docutils/trunk/debian/patches/deterministic-setotherlanguages.diff	2012-11-04 10:44:52 UTC (rev 22883)
@@ -0,0 +1,36 @@
+Description: make order of languages in \setotherlanguages deterministic
+Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils?view=revision&revision=7492
+
+--- a/docutils/writers/latex2e/__init__.py
++++ b/docutils/writers/latex2e/__init__.py
+@@ -384,7 +384,7 @@
+ 
+     def __call__(self):
+         """Return the babel call with correct options and settings"""
+-        languages = self.otherlanguages.keys()
++        languages = sorted(self.otherlanguages.keys())
+         languages.append(self.language or 'english')
+         self.setup = [r'\usepackage[%s]{babel}' % ','.join(languages)]
+         if 'spanish' in languages:
+--- a/docutils/writers/xetex/__init__.py
++++ b/docutils/writers/xetex/__init__.py
+@@ -118,7 +118,7 @@
+                  r'\setdefaultlanguage{%s}' % self.language]
+         if self.otherlanguages:
+             setup.append(r'\setotherlanguages{%s}' %
+-                         ','.join(self.otherlanguages.keys()))
++                         ','.join(sorted(self.otherlanguages.keys())))
+         return '\n'.join(setup)
+ 
+ 
+--- a/test/functional/expected/standalone_rst_xetex.tex
++++ b/test/functional/expected/standalone_rst_xetex.tex
+@@ -7,7 +7,7 @@
+ \usepackage{amsmath}
+ \usepackage{polyglossia}
+ \setdefaultlanguage{english}
+-\setotherlanguages{german,british,french}
++\setotherlanguages{british,french,german}
+ \usepackage{color}
+ \usepackage{float} % float configuration
+ \floatplacement{figure}{H} % place figures here definitely

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2012-11-04 09:56:26 UTC (rev 22882)
+++ packages/python-docutils/trunk/debian/patches/series	2012-11-04 10:44:52 UTC (rev 22883)
@@ -1,4 +1,5 @@
 python3.3-import-compat.diff
+deterministic-setotherlanguages.diff
 iepngfix-license.diff
 doc-debian-paths.diff
 emacs-sensible-browser.diff