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

[vicho at users.alioth.debian.org]

    Date: Thursday, January 2, 2014 @ 15:17:59
  Author: vicho
Revision: 10304

[mq]: update_patches

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2014-01-02 15:17:56 UTC (rev 10303)
+++ packages/mercurial/trunk/debian/changelog	2014-01-02 15:17:59 UTC (rev 10304)
@@ -1,6 +1,7 @@
 mercurial (2.8.1-3) UNRELEASED; urgency=low
 
   * New upstream release
+  * Drop for_upstream__fix_i18n.patch as it's now included upstream
 
  -- Javi Merino <vicho at debian.org>  Thu, 02 Jan 2014 16:04:19 +0100
 

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__fix_i18n.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__fix_i18n.patch	2014-01-02 15:17:56 UTC (rev 10303)
+++ packages/mercurial/trunk/debian/patches/for_upstream__fix_i18n.patch	2014-01-02 15:17:59 UTC (rev 10304)
@@ -1,17 +0,0 @@
-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	2014-01-02 15:17:56 UTC (rev 10303)
+++ packages/mercurial/trunk/debian/patches/series	2014-01-02 15:17:59 UTC (rev 10304)
@@ -8,5 +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
 for_upstream__lenient_test-shelve.patch