[Python-modules-commits] r5101 - in packages/matplotlib/trunk/debian (6 files)
morph-guest at users.alioth.debian.org
morph-guest at users.alioth.debian.org
Tue Apr 22 22:19:55 UTC 2008
Date: Tuesday, April 22, 2008 @ 22:19:53
Author: morph-guest
Revision: 5101
upgrade to 0.91.2, first step
Modified:
packages/matplotlib/trunk/debian/changelog
packages/matplotlib/trunk/debian/control
packages/matplotlib/trunk/debian/patches/build_fix.patch
packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch
packages/matplotlib/trunk/debian/rules
Deleted:
packages/matplotlib/trunk/debian/docs
Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog 2008-04-22 20:22:27 UTC (rev 5100)
+++ packages/matplotlib/trunk/debian/changelog 2008-04-22 22:19:53 UTC (rev 5101)
@@ -1,10 +1,30 @@
-matplotlib (0.90.1-5) UNRELEASED; urgency=low
+matplotlib (0.91.2-1) UNRELEASED; urgency=low
+ [ Piotr Ożarowski ]
* Replace libwxgtk2.4-python with python-wxgtk2.6 in Depends
(closes: #466470)
- -- Piotr Ożarowski <piotr at debian.org> Mon, 21 Apr 2008 23:19:44 +0200
+ [ Sandro Tosi ]
+ * New upstream release (Closes: #459200, #474001)
+ * debian/patches/build_fix.patch
+ - edited to match new code
+ * debian/rules
+ - adjusted doc files installation
+ * debian/docs
+ - removed since the same files were already in debian/rules
+ * debian/patches/matplotlibrc_fix.patch
+ - edited to match new code (sync from Ubuntu)
+ * debian/control
+ - added "dvipng, python-configobj, python-enthought-traits (>= 2.0),
+ python-qt-dev, python-qt4-dev, python-wxgtk2.6" as build-dep (sync from
+ Ubuntu)
+ - bump depends on python-numpy (sync from Ubuntu)
+ - added "python-qt4, dvipng, python-configobj, python-enthought-traits (>=
+ 2.0)" to Depends (sync from Ubuntu)
+ - merged Recommends into Depends
+ -- Sandro Tosi <matrixhasu at gmail.com> Wed, 23 Apr 2008 00:17:32 +0200
+
matplotlib (0.90.1-4) unstable; urgency=low
* Maintainer changed to Debian Python Modules Team
Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control 2008-04-22 20:22:27 UTC (rev 5100)
+++ packages/matplotlib/trunk/debian/control 2008-04-22 22:19:53 UTC (rev 5101)
@@ -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>
-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]
+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
XS-DM-Upload-Allowed: yes
@@ -12,13 +12,12 @@
Package: python-matplotlib
Architecture: any
XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, python-numpy (>= 1:1.0.3) | python-numeric-ext | python-numarray-ext, python-tk, python-gd (>= 0.52) | python-pypaint | python-gtk2 | python-wxgtk2.6 | python-qt3, python-tz, python-dev, python-matplotlib-data (>= ${source:Version}), python-dateutil, python-gobject, ${shlibs:Depends}
+Depends: ${python:Depends}, python-numpy (>= 1:1.0.4-6) | python-numeric-ext | python-numarray-ext, python-tk, python-gd (>= 0.52) | python-pypaint | 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)
Provides: ${python:Provides}
Conflicts: python2.4-matplotlib
Replaces: python2.4-matplotlib
Enhances: ipython
Suggests: ipython (>= 0.6.3), python-matplotlib-doc, texlive-extra-utils, texlive-latex-extra
-Recommends: dvipng
Description: Python based plotting system in a style similar to Matlab
Matplotlib is a pure Python plotting library designed to bring
publication quality plotting to Python with a syntax familiar to
Deleted: packages/matplotlib/trunk/debian/docs
===================================================================
--- packages/matplotlib/trunk/debian/docs 2008-04-22 20:22:27 UTC (rev 5100)
+++ packages/matplotlib/trunk/debian/docs 2008-04-22 22:19:53 UTC (rev 5101)
@@ -1,6 +0,0 @@
-README
-TODO
-API_CHANGES
-INTERACTIVE
-KNOWN_BUGS
-NUMARRAY_ISSUES
Modified: packages/matplotlib/trunk/debian/patches/build_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/build_fix.patch 2008-04-22 20:22:27 UTC (rev 5100)
+++ packages/matplotlib/trunk/debian/patches/build_fix.patch 2008-04-22 22:19:53 UTC (rev 5101)
@@ -1,98 +1,19 @@
-Index: matplotlib-0.90.1/setup.py
+Index: matplotlib/setupext.py
===================================================================
---- matplotlib-0.90.1.orig/setup.py 2008-03-09 16:31:44.511489293 +0100
-+++ matplotlib-0.90.1/setup.py 2008-03-09 16:31:54.587540476 +0100
-@@ -28,13 +28,13 @@
- # it. It makes very nice antialiased output and also supports alpha
- # blending
- BUILD_AGG = 1
--BUILD_GTKAGG = 'auto'
--BUILD_GTK = 'auto'
-+BUILD_GTKAGG = 1
-+BUILD_GTK = 1
+--- matplotlib.orig/setupext.py 2008-04-22 22:50:11.272065078 +0200
++++ matplotlib/setupext.py 2008-04-22 23:33:33.044331630 +0200
+@@ -47,8 +47,8 @@
- # build TK GUI with Agg renderer ; requires Tkinter Python extension
- # and Tk includes
- # Use False or 0 if you don't want to build
--BUILD_TKAGG = 'auto'
-+BUILD_TKAGG = 1
-
- # build wxPython extension code to efficiently blit agg into wx. Only
- # needed for wxpython <2.8 if you plan on doing animations
-@@ -43,7 +43,7 @@
-
- # build a small extension to manage the focus on win32 platforms.
- #BUILD_WINDOWING = 0
--BUILD_WINDOWING = 'auto'
-+BUILD_WINDOWING = 0
-
-
- VERBOSE = False # insert lots of diagnostic prints in extension code
-@@ -226,15 +226,25 @@
-
- havegtk.gotit = None
-
-+'''
- if BUILD_GTK and havegtk():
- build_gdk(ext_modules, packages, NUMERIX)
- rc['backend'] = 'GTK'
-+'''
-+build_gdk(ext_modules, packages, NUMERIX)
-+rc['backend'] = 'GTK'
-
-+'''
- if BUILD_GTKAGG and havegtk():
- BUILD_AGG = 1
- build_gtkagg(ext_modules, packages, NUMERIX)
- rc['backend'] = 'GTKAgg'
-+'''
-
-+build_gtkagg(ext_modules, packages, NUMERIX)
-+rc['backend'] = 'GTKAgg'
-+
-+'''
- if BUILD_TKAGG:
- try:
- import Tkinter
-@@ -255,7 +265,12 @@
- BUILD_AGG = 1
- build_tkagg(ext_modules, packages, NUMERIX)
- rc['backend'] = 'TkAgg'
-+'''
-+BUILD_AGG = 1
-+build_tkagg(ext_modules, packages, NUMERIX)
-+rc['backend'] = 'TkAgg'
-
-+"""
- if BUILD_WXAGG:
- try:
- import wx
-@@ -270,7 +285,9 @@
- not (isinstance(BUILD_WXAGG, str) # don't abort if BUILD_WXAGG
- and BUILD_WXAGG.lower() == 'auto')) # is "auto"
- rc['backend'] = 'WXAgg'
-+"""
-
-+BUILD_AGG=1
- if BUILD_AGG:
- build_agg(ext_modules, packages, NUMERIX)
- if rc['backend'] == 'PS': rc['backend'] = 'Agg'
-Index: matplotlib-0.90.1/setupext.py
-===================================================================
---- matplotlib-0.90.1.orig/setupext.py 2008-03-09 16:31:44.527489655 +0100
-+++ matplotlib-0.90.1/setupext.py 2008-03-09 16:31:54.596520271 +0100
-@@ -45,8 +45,8 @@
-
basedir = {
'win32' : ['win32_static',],
-- 'linux2' : ['/usr/local', '/usr',],
+- 'linux2' : ['/usr/local', '/usr'],
- 'linux' : ['/usr/local', '/usr',],
-+ 'linux2' : ['/usr',],
++ 'linux2' : ['/usr'],
+ 'linux' : ['/usr',],
'cygwin' : ['/usr/local', '/usr',],
'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
- '/usr', '/sw'],
-@@ -54,8 +54,8 @@
+ '/usr', '/sw', '/usr/X11R6'],
+@@ -56,8 +56,8 @@
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
@@ -103,20 +24,30 @@
'aix5' : ['/usr/local'],
}
-@@ -357,11 +357,11 @@
- print "Using default library and include directories for Tcl and Tk because a"
- print "Tk window failed to open. You may need to define DISPLAY for Tk to work"
- print "so that setup can determine where your libraries are located."
-- o.tcl_lib = "/usr/local/lib"
-- o.tcl_inc = "/usr/local/include"
-- o.tk_lib = "/usr/local/lib"
-- o.tk_inc = "/usr/local/include"
-- o.tkv = ""
-+ o.tcl_lib = "/usr/lib"
-+ o.tcl_inc = "/usr/include/tcl8.4"
-+ o.tk_lib = "/usr/lib"
-+ o.tk_inc = "/usr/include/tcp8.4"
-+ o.tkv = "8.4"
- else:
- tk.withdraw()
- o.tcl_lib = os.path.normpath(os.path.join(str(tk.getvar('tcl_library')), '../'))
+@@ -960,6 +960,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))
+
+ 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 @@
+ 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])
Modified: packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch 2008-04-22 20:22:27 UTC (rev 5100)
+++ packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch 2008-04-22 22:19:53 UTC (rev 5101)
@@ -2,12 +2,12 @@
===================================================================
--- matplotlib-0.90.1.orig/lib/matplotlib/__init__.py 2008-03-09 16:26:37.183488583 +0100
+++ matplotlib-0.90.1/lib/matplotlib/__init__.py 2008-03-09 16:27:41.868489923 +0100
-@@ -339,9 +339,11 @@
- path = os.environ['MATPLOTLIBDATA']
- if os.path.isdir(path): return path
+@@ -417,9 +417,11 @@
+ raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
+ return path
- path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
-+ path = os.sep.join(['/usr/share/matplotlib', 'mpl-data'])
++ path = '/usr/share/matplotlib/mpl-data'
if os.path.isdir(path): return path
-
+
@@ -16,7 +16,7 @@
# setuptools' namespace_packages may highjack this init file
# so need to try something known to be in matplotlib, not basemap
import matplotlib.afm
-@@ -942,7 +944,7 @@
+@@ -514,7 +516,7 @@
if os.path.exists(fname): return fname
@@ -25,3 +25,4 @@
fname = os.path.join(path, 'matplotlibrc')
if not os.path.exists(fname):
warnings.warn('Could not find matplotlibrc; using defaults')
+
Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules 2008-04-22 20:22:27 UTC (rev 5100)
+++ packages/matplotlib/trunk/debian/rules 2008-04-22 22:19:53 UTC (rev 5101)
@@ -86,7 +86,7 @@
dh_testdir -a
dh_testroot -a
dh_installchangelogs -a CHANGELOG
- dh_installdocs -p$(p) -a README TODO API_CHANGES NUMARRAY_ISSUES KNOWN_BUGS
+ dh_installdocs -p$(p) -a README 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 \
More information about the Python-modules-commits
mailing list