[Python-modules-commits] r5614 - in packages/matplotlib/trunk/debian (6 files)

morph-guest at users.alioth.debian.org morph-guest at users.alioth.debian.org
Thu Jun 12 18:40:52 UTC 2008 

    Date: Thursday, June 12, 2008 @ 18:40:51
  Author: morph-guest
Revision: 5614

new upstream release; updated/deleted patches; bump standard-version to 3.8.0

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/control
  packages/matplotlib/trunk/debian/patches/build_fix.patch
  packages/matplotlib/trunk/debian/patches/series
Deleted:
  packages/matplotlib/trunk/debian/patches/bts-468977_memory_api_usage.patch
  packages/matplotlib/trunk/debian/patches/bts-478237_ftbfs_gcc43.patch

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2008-06-12 11:40:00 UTC (rev 5613)
+++ packages/matplotlib/trunk/debian/changelog	2008-06-12 18:40:51 UTC (rev 5614)
@@ -1,3 +1,17 @@
+matplotlib (0.91.3-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+  * debian/patches/bts-468977_memory_api_usage.patch
+    - removed since merged upstream
+  * debian/patches/bts-478237_ftbfs_gcc43.patch
+    - removed since merged upstream
+  * debian/patches/build_fix.patch
+    - updated to match new upstream code
+  * debian/control
+    - bump Standards-Version to 3.8.0 (no changes needed)
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Thu, 12 Jun 2008 19:49:38 +0200
+
 matplotlib (0.91.2-2) unstable; urgency=medium
 
   * debian/patches/bts-478237_ftbfs_gcc43.patch

Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control	2008-06-12 11:40:00 UTC (rev 5613)
+++ packages/matplotlib/trunk/debian/control	2008-06-12 18:40:51 UTC (rev 5614)
@@ -5,7 +5,7 @@
 Uploaders: Marco Presi (Zufus) <zufus at debian.org>, Alexandre Fayolle <afayolle at debian.org>, Vittorio Palmisano <redclay81 at gmail.com>, Ondrej Certik <ondrej at certik.cz>, Sandro Tosi <matrixhasu at gmail.com>
 Build-Depends: debhelper (>= 5.0.38), python-dateutil, python-all-dev (>= 2.3.5-7), python-central (>= 0.5.6), quilt, python-gtk2-dev, python-numpy (>= 1:1.0.4-6), libgtk2.0-dev, libfreetype6-dev, zlib1g-dev, libpng-dev, tk8.4-dev, python-tk, tcl8.4-dev, python-epydoc, python-tz, xbase-clients [!s390], dvipng, python-configobj, python-enthought-traits (>= 2.0), python-qt-dev, python-qt4-dev, python-wxgtk2.6
 XS-Python-Version: all
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 XS-DM-Upload-Allowed: yes
 Homepage: http://matplotlib.sf.net/
 

Deleted: packages/matplotlib/trunk/debian/patches/bts-468977_memory_api_usage.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/bts-468977_memory_api_usage.patch	2008-06-12 11:40:00 UTC (rev 5613)
+++ packages/matplotlib/trunk/debian/patches/bts-468977_memory_api_usage.patch	2008-06-12 18:40:51 UTC (rev 5614)
@@ -1,13 +0,0 @@
-Index: matplotlib/src/_subprocess.c
-===================================================================
---- matplotlib.orig/src/_subprocess.c	2008-04-23 07:41:32.772888270 +0200
-+++ matplotlib/src/_subprocess.c	2008-04-23 17:55:35.956461645 +0200
-@@ -104,7 +104,7 @@
- {
- 	if (self->handle != INVALID_HANDLE_VALUE)
- 		CloseHandle(self->handle);
--	PyMem_DEL(self);
-+	PyObject_DEL(self);
- }
- 
- static PyMethodDef sp_handle_methods[] = {

Deleted: packages/matplotlib/trunk/debian/patches/bts-478237_ftbfs_gcc43.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/bts-478237_ftbfs_gcc43.patch	2008-06-12 11:40:00 UTC (rev 5613)
+++ packages/matplotlib/trunk/debian/patches/bts-478237_ftbfs_gcc43.patch	2008-06-12 18:40:51 UTC (rev 5614)
@@ -1,15 +0,0 @@
-Index: matplotlib-0.91.2/ttconv/truetype.h
-===================================================================
---- matplotlib-0.91.2.orig/ttconv/truetype.h	2008-04-28 20:13:10.173119651 +0200
-+++ matplotlib-0.91.2/ttconv/truetype.h	2008-04-28 20:14:38.434149359 +0200
-@@ -20,6 +20,10 @@
- ** Last modified 19 April 1995.
- */
- 
-+/* Debian BTS 478237: FTFS with gcc4.3
-+ * Thanks to Soeren Sonnenburg <bugreports at nn7.de> */
-+#include <stdio.h>
-+
- /* Types used in TrueType font files. */
- #define BYTE unsigned char
- #define USHORT unsigned short int

Modified: packages/matplotlib/trunk/debian/patches/build_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/build_fix.patch	2008-06-12 11:40:00 UTC (rev 5613)
+++ packages/matplotlib/trunk/debian/patches/build_fix.patch	2008-06-12 18:40:51 UTC (rev 5614)
@@ -1,7 +1,7 @@
-Index: matplotlib/setupext.py
+Index: matplotlib-0.91.3/setupext.py
 ===================================================================
---- matplotlib.orig/setupext.py	2008-04-22 22:50:11.272065078 +0200
-+++ matplotlib/setupext.py	2008-04-22 23:33:33.044331630 +0200
+--- matplotlib-0.91.3.orig/setupext.py	2008-05-30 00:47:15.000000000 +0200
++++ matplotlib-0.91.3/setupext.py	2008-06-12 19:45:43.380013219 +0200
 @@ -47,8 +47,8 @@
  
  basedir = {
@@ -24,17 +24,17 @@
      'aix5' : ['/usr/local'],
  }
  
-@@ -960,6 +960,9 @@
+@@ -965,6 +965,9 @@
              if not os.path.exists(tk_inc):
-                 tk_inc = os.path.normpath(os.path.join(tk_lib_dir, 
+                 tk_inc = os.path.normpath(os.path.join(tk_lib_dir,
                                            '../../include'))
 +            if not os.path.exists(tk_inc):
 +                tk_inc = os.path.normpath(os.path.join(tk_lib_dir,
 +                                          '../../../include/tcl' + tk_ver))
-             
+ 
              if ((not os.path.exists(os.path.join(tk_inc,'tk.h'))) and
                  os.path.exists(os.path.join(tcl_inc,'tk.h'))):
-@@ -977,11 +980,11 @@
+@@ -982,11 +985,11 @@
  Using default library and include directories for Tcl and Tk because a
  Tk window failed to open.  You may need to define DISPLAY for Tk to work
  so that setup can determine where your libraries are located."""

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2008-06-12 11:40:00 UTC (rev 5613)
+++ packages/matplotlib/trunk/debian/patches/series	2008-06-12 18:40:51 UTC (rev 5614)
@@ -1,4 +1,2 @@
 build_fix.patch
 matplotlibrc_fix.patch
-bts-468977_memory_api_usage.patch
-bts-478237_ftbfs_gcc43.patch

More information about the Python-modules-commits mailing list