[Python-modules-commits] r10471 - in packages/matplotlib/trunk/debian (13 files)
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Sun Nov 15 22:02:39 UTC 2009
Date: Sunday, November 15, 2009 @ 22:02:38
Author: bdrung-guest
Revision: 10471
Convert patch system back to quilt and use DEP-3 patch tagging guidelines.
Added:
packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.patch
(from rev 10469, packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.dpatch)
packages/matplotlib/trunk/debian/patches/10_build_fix.patch
(from rev 10469, packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch)
packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch
(from rev 10469, packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.dpatch)
packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.patch
(from rev 10469, packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.dpatch)
packages/matplotlib/trunk/debian/patches/series
(from rev 10469, packages/matplotlib/trunk/debian/patches/00list)
Modified:
packages/matplotlib/trunk/debian/README.source
packages/matplotlib/trunk/debian/control
packages/matplotlib/trunk/debian/rules
Deleted:
packages/matplotlib/trunk/debian/patches/00list
packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.dpatch
packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch
packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.dpatch
packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.dpatch
Modified: packages/matplotlib/trunk/debian/README.source
===================================================================
--- packages/matplotlib/trunk/debian/README.source 2009-11-15 20:21:48 UTC (rev 10470)
+++ packages/matplotlib/trunk/debian/README.source 2009-11-15 22:02:38 UTC (rev 10471)
@@ -1,4 +1,5 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
- /usr/share/doc/dpatch/
+For more information about quilt, see /usr/share/doc/quilt/README.source
Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control 2009-11-15 20:21:48 UTC (rev 10470)
+++ packages/matplotlib/trunk/debian/control 2009-11-15 22:02:38 UTC (rev 10471)
@@ -6,7 +6,6 @@
Sandro Tosi <morph at debian.org>,
Benjamin Drung <bdrung at ubuntu.com>
Build-Depends: debhelper (>= 7),
- dpatch,
dvipng,
graphviz,
ipython,
@@ -35,6 +34,7 @@
python-tz,
python-wxgtk2.8,
python-wxgtk2.8-dbg,
+ quilt,
tcl8.5-dev,
texlive-fonts-recommended,
texlive-latex-extra,
Deleted: packages/matplotlib/trunk/debian/patches/00list
===================================================================
--- packages/matplotlib/trunk/debian/patches/00list 2009-11-15 20:21:48 UTC (rev 10470)
+++ packages/matplotlib/trunk/debian/patches/00list 2009-11-15 22:02:38 UTC (rev 10471)
@@ -1,4 +0,0 @@
-05-find-tcl-tk-directory.dpatch
-10_build_fix.dpatch
-20_matplotlibrc_path_search_fix.dpatch
-30_doc_pass_dpi
Deleted: packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.dpatch 2009-11-15 20:21:48 UTC (rev 10470)
+++ packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.dpatch 2009-11-15 22:02:38 UTC (rev 10471)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05-find-tcl-tk-directory.dpatch by Benjamin Drung <bdrung at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Guess the correct directory in Debian/Ubuntu. Replacing all tcl by tk
-## DP: does not lead to a correct directory:
-## DP: /usr/share/tcltk/tcl8.5 -> /usr/share/tktk/tk8.5
-## DP: The correct path is /usr/share/tcltk/tk8.5
-
- at DPATCH@
-diff -pruN matplotlib-0.99.1.1/setupext.py matplotlib-0.99.1.1.new/setupext.py
---- matplotlib-0.99.1.1/setupext.py 2009-08-23 07:27:32.000000000 +0200
-+++ matplotlib-0.99.1.1.new/setupext.py 2009-10-05 22:46:47.465938277 +0200
-@@ -850,7 +850,11 @@ def query_tcltk():
- else:
- tcl_lib_dir = str(tcl.getvar('tcl_library'))
- # Guess Tk location based on Tcl location
-- tk_lib_dir = tcl_lib_dir.replace('Tcl', 'Tk').replace('tcl', 'tk')
-+ (head, tail) = os.path.split(tcl_lib_dir)
-+ tail = tail.replace('Tcl', 'Tk').replace('tcl', 'tk')
-+ tk_lib_dir = os.path.join(head, tail)
-+ if not os.path.exists(tk_lib_dir):
-+ tk_lib_dir = tcl_lib_dir.replace('Tcl', 'Tk').replace('tcl', 'tk')
- else:
- # Obtain Tcl and Tk locations from Tk widget
- tk.withdraw()
Copied: packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.patch (from rev 10469, packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.dpatch)
===================================================================
--- packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.patch (rev 0)
+++ packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.patch 2009-11-15 22:02:38 UTC (rev 10471)
@@ -0,0 +1,23 @@
+Description: Find tcl/tk directory
+ Guess the correct directory in Debian/Ubuntu. Replacing all tcl by tk does not
+ lead to a correct directory: /usr/share/tcltk/tcl8.5 -> /usr/share/tktk/tk8.5
+ The correct path is /usr/share/tcltk/tk8.5
+Forwarded: Yes
+Author: Benjamin Drung <bdrung at ubuntu.com>
+
+diff -pruN matplotlib-0.99.1.1/setupext.py matplotlib-0.99.1.1.new/setupext.py
+--- matplotlib-0.99.1.1/setupext.py 2009-08-23 07:27:32.000000000 +0200
++++ matplotlib-0.99.1.1.new/setupext.py 2009-10-05 22:46:47.465938277 +0200
+@@ -850,7 +850,11 @@ def query_tcltk():
+ else:
+ tcl_lib_dir = str(tcl.getvar('tcl_library'))
+ # Guess Tk location based on Tcl location
+- tk_lib_dir = tcl_lib_dir.replace('Tcl', 'Tk').replace('tcl', 'tk')
++ (head, tail) = os.path.split(tcl_lib_dir)
++ tail = tail.replace('Tcl', 'Tk').replace('tcl', 'tk')
++ tk_lib_dir = os.path.join(head, tail)
++ if not os.path.exists(tk_lib_dir):
++ tk_lib_dir = tcl_lib_dir.replace('Tcl', 'Tk').replace('tcl', 'tk')
+ else:
+ # Obtain Tcl and Tk locations from Tk widget
+ tk.withdraw()
Deleted: packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch 2009-11-15 20:21:48 UTC (rev 10470)
+++ packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch 2009-11-15 22:02:38 UTC (rev 10471)
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_build_fix.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes path for build on Debian
-
- at DPATCH@
-
-Index: matplotlib-0.98.3/setupext.py
-===================================================================
---- matplotlib-0.98.3.orig/setupext.py 2008-10-08 23:30:35.000000000 +0000
-+++ matplotlib-0.98.3/setupext.py 2008-10-08 23:31:19.000000000 +0000
-@@ -47,8 +47,12 @@
-
- basedir = {
- 'win32' : ['win32_static',],
-- 'linux2' : ['/usr/local', '/usr'],
-- 'linux' : ['/usr/local', '/usr',],
-+ 'linux2-alpha' : ['/usr'],
-+ 'linux2-hppa' : ['/usr'],
-+ 'linux2-mips' : ['/usr'],
-+ 'linux2-sparc' : ['/usr'],
-+ 'linux2' : ['/usr'],
-+ 'linux' : ['/usr',],
- 'cygwin' : ['/usr/local', '/usr',],
- 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
- '/usr', '/sw', '/usr/X11R6'],
-@@ -56,8 +60,10 @@
- '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'],
-+ 'gnukfreebsd7' : ['/usr'],
-+ 'gnukfreebsd8' : ['/usr'],
- 'aix5' : ['/usr/local'],
- }
-
Copied: packages/matplotlib/trunk/debian/patches/10_build_fix.patch (from rev 10469, packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch)
===================================================================
--- packages/matplotlib/trunk/debian/patches/10_build_fix.patch (rev 0)
+++ packages/matplotlib/trunk/debian/patches/10_build_fix.patch 2009-11-15 22:02:38 UTC (rev 10471)
@@ -0,0 +1,35 @@
+Description: Fixes path for build on Debian
+Forwarded: no
+Author: Sandro Tosi <morph at debian.org>
+
+diff -pruN matplotlib-0.98.3.orig/setupext.py matplotlib-0.98.3/setupext.py
+--- matplotlib-0.98.3.orig/setupext.py 2008-10-08 23:30:35.000000000 +0000
++++ matplotlib-0.98.3/setupext.py 2008-10-08 23:31:19.000000000 +0000
+@@ -47,8 +47,12 @@
+
+ basedir = {
+ 'win32' : ['win32_static',],
+- 'linux2' : ['/usr/local', '/usr'],
+- 'linux' : ['/usr/local', '/usr',],
++ 'linux2-alpha' : ['/usr'],
++ 'linux2-hppa' : ['/usr'],
++ 'linux2-mips' : ['/usr'],
++ 'linux2-sparc' : ['/usr'],
++ 'linux2' : ['/usr'],
++ 'linux' : ['/usr',],
+ 'cygwin' : ['/usr/local', '/usr',],
+ 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
+ '/usr', '/sw', '/usr/X11R6'],
+@@ -56,8 +60,10 @@
+ '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'],
++ 'gnukfreebsd7' : ['/usr'],
++ 'gnukfreebsd8' : ['/usr'],
+ 'aix5' : ['/usr/local'],
+ }
+
Deleted: packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.dpatch 2009-11-15 20:21:48 UTC (rev 10470)
+++ packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.dpatch 2009-11-15 22:02:38 UTC (rev 10471)
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_matplotlibrc_path_search_fix.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes the path to search for matplotlibrc file
-
- at DPATCH@
-
-Index: matplotlib-0.98.3/lib/matplotlib/__init__.py
-===================================================================
---- matplotlib-0.98.3.orig/lib/matplotlib/__init__.py 2008-08-22 11:52:37.253904720 +0200
-+++ matplotlib-0.98.3/lib/matplotlib/__init__.py 2008-08-22 11:52:42.250189441 +0200
-@@ -452,9 +452,11 @@
- raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
- return path
-
-- path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
-+ path = '/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
-@@ -549,7 +551,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')
Copied: packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch (from rev 10469, packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.dpatch)
===================================================================
--- packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch (rev 0)
+++ packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch 2009-11-15 22:02:38 UTC (rev 10471)
@@ -0,0 +1,29 @@
+Description: Fixes the path to search for matplotlibrc file
+Forwarded: not-needed
+Author: Sandro Tosi <morph at debian.org>
+
+--- matplotlib-0.98.3.orig/lib/matplotlib/__init__.py 2008-08-22 11:52:37.253904720 +0200
++++ matplotlib-0.98.3/lib/matplotlib/__init__.py 2008-08-22 11:52:42.250189441 +0200
+@@ -452,9 +452,11 @@
+ raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
+ return path
+
+- path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
++ path = '/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
+@@ -549,7 +551,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')
Deleted: packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.dpatch 2009-11-15 20:21:48 UTC (rev 10470)
+++ packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.dpatch 2009-11-15 22:02:38 UTC (rev 10471)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_doc_pass_dpi.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Pass DPI, along with format, in plot format configuration
-
- at DPATCH@
-diff -urNad matplotlib~/doc/make.py matplotlib/doc/make.py
---- matplotlib~/doc/make.py 2009-08-01 21:14:12.000000000 +0200
-+++ matplotlib/doc/make.py 2009-10-09 08:56:04.000000000 +0200
-@@ -30,7 +30,7 @@
- check_build()
- shutil.copy('../lib/matplotlib/mpl-data/matplotlibrc', '_static/matplotlibrc')
- if small_docs:
-- options = "-D plot_formats=\"['png']\""
-+ options = "-D plot_formats=\"[('png', 80)]\""
- else:
- options = ''
- if os.system('sphinx-build %s -P -b html -d build/doctrees . build/html' % options):
Copied: packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.patch (from rev 10469, packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.dpatch)
===================================================================
--- packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.patch (rev 0)
+++ packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.patch 2009-11-15 22:02:38 UTC (rev 10471)
@@ -0,0 +1,16 @@
+Description: Pass DPI, along with format, in plot format configuration
+Forwarded: yes
+Author: Sandro Tosi <morph at debian.org>
+
+diff -urNad matplotlib~/doc/make.py matplotlib/doc/make.py
+--- matplotlib~/doc/make.py 2009-08-01 21:14:12.000000000 +0200
++++ matplotlib/doc/make.py 2009-10-09 08:56:04.000000000 +0200
+@@ -30,7 +30,7 @@
+ check_build()
+ shutil.copy('../lib/matplotlib/mpl-data/matplotlibrc', '_static/matplotlibrc')
+ if small_docs:
+- options = "-D plot_formats=\"['png']\""
++ options = "-D plot_formats=\"[('png', 80)]\""
+ else:
+ options = ''
+ if os.system('sphinx-build %s -P -b html -d build/doctrees . build/html' % options):
Copied: packages/matplotlib/trunk/debian/patches/series (from rev 10469, packages/matplotlib/trunk/debian/patches/00list)
===================================================================
--- packages/matplotlib/trunk/debian/patches/series (rev 0)
+++ packages/matplotlib/trunk/debian/patches/series 2009-11-15 22:02:38 UTC (rev 10471)
@@ -0,0 +1,4 @@
+05-find-tcl-tk-directory.patch
+10_build_fix.patch
+20_matplotlibrc_path_search_fix.patch
+30_doc_pass_dpi.patch
Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules 2009-11-15 20:21:48 UTC (rev 10470)
+++ packages/matplotlib/trunk/debian/rules 2009-11-15 22:02:38 UTC (rev 10471)
@@ -1,10 +1,6 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
PYVERS := $(shell pyversions -v -r debian/control)
DEFPY := $(shell pyversions -v -d)
@@ -14,8 +10,6 @@
pdata := python-matplotlib-data
pdbg := python-matplotlib-dbg
-include /usr/share/dpatch/dpatch.make
-
# build
build: patch build-arch build-indep
More information about the Python-modules-commits
mailing list