[Python-apps-commits] r13063 - in packages/itstool/trunk/debian (5 files)

[tanguy at users.alioth.debian.org]

    Date: Saturday, April 2, 2016 @ 17:26:53
  Author: tanguy
Revision: 13063

New rev to fix non-ASCII attribute translation

* debian/patches/fix-utf8-handling.patch: Backport an upstream fix to
  prevent itstool from failing on non-ASCII characters. (Closes: #810989)
* debian/control:
   - Switch Vcs-Browser URL to HTTPS.
   - Update Standards-Version to 3.9.7 (no change needed).

Added:
  packages/itstool/trunk/debian/patches/
  packages/itstool/trunk/debian/patches/fix-utf8-handling.patch
  packages/itstool/trunk/debian/patches/series
Modified:
  packages/itstool/trunk/debian/changelog
  packages/itstool/trunk/debian/control

Modified: packages/itstool/trunk/debian/changelog
===================================================================
--- packages/itstool/trunk/debian/changelog	2016-04-01 21:53:33 UTC (rev 13062)
+++ packages/itstool/trunk/debian/changelog	2016-04-02 17:26:53 UTC (rev 13063)
@@ -1,3 +1,13 @@
+itstool (2.0.2-3) unstable; urgency=medium
+
+  * debian/patches/fix-utf8-handling.patch: Backport an upstream fix to
+    prevent itstool from failing on non-ASCII characters. (Closes: #810989)
+  * debian/control:
+     - Switch Vcs-Browser URL to HTTPS.
+     - Update Standards-Version to 3.9.7 (no change needed).
+
+ -- Tanguy Ortolo <tanguy+debian at ortolo.eu>  Sat, 02 Apr 2016 19:10:04 +0200
+
 itstool (2.0.2-2) unstable; urgency=medium
 
   * Team upload.

Modified: packages/itstool/trunk/debian/control
===================================================================
--- packages/itstool/trunk/debian/control	2016-04-01 21:53:33 UTC (rev 13062)
+++ packages/itstool/trunk/debian/control	2016-04-02 17:26:53 UTC (rev 13063)
@@ -4,10 +4,10 @@
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Tanguy Ortolo <tanguy+debian at ortolo.eu>
 Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-libxml2
-Standards-Version: 3.9.5
+Standards-Version: 3.9.7
 Homepage: http://itstool.org/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/itstool/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/itstool/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/itstool/trunk/
 
 Package: itstool
 Architecture: all

Added: packages/itstool/trunk/debian/patches/fix-utf8-handling.patch
===================================================================
--- packages/itstool/trunk/debian/patches/fix-utf8-handling.patch	                        (rev 0)
+++ packages/itstool/trunk/debian/patches/fix-utf8-handling.patch	2016-04-02 17:26:53 UTC (rev 13063)
@@ -0,0 +1,35 @@
+Description: Fix non-ASCII support for attribute translations
+ This patch prevents itstool from failing to tanslate strings from English to
+ another langage when the translations for XML attributes contain non-ASCII
+ characters.
+Origin: backport, https://github.com/itstool/itstool/commit/d75f68cbc58075b57aee53d57b9156655a2fc99a
+Bug-Debian: http://bugs.debian.org/810989
+Author: Shaun McCance <shaunm at gnome.org>
+Last-Update: 2016-04-02
+
+Index: itstool-2.0.2/itstool.in
+===================================================================
+--- itstool-2.0.2.orig/itstool.in	2016-04-02 19:02:55.674948592 +0200
++++ itstool-2.0.2/itstool.in	2016-04-02 19:02:55.662948635 +0200
+@@ -966,7 +966,7 @@
+         for attr in trans_attrs:
+             newcontent = translations.ugettext(attr.get_content())
+             if newcontent:
+-                newnode.setProp(attr.name, translations.ugettext(attr.get_content()))
++                newnode.setProp(attr.name, newcontent.encode('utf-8'))
+ 
+     def get_translated (self, node, translations, strict=False, lang=None):
+         msg = self._msgs.get_message_by_node(node)
+Index: itstool-2.0.2/itstool
+===================================================================
+--- itstool-2.0.2.orig/itstool	2016-04-02 19:02:55.674948592 +0200
++++ itstool-2.0.2/itstool	2016-04-02 19:02:55.662948635 +0200
+@@ -966,7 +966,7 @@
+         for attr in trans_attrs:
+             newcontent = translations.ugettext(attr.get_content())
+             if newcontent:
+-                newnode.setProp(attr.name, translations.ugettext(attr.get_content()))
++                newnode.setProp(attr.name, newcontent.encode('utf-8'))
+ 
+     def get_translated (self, node, translations, strict=False, lang=None):
+         msg = self._msgs.get_message_by_node(node)

Added: packages/itstool/trunk/debian/patches/series
===================================================================
--- packages/itstool/trunk/debian/patches/series	                        (rev 0)
+++ packages/itstool/trunk/debian/patches/series	2016-04-02 17:26:53 UTC (rev 13063)
@@ -0,0 +1 @@
+fix-utf8-handling.patch