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

[morph at users.alioth.debian.org]

    Date: Thursday, October 9, 2014 @ 23:28:01
  Author: morph
Revision: 30969

* debian/patches/ignore-decoding.patch
  - remove locale & decoding in libgraphviz identification process

Added:
  packages/python-pygraphviz/trunk/debian/patches/ignore-decoding.patch
Modified:
  packages/python-pygraphviz/trunk/debian/changelog
  packages/python-pygraphviz/trunk/debian/patches/series

Modified: packages/python-pygraphviz/trunk/debian/changelog
===================================================================
--- packages/python-pygraphviz/trunk/debian/changelog	2014-10-09 21:17:25 UTC (rev 30968)
+++ packages/python-pygraphviz/trunk/debian/changelog	2014-10-09 23:28:01 UTC (rev 30969)
@@ -15,8 +15,10 @@
   * Bump debhelper compat version to 9
   * debian/copyright
     - extend packaging and upstream copyright years
+  * debian/patches/ignore-decoding.patch
+    - remove locale & decoding in libgraphviz identification process
 
- -- Sandro Tosi <morph at debian.org>  Sun, 21 Sep 2014 19:20:02 +0100
+ -- Sandro Tosi <morph at debian.org>  Fri, 10 Oct 2014 00:27:37 +0100
 
 python-pygraphviz (1.2-1) unstable; urgency=low
 

Added: packages/python-pygraphviz/trunk/debian/patches/ignore-decoding.patch
===================================================================
--- packages/python-pygraphviz/trunk/debian/patches/ignore-decoding.patch	                        (rev 0)
+++ packages/python-pygraphviz/trunk/debian/patches/ignore-decoding.patch	2014-10-09 23:28:01 UTC (rev 30969)
@@ -0,0 +1,55 @@
+Description: remove output decoding from graphviz identification procedure
+ With LANG=C the locale.getdefaultlocale() method returns always (None, None),
+ hence making the libgraphviz identification failing; just remove all the
+ deconding and locale reading
+Author: Sandro Tosi <morph at debian.org>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2014-10-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/setup_extra.py
++++ b/setup_extra.py
+@@ -10,11 +10,6 @@ Setup helpers for PyGraphviz.
+ #    Distributed with BSD license.     
+ #    All rights reserved, see LICENSE for details.
+ import os
+-import locale
+-
+-
+-system_encoding = locale.getdefaultlocale()[1]
+-
+ 
+ def pkg_config():
+     # attempt to find graphviz installation with pkg-config
+@@ -34,14 +29,12 @@ def pkg_config():
+                    S.Popen('pkg-config --libs-only-L libcgraph',
+                            shell=True, stdin=S.PIPE, stdout=S.PIPE,
+                            close_fds=True).communicate()
+-        output = output.decode(system_encoding)
+         if output:
+             library_path=output.strip()[2:]
+         output,err = \
+                    S.Popen('pkg-config --cflags-only-I libcgraph',
+                            shell=True, stdin=S.PIPE, stdout=S.PIPE,
+                            close_fds=True).communicate()
+-        output = output.decode(system_encoding)
+         if output:
+             include_path=output.strip()[2:]
+     except:
+@@ -65,7 +58,6 @@ def dotneato_config():
+     try:
+         output = S.Popen(['dotneato-config','--ldflags','--cflags'],
+                          stdout=S.PIPE).communicate()[0]
+-        output = output.decode(system_encoding)
+         if output:
+             include_path,library_path=output.split()
+             library_path=library_path.strip()[2:]
+@@ -73,7 +65,6 @@ def dotneato_config():
+         else:
+             output = S.Popen(['dotneato-config','--libs','--cflags'],
+                          stdout=S.PIPE).communicate()[0]
+-            output = output.decode(system_encoding)
+             if output:
+                 include_path,library_path=output.split('\n',1)
+                 library_path=library_path.strip()[2:]

Modified: packages/python-pygraphviz/trunk/debian/patches/series
===================================================================
--- packages/python-pygraphviz/trunk/debian/patches/series	2014-10-09 21:17:25 UTC (rev 30968)
+++ packages/python-pygraphviz/trunk/debian/patches/series	2014-10-09 23:28:01 UTC (rev 30969)
@@ -1,3 +1,4 @@
 dont_install_data.patch
 2e27964ce86e8f49c496e5a549237ff6b1763e9a.patch
 2e27964ce86e8f49c496e5a549237ff6b1763e9a-2.patch
+ignore-decoding.patch