[Python-modules-commits] r5690 - in packages/matplotlib/branches/experimental/debian (4 files)

Wed Jun 18 19:59:42 UTC 2008

Date: Wednesday, June 18, 2008 @ 19:59:41
  Author: morph-guest
Revision: 5690

new upstream release; bump numpy deps; updated build_fix.patch

Modified:
  packages/matplotlib/branches/experimental/debian/changelog
  packages/matplotlib/branches/experimental/debian/control
  packages/matplotlib/branches/experimental/debian/patches/build_fix.patch
  packages/matplotlib/branches/experimental/debian/rules

Modified: packages/matplotlib/branches/experimental/debian/changelog
===================================================================

--- packages/matplotlib/branches/experimental/debian/changelog	2008-06-18 15:02:30 UTC (rev 5689)
+++ packages/matplotlib/branches/experimental/debian/changelog	2008-06-18 19:59:41 UTC (rev 5690)
@@ -1,3 +1,15 @@
+matplotlib (0.98.0-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+  * debian/rules
+    - changed doc name
+  * debian/control
+    - bump build-dep to python-numpy to at least 1.1.0
+  * debian/patches/build_fix.patch
+    - updated to match new upstream source code
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Wed, 18 Jun 2008 21:28:42 +0200
+
 matplotlib (0.91.3-1) unstable; urgency=low
 
   * New upstream release; Closes: #485950

Modified: packages/matplotlib/branches/experimental/debian/control
===================================================================
--- packages/matplotlib/branches/experimental/debian/control	2008-06-18 15:02:30 UTC (rev 5689)
+++ packages/matplotlib/branches/experimental/debian/control	2008-06-18 19:59:41 UTC (rev 5690)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 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, dvipng, python-configobj, python-enthought-traits (>= 2.0), python-qt-dev, python-qt4-dev, python-wxgtk2.6
+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.1.0), libgtk2.0-dev, libfreetype6-dev, zlib1g-dev, libpng-dev, tk8.4-dev, python-tk, tcl8.4-dev, python-epydoc, python-tz, dvipng, python-configobj, python-enthought-traits (>= 2.0), python-qt-dev, python-qt4-dev, python-wxgtk2.6
 XS-Python-Version: all
 Standards-Version: 3.8.0
 XS-DM-Upload-Allowed: yes
@@ -12,7 +12,7 @@
 Package: python-matplotlib
 Architecture: any
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, python-numpy (>= 1:1.0.4-6), python-tk, python-gd (>= 0.52) | python-gtk2 | python-wxgtk2.6 | python-qt3 | python-qt4, python-tz, python-dev, python-matplotlib-data (>= ${source:Version}), python-dateutil, python-gobject, ${shlibs:Depends}, dvipng, python-configobj, python-enthought-traits (>= 2.0), python-pyparsing, python-glade2, python-cairo
+Depends: ${python:Depends}, python-numpy (>= 1:1.1.0), python-tk, python-gd (>= 0.52) | python-gtk2 | python-wxgtk2.6 | python-qt3 | python-qt4, python-tz, python-dev, python-matplotlib-data (>= ${source:Version}), python-dateutil, python-gobject, ${shlibs:Depends}, dvipng, python-configobj, python-enthought-traits (>= 2.0), python-pyparsing, python-glade2, python-cairo
 Provides: ${python:Provides}
 Conflicts: python2.4-matplotlib
 Replaces: python2.4-matplotlib

Modified: packages/matplotlib/branches/experimental/debian/patches/build_fix.patch
===================================================================
--- packages/matplotlib/branches/experimental/debian/patches/build_fix.patch	2008-06-18 15:02:30 UTC (rev 5689)
+++ packages/matplotlib/branches/experimental/debian/patches/build_fix.patch	2008-06-18 19:59:41 UTC (rev 5690)
@@ -1,7 +1,7 @@
-Index: matplotlib-0.91.3/setupext.py
+Index: matplotlib-0.98.0/setupext.py
 ===================================================================
---- 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
+--- matplotlib-0.98.0.orig/setupext.py	2008-05-30 00:47:10.000000000 +0200
++++ matplotlib-0.98.0/setupext.py	2008-06-18 20:14:40.296926877 +0200
 @@ -47,8 +47,8 @@
  
  basedir = {
@@ -24,30 +24,29 @@
      'aix5' : ['/usr/local'],
  }
  
-@@ -965,6 +965,9 @@
-             if not os.path.exists(tk_inc):
-                 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))
+@@ -965,6 +965,10 @@
+         tk_inc = os.path.normpath(os.path.join(tk_lib_dir,
+                                                        '../../include'))
  
-             if ((not os.path.exists(os.path.join(tk_inc,'tk.h'))) and
-                 os.path.exists(os.path.join(tcl_inc,'tk.h'))):
-@@ -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."""
--            tcl_inc = "/usr/local/include"
--            tk_inc = "/usr/local/include"
--            tcl_lib = "/usr/local/lib"
--            tk_lib = "/usr/local/lib"
--            tk_ver = ""
-+            tcl_inc = "/usr/include/tcl8.4"
-+            tk_inc = "/usr/include/tcl8.4"
-+            tcl_lib = "/usr/lib"
-+            tk_lib = "/usr/lib"
-+            tk_ver = "8.4"
-         # Add final versions of directories and libraries to module lists
-         module.include_dirs.extend([tcl_inc, tk_inc])
-         module.library_dirs.extend([tcl_lib, tk_lib])
++    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')):
+         tk_inc = tcl_inc
+ 
+@@ -982,10 +986,10 @@
+     return tcl_lib, tcl_inc, tk_lib, tk_inc
+ 
+ def hardcoded_tcl_config():
+-    tcl_inc = "/usr/local/include"
+-    tk_inc = "/usr/local/include"
+-    tcl_lib = "/usr/local/lib"
+-    tk_lib = "/usr/local/lib"
++    tcl_inc = "/usr/include/tcl8.4"
++    tk_inc = "/usr/include/tcl8.4"
++    tcl_lib = "/usr/lib"
++    tk_lib = "/usr/lib"
+     return tcl_lib, tcl_inc, tk_lib, tk_inc
+ 
+ def add_tk_flags(module):

Modified: packages/matplotlib/branches/experimental/debian/rules
===================================================================
--- packages/matplotlib/branches/experimental/debian/rules	2008-06-18 15:02:30 UTC (rev 5689)
+++ packages/matplotlib/branches/experimental/debian/rules	2008-06-18 19:59:41 UTC (rev 5690)
@@ -89,7 +89,7 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_installchangelogs -a CHANGELOG
-	dh_installdocs -p$(p) -a README TODO API_CHANGES KNOWN_BUGS INTERACTIVE
+	dh_installdocs -p$(p) -a README.txt TODO API_CHANGES KNOWN_BUGS INTERACTIVE
 	# make python scripts starting with '#!' executable
 	for i in `find debian -mindepth 2 -type f ! -perm 755`; do \
 	  if head -1 $$i | grep -q '^#!'; then \


