[Python-modules-commits] r6356 - in packages/matplotlib/trunk/debian (4 files)

morph-guest at users.alioth.debian.org morph-guest at users.alioth.debian.org
Mon Aug 25 17:49:18 UTC 2008 

    Date: Monday, August 25, 2008 @ 17:49:17
  Author: morph-guest
Revision: 6356

added -dbg package; refreshed debian/patches/matplotlibrc_fix.patch

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/control
  packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch
  packages/matplotlib/trunk/debian/rules

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2008-08-25 16:14:36 UTC (rev 6355)
+++ packages/matplotlib/trunk/debian/changelog	2008-08-25 17:49:17 UTC (rev 6356)
@@ -9,12 +9,17 @@
     - depends reorganization: dvipng moved to recommends (optional tex
       depends), python-configobj and python-enthought-traits to suggests
       (experimental support); Closes: #490992
+    - added python-matplotlib-dbg package and python-all-dbg to build-dep
   * debian/README.debian
     - removed outdated info, added notice for MATPLOTLIBDATA env variable
   * debian/python-matplotlib-data.install
     - added matplotlib.conf installation
+  * debian/patches/matplotlibrc_fix.patch
+    - refreshed to match new upstream code
+  * debian/rules
+    - added build, clean and install for -dbg package
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Fri, 22 Aug 2008 11:29:33 +0200
+ -- Sandro Tosi <matrixhasu at gmail.com>  Fri, 22 Aug 2008 14:33:35 +0200
 
 matplotlib (0.98.3-3) unstable; urgency=medium
 

Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control	2008-08-25 16:14:36 UTC (rev 6355)
+++ packages/matplotlib/trunk/debian/control	2008-08-25 17:49:17 UTC (rev 6356)
@@ -11,6 +11,7 @@
                libgtk2.0-dev,
                libpng-dev,
                python-all-dev (>= 2.3.5-7),
+               python-all-dbg (>= 2.4.4-6),
                python-central (>= 0.5.6),
                python-configobj,
                python-dateutil,
@@ -81,7 +82,7 @@
  be accessed either via a functional interface familiar to Matlab
  users or an object oriented interface familiar to Python users.
  .
- This package contains architecture independent data for python-matplotlib
+ This package contains architecture independent data for python-matplotlib.
 
 Package: python-matplotlib-doc
 Architecture: all
@@ -94,4 +95,17 @@
  be accessed either via a functional interface familiar to Matlab
  users or an object oriented interface familiar to Python users.
  .
- This package contains documentation for python-matplotlib
+ This package contains documentation for python-matplotlib.
+
+Package: python-matplotlib-dbg
+Architecture: any
+Priority: extra
+Depends: python-matplotlib (= ${binary:Version}), python-dbg, ${shlibs:Depends}
+Description: Python based plotting system (debug extension)
+ Matplotlib is a pure Python plotting library designed to bring
+ publication quality plotting to Python with a syntax familiar to
+ Matlab users. All of the plotting commands in the pylab interface can
+ be accessed either via a functional interface familiar to Matlab
+ users or an object oriented interface familiar to Python users.
+ .
+ This package contains the debug extension for python-matplotlib.

Modified: packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch	2008-08-25 16:14:36 UTC (rev 6355)
+++ packages/matplotlib/trunk/debian/patches/matplotlibrc_fix.patch	2008-08-25 17:49:17 UTC (rev 6356)
@@ -1,8 +1,8 @@
-Index: matplotlib-0.90.1/lib/matplotlib/__init__.py
+Index: matplotlib-0.98.3/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
-@@ -417,9 +417,11 @@
+--- 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
  
@@ -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
-@@ -514,7 +516,7 @@
+@@ -549,7 +551,7 @@
      if os.path.exists(fname): return fname
  
  
@@ -25,4 +25,3 @@
      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-08-25 16:14:36 UTC (rev 6355)
+++ packages/matplotlib/trunk/debian/rules	2008-08-25 17:49:17 UTC (rev 6356)
@@ -12,6 +12,7 @@
 pd  := python-matplotlib-doc
 p   := python-matplotlib
 pdata := python-matplotlib-data
+pdbg := python-matplotlib-dbg
 
 include /usr/share/quilt/quilt.make
 
@@ -32,7 +33,10 @@
 
 build-stamp-%:
 	dh_testdir
+
 	python$* ./setup.py build $(PY_BUILD_FLAGS)
+	python$*-dbg ./setup.py build $(PY_BUILD_FLAGS)
+
 	touch $@
 
 
@@ -41,11 +45,16 @@
 clean-patched: patch
 	dh_testdir
 	dh_testroot
-	for i in $(PYVERS); do python$(i) ./setup.py clean --all; done
+	
+	for i in $(PYVERS); do \
+	    python$(i) ./setup.py clean --all; \
+	    python$(i)-dbg ./setup.py clean --all; \
+	done
+
 	-rm -f *-stamp*
 	-rm -rf build *.pyc *.pyo
 
-	rm -f lib/matplotlib/mpl-data/matplotlib.conf lib/matplotlib/mpl-data/matplotlibrc
+	rm -f lib/matplotlib/mpl-data/matplotlib.conf lib/matplotlib/mpl-data/matplotlibrc doc/mpl_data/matplotlib.conf doc/mpl_data/matplotlibrc
 
 	# clean the doc
 	( cd doc ; ./make.py clean )
@@ -64,11 +73,21 @@
 install-stamp-%: build-stamp-%
 	dh_testdir
 	dh_testroot
+
 	python$* ./setup.py install_lib \
 		-d $(CURDIR)/debian/$(p)/usr/lib/python$*/site-packages/ --no-compile
+	python$*-dbg ./setup.py install_lib \
+		-d $(CURDIR)/debian/$(pdbg)/usr/lib/python$*/site-packages/ --no-compile
+
+	find debian/$(pdbg) ! -type d ! -name '*.so' | xargs rm -f
+	find debian/$(pdbg) -depth -empty -exec rmdir {} \;
+
 	rm -rf $(CURDIR)/debian/$(p)/usr/lib/python$*/site-packages/matplotlib/mpl-data/
 	rm -rf $(CURDIR)/debian/$(p)/usr/lib/python$*/site-packages/matplotlib/backends/Matplotlib.nib/
 
+	rm -rf $(CURDIR)/debian/$(pdbg)/usr/lib/python$*/site-packages/matplotlib/mpl-data/
+	rm -rf $(CURDIR)/debian/$(pdbg)/usr/lib/python$*/site-packages/matplotlib/backends/Matplotlib.nib/
+
 	touch $@
 
 install-indep: build-indep
@@ -114,7 +133,7 @@
 	done
 	dh_pycentral -a
 	dh_link -a
-	dh_strip -a
+	dh_strip -a --dbg-package=$(pdbg)
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a

More information about the Python-modules-commits mailing list