[Python-modules-commits] r4760 - in packages/matplotlib/trunk/debian (10 files)
certik-guest at users.alioth.debian.org
certik-guest at users.alioth.debian.org
Sun Mar 9 15:38:32 UTC 2008
Date: Sunday, March 9, 2008 @ 15:38:30
Author: certik-guest
Revision: 4760
Patches polished, use quilt
Added:
packages/matplotlib/trunk/debian/patches/build_fix.patch
packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch
packages/matplotlib/trunk/debian/patches/series
Modified:
packages/matplotlib/trunk/debian/changelog
packages/matplotlib/trunk/debian/control
packages/matplotlib/trunk/debian/rules
Deleted:
packages/matplotlib/trunk/debian/patches/00list
packages/matplotlib/trunk/debian/patches/build_fix.dpatch
packages/matplotlib/trunk/debian/patches/build_fix.dpatch.old
packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.dpatch
Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog 2008-03-09 15:32:39 UTC (rev 4759)
+++ packages/matplotlib/trunk/debian/changelog 2008-03-09 15:38:30 UTC (rev 4760)
@@ -7,8 +7,9 @@
* python-numarray and python-numeric removed from build-depends and
debian/rules fixed to make the package compile
* debian/rules polished
+ * patches moved under a quilt control
- -- Ondrej Certik <ondrej at certik.cz> Sun, 09 Mar 2008 16:24:56 +0100
+ -- Ondrej Certik <ondrej at certik.cz> Sun, 09 Mar 2008 16:36:31 +0100
matplotlib (0.90.1-3.1) unstable; urgency=medium
Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control 2008-03-09 15:32:39 UTC (rev 4759)
+++ packages/matplotlib/trunk/debian/control 2008-03-09 15:38:30 UTC (rev 4760)
@@ -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), dpatch, 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]
XS-Python-Version: all
Standards-Version: 3.7.3
XS-DM-Upload-Allowed: yes
Deleted: packages/matplotlib/trunk/debian/patches/00list
===================================================================
--- packages/matplotlib/trunk/debian/patches/00list 2008-03-09 15:32:39 UTC (rev 4759)
+++ packages/matplotlib/trunk/debian/patches/00list 2008-03-09 15:38:30 UTC (rev 4760)
@@ -1,2 +0,0 @@
-matplotlibrc_fix.dpatch
-build_fix.dpatch
Deleted: packages/matplotlib/trunk/debian/patches/build_fix.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/build_fix.dpatch 2008-03-09 15:32:39 UTC (rev 4759)
+++ packages/matplotlib/trunk/debian/patches/build_fix.dpatch 2008-03-09 15:38:30 UTC (rev 4760)
@@ -1,128 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_fix.dpatch by Vittorio Palmisano <redclay81 at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad matplotlib-0.90.1/setup.py.orig matplotlib-0.90.1/setup.py
---- matplotlib-0.90.1/setup.py.orig 2007-07-06 17:59:58.000000000 +0200
-+++ matplotlib-0.90.1/setup.py 2007-07-06 18:04:52.000000000 +0200
-@@ -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
-
- # 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'
-diff -urNad matplotlib-0.90.1/setupext.py.orig matplotlib-0.90.1/setupext.py
---- matplotlib-0.90.1/setupext.py.orig 2007-07-06 18:07:08.000000000 +0200
-+++ matplotlib-0.90.1/setupext.py 2007-07-06 18:10:17.000000000 +0200
-@@ -45,8 +45,8 @@
-
- basedir = {
- 'win32' : ['win32_static',],
-- 'linux2' : ['/usr/local', '/usr',],
-- 'linux' : ['/usr/local', '/usr',],
-+ 'linux2' : ['/usr',],
-+ 'linux' : ['/usr',],
- 'cygwin' : ['/usr/local', '/usr',],
- 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
- '/usr', '/sw'],
-@@ -54,8 +54,8 @@
- 'freebsd5' : ['/usr/local', '/usr'],
- 'freebsd6' : ['/usr/local', '/usr'],
- 'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
-- 'gnukfreebsd5' : ['/usr/local', '/usr'],
-- 'gnukfreebsd6' : ['/usr/local', '/usr'],
-+ 'gnukfreebsd5' : ['/usr'],
-+ 'gnukfreebsd6' : ['/usr'],
- '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')), '../'))
-
Deleted: packages/matplotlib/trunk/debian/patches/build_fix.dpatch.old
===================================================================
--- packages/matplotlib/trunk/debian/patches/build_fix.dpatch.old 2008-03-09 15:32:39 UTC (rev 4759)
+++ packages/matplotlib/trunk/debian/patches/build_fix.dpatch.old 2008-03-09 15:38:30 UTC (rev 4760)
@@ -1,122 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_fix.dpatch by Vittorio Palmisano <redclay81 at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad matplotlib-0.87.7~/setup.py matplotlib-0.87.7/setup.py
---- matplotlib-0.87.7~/setup.py 2006-11-01 18:11:30.000000000 +0100
-+++ matplotlib-0.87.7/setup.py 2006-11-01 18:12:28.000000000 +0100
-@@ -28,21 +28,21 @@
- # 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
-
- # 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 GUI with Agg renderer ; requires wxPython package
--BUILD_WXAGG = 'auto'
-+BUILD_WXAGG = 0
-
-
- # 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
-@@ -199,7 +199,7 @@
- build_swigagg(ext_modules, packages)
- build_transforms(ext_modules, packages, NUMERIX)
- build_enthought(ext_modules, packages)
--
-+'''
- if BUILD_GTK:
- try:
- import gtk
-@@ -219,7 +219,11 @@
- else:
- build_gdk(ext_modules, packages, NUMERIX)
- rc['backend'] = 'GTK'
-+'''
-+
-+build_gdk(ext_modules, packages, NUMERIX)
-
-+'''
- if BUILD_GTKAGG:
- try:
- import gtk
-@@ -240,7 +244,12 @@
- 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
-@@ -261,7 +270,12 @@
- BUILD_AGG = 1
- build_tkagg(ext_modules, packages, NUMERIX)
- rc['backend'] = 'TkAgg'
-+'''
-
-+BUILD_AGG = 1
-+build_tkagg(ext_modules, packages, NUMERIX)
-+
-+'''
- if BUILD_WXAGG:
- try:
- import wxPython
-@@ -275,6 +289,9 @@
- not (isinstance(BUILD_WXAGG, str) # don't about 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)
-@@ -331,6 +348,6 @@
- ext_modules = ext_modules,
- data_files = data_files,
- package_dir = {'': 'lib'},
-- cmdclass = {'install_data':smart_install_data},
-+ #cmdclass = {'install_data':smart_install_data},
- **additional_params
- )
-diff -urNad matplotlib-0.87.7~/setupext.py matplotlib-0.87.7/setupext.py
---- matplotlib-0.87.7~/setupext.py 2006-11-01 18:11:30.000000000 +0100
-+++ matplotlib-0.87.7/setupext.py 2006-11-01 18:11:49.000000000 +0100
-@@ -349,11 +349,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')), '../'))
Added: packages/matplotlib/trunk/debian/patches/build_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/build_fix.patch (rev 0)
+++ packages/matplotlib/trunk/debian/patches/build_fix.patch 2008-03-09 15:38:30 UTC (rev 4760)
@@ -0,0 +1,122 @@
+Index: matplotlib-0.90.1/setup.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
+
+ # 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',],
+- 'linux' : ['/usr/local', '/usr',],
++ 'linux2' : ['/usr',],
++ 'linux' : ['/usr',],
+ 'cygwin' : ['/usr/local', '/usr',],
+ 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
+ '/usr', '/sw'],
+@@ -54,8 +54,8 @@
+ 'freebsd5' : ['/usr/local', '/usr'],
+ 'freebsd6' : ['/usr/local', '/usr'],
+ 'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
+- 'gnukfreebsd5' : ['/usr/local', '/usr'],
+- 'gnukfreebsd6' : ['/usr/local', '/usr'],
++ 'gnukfreebsd5' : ['/usr'],
++ 'gnukfreebsd6' : ['/usr'],
+ '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')), '../'))
Deleted: packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.dpatch 2008-03-09 15:32:39 UTC (rev 4759)
+++ packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.dpatch 2008-03-09 15:38:30 UTC (rev 4760)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## matplotlibrc_fix.dpatch by Marco Presi (Zufus) <zufus at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad matplotlib-0.87.4~/lib/matplotlib/__init__.py matplotlib-0.87.4/lib/matplotlib/__init__.py
---- matplotlib-0.87.4~/lib/matplotlib/__init__.py 2006-08-01 23:48:33.000000000 +0200
-+++ matplotlib-0.87.4/lib/matplotlib/__init__.py 2006-08-01 23:49:36.000000000 +0200
-@@ -339,9 +339,11 @@
- path = os.environ['MATPLOTLIBDATA']
- if os.path.isdir(path): return path
-
-- path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
-+ path = os.sep.join(['/usr/share/matplotlib', 'mpl-data'])
- if os.path.isdir(path): return path
--
-+
-+ raise RuntimeError('Could not find the matplotlib data files')
-+
- # setuptools' namespace_packages may highjack this init file
- # so need to try something known to be in matplotlib, not basemap
- import matplotlib.afm
-@@ -915,7 +917,7 @@
- if os.path.exists(fname): return fname
-
-
-- path = get_data_path() # guaranteed to exist or raise
-+ path = '/etc' # guaranteed to exist or raise
- fname = os.path.join(path, 'matplotlibrc')
- if not os.path.exists(fname):
- warnings.warn('Could not find matplotlibrc; using defaults')
Added: packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch (rev 0)
+++ packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch 2008-03-09 15:38:30 UTC (rev 4760)
@@ -0,0 +1,27 @@
+Index: matplotlib-0.90.1/lib/matplotlib/__init__.py
+===================================================================
+--- 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
+
+- path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
++ path = os.sep.join(['/usr/share/matplotlib', 'mpl-data'])
+ if os.path.isdir(path): return path
+-
++
++ raise RuntimeError('Could not find the matplotlib data files')
++
+ # 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 @@
+ if os.path.exists(fname): return fname
+
+
+- path = get_data_path() # guaranteed to exist or raise
++ path = '/etc' # guaranteed to exist or raise
+ fname = os.path.join(path, 'matplotlibrc')
+ if not os.path.exists(fname):
+ warnings.warn('Could not find matplotlibrc; using defaults')
Added: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series (rev 0)
+++ packages/matplotlib/trunk/debian/patches/series 2008-03-09 15:38:30 UTC (rev 4760)
@@ -0,0 +1,2 @@
+build_fix.patch
+matplotlibrc_fix.patch
Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules 2008-03-09 15:32:39 UTC (rev 4759)
+++ packages/matplotlib/trunk/debian/rules 2008-03-09 15:38:30 UTC (rev 4760)
@@ -12,8 +12,7 @@
p := python-matplotlib
pdata := python-matplotlib-data
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
# build
build: patch-stamp build-arch build-indep
More information about the Python-modules-commits
mailing list