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

[morph at users.alioth.debian.org]

    Date: Sunday, November 2, 2014 @ 19:36:32
  Author: morph
Revision: 31367

* debian/patches/ignore-decoding.patch
  - removed, merged upstream

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

Modified: packages/python-pygraphviz/trunk/debian/changelog
===================================================================
--- packages/python-pygraphviz/trunk/debian/changelog	2014-11-02 18:42:13 UTC (rev 31366)
+++ packages/python-pygraphviz/trunk/debian/changelog	2014-11-02 19:36:32 UTC (rev 31367)
@@ -1,8 +1,10 @@
 python-pygraphviz (1.3~rc2-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate
+  * debian/patches/ignore-decoding.patch
+    - removed, merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Sun, 02 Nov 2014 18:42:03 +0000
+ -- Sandro Tosi <morph at debian.org>  Sun, 02 Nov 2014 19:36:23 +0000
 
 python-pygraphviz (1.3~rc1-1) unstable; urgency=medium
 

Deleted: packages/python-pygraphviz/trunk/debian/patches/ignore-decoding.patch
===================================================================
--- packages/python-pygraphviz/trunk/debian/patches/ignore-decoding.patch	2014-11-02 18:42:13 UTC (rev 31366)
+++ packages/python-pygraphviz/trunk/debian/patches/ignore-decoding.patch	2014-11-02 19:36:32 UTC (rev 31367)
@@ -1,55 +0,0 @@
-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-11-02 18:42:13 UTC (rev 31366)
+++ packages/python-pygraphviz/trunk/debian/patches/series	2014-11-02 19:36:32 UTC (rev 31367)
@@ -1,5 +1,4 @@
 dont_install_data.patch
 2e27964ce86e8f49c496e5a549237ff6b1763e9a.patch
 2e27964ce86e8f49c496e5a549237ff6b1763e9a-2.patch
-ignore-decoding.patch
 dont-import-tests.patch