[Python-modules-commits] r7104 - in packages/matplotlib/trunk/debian (13 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Sat Dec 13 14:24:25 UTC 2008
Date: Saturday, December 13, 2008 @ 14:24:24
Author: morph
Revision: 7104
- added note about 'dvipng' not installed automatically anymore
* debian/{control,rules,patches/*}
- moved from quilt to dpatch
* debian/patches/{matplotlibrc.template-typo.patch,doc_graphviz_errors_fix.patch,
bts-498229_axes3d_typo.patch}
- removed since merged upstream
Added:
packages/matplotlib/trunk/debian/patches/00list
packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch
packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.dpatch
Modified:
packages/matplotlib/trunk/debian/NEWS
packages/matplotlib/trunk/debian/changelog
packages/matplotlib/trunk/debian/control
packages/matplotlib/trunk/debian/rules
Deleted:
packages/matplotlib/trunk/debian/patches/bts-498229_axes3d_typo.patch
packages/matplotlib/trunk/debian/patches/build_fix.patch
packages/matplotlib/trunk/debian/patches/doc_graphviz_errors_fix.patch
packages/matplotlib/trunk/debian/patches/matplotlibrc.template-typo.patch
packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch
packages/matplotlib/trunk/debian/patches/series
Modified: packages/matplotlib/trunk/debian/NEWS
===================================================================
--- packages/matplotlib/trunk/debian/NEWS 2008-12-13 08:20:18 UTC (rev 7103)
+++ packages/matplotlib/trunk/debian/NEWS 2008-12-13 14:24:24 UTC (rev 7104)
@@ -1,4 +1,4 @@
-matplotlib (0.98.3-6) UNRELEASED; urgency=low
+matplotlib (0.98.5-1) UNRELEASED; urgency=low
With this release, we are setting the default backend for matplotlib to
'TkAgg', the lower level of backend suggested by upsteam.
@@ -7,4 +7,14 @@
/usr/share/doc/python-matplotlib/README.Debian
- -- Sandro Tosi <morph at debian.org> Sat, 08 Nov 2008 19:36:42 +0100
+ Another change introduced is the removal of 'dvipng' from automatical
+ installation. The net result is a reduction on the number (and then size) of
+ packages to download and install to have matplotlib working, since 'dvipng'
+ takes in 'texlive' (the LaTeX distribution); matplotlib has already a way to
+ render mathmatical symbols, but if you want to use the tex render, then run
+
+ apt-get install dvipng
+
+ to reproduce the previous behaviour.
+
+ -- Sandro Tosi <morph at debian.org> Sat, 13 Dec 2008 09:35:32 +0100
Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog 2008-12-13 08:20:18 UTC (rev 7103)
+++ packages/matplotlib/trunk/debian/changelog 2008-12-13 14:24:24 UTC (rev 7104)
@@ -26,10 +26,16 @@
automatically taken in); Closes: #490992
* debian/NEWS
- added to notify users about default backend (TkAgg)
+ - added note about 'dvipng' not installed automatically anymore
* debian/README.debian
- added information about changing backend
* debian/rules
- merging all "rm" calls into "dh_clean" call
+ * debian/{control,rules,patches/*}
+ - moved from quilt to dpatch
+ * debian/patches/{matplotlibrc.template-typo.patch,doc_graphviz_errors_fix.patch,
+ bts-498229_axes3d_typo.patch}
+ - removed since merged upstream
-- Benjamin Drung <benjamin.drung at gmail.com> Sat, 08 Nov 2008 00:33:36 +0100
Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control 2008-12-13 08:20:18 UTC (rev 7103)
+++ packages/matplotlib/trunk/debian/control 2008-12-13 14:24:24 UTC (rev 7104)
@@ -9,6 +9,7 @@
Sandro Tosi <morph at debian.org>,
Benjamin Drung <benjamin.drung at gmail.com>
Build-Depends: debhelper (>= 5.0.38),
+ dpatch,
dvipng,
graphviz,
ipython,
@@ -32,7 +33,6 @@
python-tk,
python-tz,
python-wxgtk2.8,
- quilt,
texlive-latex-extra,
tcl8.4-dev,
tk8.4-dev,
Added: packages/matplotlib/trunk/debian/patches/00list
===================================================================
--- packages/matplotlib/trunk/debian/patches/00list (rev 0)
+++ packages/matplotlib/trunk/debian/patches/00list 2008-12-13 14:24:24 UTC (rev 7104)
@@ -0,0 +1,2 @@
+10_build_fix.dpatch
+20_matplotlibrc_path_search_fix.dpatch
Added: packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch (rev 0)
+++ packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch 2008-12-13 14:24:24 UTC (rev 7104)
@@ -0,0 +1,66 @@
+#! /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'],
+ }
+
+@@ -977,6 +983,10 @@
+ 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')):
+ tk_inc = tcl_inc
+
+@@ -994,10 +1004,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):
Added: packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.dpatch (rev 0)
+++ packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.dpatch 2008-12-13 14:24:24 UTC (rev 7104)
@@ -0,0 +1,35 @@
+#! /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')
Deleted: packages/matplotlib/trunk/debian/patches/bts-498229_axes3d_typo.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/bts-498229_axes3d_typo.patch 2008-12-13 08:20:18 UTC (rev 7103)
+++ packages/matplotlib/trunk/debian/patches/bts-498229_axes3d_typo.patch 2008-12-13 14:24:24 UTC (rev 7104)
@@ -1,7 +0,0 @@
-Index: matplotlib-0.98.3/lib/matplotlib/axes3d.py
-===================================================================
---- matplotlib-0.98.3.orig/lib/matplotlib/axes3d.py 2008-10-30 22:40:51.122768151 +0100
-+++ matplotlib-0.98.3/lib/matplotlib/axes3d.py 2008-10-30 22:41:41.406765219 +0100
-@@ -1 +1 @@
--raise NotImplmentedError('axes3d is not supported in matplotlib-0.98. You may want to try the 0.91.x maintenance branch')
-+raise NotImplementedError('axes3d is not supported in matplotlib-0.98. You may want to try the 0.91.x maintenance branch')
Deleted: packages/matplotlib/trunk/debian/patches/build_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/build_fix.patch 2008-12-13 08:20:18 UTC (rev 7103)
+++ packages/matplotlib/trunk/debian/patches/build_fix.patch 2008-12-13 14:24:24 UTC (rev 7104)
@@ -1,58 +0,0 @@
-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'],
- }
-
-@@ -977,6 +983,10 @@
- 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')):
- tk_inc = tcl_inc
-
-@@ -994,10 +1004,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):
Deleted: packages/matplotlib/trunk/debian/patches/doc_graphviz_errors_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/doc_graphviz_errors_fix.patch 2008-12-13 08:20:18 UTC (rev 7103)
+++ packages/matplotlib/trunk/debian/patches/doc_graphviz_errors_fix.patch 2008-12-13 14:24:24 UTC (rev 7104)
@@ -1,13 +0,0 @@
-Index: matplotlib-0.98.3/doc/sphinxext/inheritance_diagram.py
-===================================================================
---- matplotlib-0.98.3.orig/doc/sphinxext/inheritance_diagram.py 2008-08-04 20:38:45.826256001 +0200
-+++ matplotlib-0.98.3/doc/sphinxext/inheritance_diagram.py 2008-08-04 20:39:01.087125677 +0200
-@@ -346,7 +346,7 @@
- parts = node['parts']
-
- graph_hash = get_graph_hash(node)
-- name = "inheritance%s"
-+ name = "inheritance%s" % graph_hash
- pdf_path = os.path.join('_static', name + ".pdf")
-
- graph.run_dot(['-Tpdf', '-o%s' % pdf_path],
Deleted: packages/matplotlib/trunk/debian/patches/matplotlibrc.template-typo.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/matplotlibrc.template-typo.patch 2008-12-13 08:20:18 UTC (rev 7103)
+++ packages/matplotlib/trunk/debian/patches/matplotlibrc.template-typo.patch 2008-12-13 14:24:24 UTC (rev 7104)
@@ -1,12 +0,0 @@
-diff -Nurp matplotlib-0.98.3/matplotlibrc.template matplotlib-0.98.3.new/matplotlibrc.template
---- matplotlib-0.98.3/matplotlibrc.template 2008-08-03 20:15:22.000000000 +0200
-+++ matplotlib-0.98.3.new/matplotlibrc.template 2008-10-14 20:37:17.000000000 +0200
-@@ -4,7 +4,7 @@
- # of it on your system in
- # site-packages/matplotlib/mpl-data/matplotlibrc. If you edit it
- # there, please note that it will be overridden in your next install.
--# If you want to keep a permanent local bopy that will not be
-+# If you want to keep a permanent local copy that will not be
- # over-written, place it in HOME/.matplotlib/matplotlibrc (unix/linux
- # like systems) and C:\Documents and Settings\yourname\.matplotlib
- # (win32 systems).
Deleted: packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch 2008-12-13 08:20:18 UTC (rev 7103)
+++ packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch 2008-12-13 14:24:24 UTC (rev 7104)
@@ -1,27 +0,0 @@
-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')
Deleted: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series 2008-12-13 08:20:18 UTC (rev 7103)
+++ packages/matplotlib/trunk/debian/patches/series 2008-12-13 14:24:24 UTC (rev 7104)
@@ -1,5 +0,0 @@
-build_fix.patch
-matplotlibrc_fix.patch
-matplotlibrc.template-typo.patch
-doc_graphviz_errors_fix.patch
-bts-498229_axes3d_typo.patch
Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules 2008-12-13 08:20:18 UTC (rev 7103)
+++ packages/matplotlib/trunk/debian/rules 2008-12-13 14:24:24 UTC (rev 7104)
@@ -14,7 +14,7 @@
pdata := python-matplotlib-data
pdbg := python-matplotlib-dbg
-include /usr/share/quilt/quilt.make
+include /usr/share/dpatch/dpatch.make
# build
build: patch build-arch build-indep
More information about the Python-modules-commits
mailing list