[Python-modules-commits] r31852 - in packages/matplotlib/trunk/debian (4 files)

[morph at users.alioth.debian.org]

    Date: Thursday, February 12, 2015 @ 19:40:38
  Author: morph
Revision: 31852

* debian/{control, patches/bts613818_use_system_pycxx.patch}
  - use Debian version of PyCXX, instead of the bundled one; thanks to Julian
    Taylor for the report and the work on Debian PyCXX side: Closes: #613818

Added:
  packages/matplotlib/trunk/debian/patches/bts613818_use_system_pycxx.patch
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/control
  packages/matplotlib/trunk/debian/patches/series

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2015-02-12 13:54:28 UTC (rev 31851)
+++ packages/matplotlib/trunk/debian/changelog	2015-02-12 19:40:38 UTC (rev 31852)
@@ -5,8 +5,11 @@
     - extend packaging copyright years
   * debian/patches/test_backend_with_timeout.patch
     - removed, merged upstream
+  * debian/{control, patches/bts613818_use_system_pycxx.patch}
+    - use Debian version of PyCXX, instead of the bundled one; thanks to Julian
+      Taylor for the report and the work on Debian PyCXX side: Closes: #613818
 
- -- Sandro Tosi <morph at debian.org>  Sun, 08 Feb 2015 20:47:05 +0000
+ -- Sandro Tosi <morph at debian.org>  Thu, 12 Feb 2015 19:29:17 +0000
 
 matplotlib (1.4.2-3) unstable; urgency=medium
 

Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control	2015-02-12 13:54:28 UTC (rev 31851)
+++ packages/matplotlib/trunk/debian/control	2015-02-12 19:40:38 UTC (rev 31852)
@@ -20,6 +20,8 @@
                python3-dateutil,
                python-cairocffi,
                python3-cairocffi,
+               python-cxx-dev,
+               python3-cxx-dev,
                python-gi,
                python3-gi,
                python-gtk2-dev,

Added: packages/matplotlib/trunk/debian/patches/bts613818_use_system_pycxx.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/bts613818_use_system_pycxx.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/bts613818_use_system_pycxx.patch	2015-02-12 19:40:38 UTC (rev 31852)
@@ -0,0 +1,37 @@
+Description: Enable usage of PyCXX on Py3k too
+ Given how PyCXX has been packaged in Debian, we can use the py2 and py3 version
+ with matplotlib.
+Author: Sandro Tosi <morph at debian.org>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/613818
+Forwarded: not-needed
+Last-Update: 2015-02-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/setupext.py
++++ b/setupext.py
+@@ -840,15 +840,15 @@ class CXX(SetupPackage):
+     name = 'pycxx'
+ 
+     def check(self):
+-        if PY3:
+-            # There is no version of PyCXX in the wild that will work
+-            # with Python 3.x and matplotlib, since they lack support
+-            # for the buffer object.
+-            self.__class__.found_external = False
+-            return ("Official versions of PyCXX are not compatible "
+-                    "with matplotlib on Python 3.x, since they lack "
+-                    "support for the buffer object.  Using local "
+-                    "copy")
++        #if PY3:
++        #    # There is no version of PyCXX in the wild that will work
++        #    # with Python 3.x and matplotlib, since they lack support
++        #    # for the buffer object.
++        #    self.__class__.found_external = False
++        #    return ("Official versions of PyCXX are not compatible "
++        #            "with matplotlib on Python 3.x, since they lack "
++        #            "support for the buffer object.  Using local "
++        #            "copy")
+ 
+         self.__class__.found_external = True
+         old_stdout = sys.stdout

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2015-02-12 13:54:28 UTC (rev 31851)
+++ packages/matplotlib/trunk/debian/patches/series	2015-02-12 19:40:38 UTC (rev 31852)
@@ -4,5 +4,6 @@
 50_bts608942_spaces_in_param_args.patch
 70_bts720549_try_StayPuft_for_xkcd.patch
 multiarch-tktcl.patch
-gtk3agg_check_no-multiprocessing.patch
+#gtk3agg_check_no-multiprocessing.patch
 gtk3cairo_check_no-multiprocessing.patch
+bts613818_use_system_pycxx.patch