[Python-apps-commits] r10222 - in packages/mercurial/trunk/debian (3 files)

[mithrandi at users.alioth.debian.org]

    Date: Thursday, December 5, 2013 @ 22:36:13
  Author: mithrandi
Revision: 10222

Add patch to fix test-i18n.

Added:
  packages/mercurial/trunk/debian/patches/for_upstream__fix_i18n.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2013-12-05 22:30:28 UTC (rev 10221)
+++ packages/mercurial/trunk/debian/changelog	2013-12-05 22:36:13 UTC (rev 10222)
@@ -2,6 +2,7 @@
 
   * New upstream release (Closes: #731471)
   * Add myself to Uploaders.
+  * Add patch to fix test-i18n.
 
  -- Tristan Seligmann <mithrandi at debian.org>  Thu, 05 Dec 2013 20:44:21 +0200
 

Added: packages/mercurial/trunk/debian/patches/for_upstream__fix_i18n.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__fix_i18n.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/for_upstream__fix_i18n.patch	2013-12-05 22:36:13 UTC (rev 10222)
@@ -0,0 +1,17 @@
+Author: Tristan Seligmann <mithrandi at debian.org>
+Description: Add missing import in check-translation.py
+ An import is missing in this script, which in turn causes test-i18n.t to fail.
+Bug: http://bz.selenic.com/show_bug.cgi?id=4122
+
+Index: mercurial-2.8.1/i18n/check-translation.py
+===================================================================
+--- mercurial-2.8.1.orig/i18n/check-translation.py	2013-12-02 04:51:10.000000000 +0200
++++ mercurial-2.8.1/i18n/check-translation.py	2013-12-06 00:20:52.192369115 +0200
+@@ -122,6 +122,7 @@
+     (options, args) = optparser.parse_args()
+ 
+     if options.doctest:
++        import os
+         if 'TERM' in os.environ:
+             del os.environ['TERM']
+         import doctest

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2013-12-05 22:30:28 UTC (rev 10221)
+++ packages/mercurial/trunk/debian/patches/series	2013-12-05 22:36:13 UTC (rev 10222)
@@ -8,3 +8,4 @@
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
+for_upstream__fix_i18n.patch