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

[morph at users.alioth.debian.org]

    Date: Saturday, February 7, 2015 @ 12:48:28
  Author: morph
Revision: 31798

Switch to dh_python2

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

Modified: packages/basemap/trunk/debian/changelog
===================================================================
--- packages/basemap/trunk/debian/changelog	2015-02-07 10:59:43 UTC (rev 31797)
+++ packages/basemap/trunk/debian/changelog	2015-02-07 12:48:28 UTC (rev 31798)
@@ -5,8 +5,9 @@
     - added python-owslib to Suggests, needed to retrieve images using WMS
       servers
     - bump Standards-Version to 3.9.6 (no changes needed)
+  * Switch to dh_python2
 
- -- Sandro Tosi <morph at debian.org>  Sat, 07 Feb 2015 10:59:20 +0000
+ -- Sandro Tosi <morph at debian.org>  Sat, 07 Feb 2015 12:48:19 +0000
 
 basemap (1.0.7+dfsg-1) unstable; urgency=low
 

Modified: packages/basemap/trunk/debian/control
===================================================================
--- packages/basemap/trunk/debian/control	2015-02-07 10:59:43 UTC (rev 31797)
+++ packages/basemap/trunk/debian/control	2015-02-07 12:48:28 UTC (rev 31798)
@@ -3,7 +3,7 @@
 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-dev, python-all-dbg, libgeos-dev, python-httplib2, python-dap, python-support, python-sphinx (>= 1.0.7+dfsg), python-numpy (>= 1:1.5.1-4), python-numpy-dbg, python-matplotlib, python-tk
+Build-Depends: debhelper (>= 8.0.0), python-all, python-all-dev, python-all-dbg, libgeos-dev, python-httplib2, python-dap, dh-python, python-sphinx (>= 1.0.7+dfsg), python-numpy (>= 1:1.5.1-4), python-numpy-dbg, python-matplotlib, python-tk
 Standards-Version: 3.9.6
 Homepage:http://matplotlib.sourceforge.net/toolkits.html
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/basemap/trunk/

Modified: packages/basemap/trunk/debian/rules
===================================================================
--- packages/basemap/trunk/debian/rules	2015-02-07 10:59:43 UTC (rev 31797)
+++ packages/basemap/trunk/debian/rules	2015-02-07 12:48:28 UTC (rev 31798)
@@ -4,7 +4,7 @@
 LIB := $$(python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_platlib")
 
 %:
-	dh $@ --with sphinxdoc
+	dh $@ --with sphinxdoc,python2
 
 override_dh_auto_install:
 	set -e ; \
@@ -14,10 +14,15 @@
 	done
 	dh_numpy
 
-override_dh_pysupport:
-	dh_pysupport
+#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
+
+override_dh_python2:
+	dh_python2
 	# remove namespace file, already shipped with python-matplotlib
-	rm $(CURDIR)/debian/python-mpltoolkits.basemap/usr/share/pyshared/mpl_toolkits/__init__.py
+	rm $(CURDIR)/debian/python-mpltoolkits.basemap//usr/lib/python2.7/dist-packages/mpl_toolkits/__init__.py
 
 build: build-arch build-indep ;