[Python-modules-commits] r18609 - in packages/basemap/trunk/debian (control rules)

[morph at users.alioth.debian.org]

    Date: Sunday, September 18, 2011 @ 19:06:04
  Author: morph
Revision: 18609

mpl_toolkits namespace is already provided by python-matplotlib

Modified:
  packages/basemap/trunk/debian/control
  packages/basemap/trunk/debian/rules

Modified: packages/basemap/trunk/debian/control
===================================================================
--- packages/basemap/trunk/debian/control	2011-09-18 18:30:00 UTC (rev 18608)
+++ packages/basemap/trunk/debian/control	2011-09-18 19:06:04 UTC (rev 18609)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 8.0.0), python-all, python-all-dbg, libgeos-dev, python-httplib2, python-dap
+Build-Depends: debhelper (>= 8.0.0), python-all, python-all-dbg, libgeos-dev, python-httplib2, python-dap, python-support
 Standards-Version: 3.9.2
 Homepage: http://matplotlib.sourceforge.net/toolkits.html
 
 Package: python-mpltoolkits.basemap
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-mpltoolkits.basemap-data (>= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-mpltoolkits.basemap-data (>= ${source:Version}), python-matplotlib
 Recommends: python-dap
 Description: matplotlib toolkit to plot on map projections
  The matplotlib basemap toolkit is a library for plotting 2D data on maps in

Modified: packages/basemap/trunk/debian/rules
===================================================================
--- packages/basemap/trunk/debian/rules	2011-09-18 18:30:00 UTC (rev 18608)
+++ packages/basemap/trunk/debian/rules	2011-09-18 19:06:04 UTC (rev 18609)
@@ -11,3 +11,8 @@
 		$$python setup.py install --prefix $(CURDIR)/debian/python-mpltoolkits.basemap/usr --install-layout=deb; \
 		$$python-dbg setup.py install --prefix $(CURDIR)/debian/python-mpltoolkits.basemap/usr --install-layout=deb; \
 	done
+
+override_dh_pysupport:
+	dh_pysupport
+	# remove namespace file, already shipped with python-matplotlib
+	rm $(CURDIR)/debian/python-mpltoolkits.basemap/usr/share/pyshared/mpl_toolkits/__init__.py