[Python-modules-commits] r18976 - in packages/python-mysqldb/trunk/debian (3 files)

[mejo at users.alioth.debian.org]

    Date: Tuesday, October 18, 2011 @ 10:48:00
  Author: mejo
Revision: 18976

more dh_python2 migration changes

Modified:
  packages/python-mysqldb/trunk/debian/changelog
  packages/python-mysqldb/trunk/debian/control
  packages/python-mysqldb/trunk/debian/rules

Modified: packages/python-mysqldb/trunk/debian/changelog
===================================================================
--- packages/python-mysqldb/trunk/debian/changelog	2011-10-18 10:06:10 UTC (rev 18975)
+++ packages/python-mysqldb/trunk/debian/changelog	2011-10-18 10:48:00 UTC (rev 18976)
@@ -10,8 +10,9 @@
     - Remove Build-Depends on python-support.
     - Bump minimal Build-Depends on python to (>= 2.6.6-3~).
     - Remove XS-Python-Version header from debian/control.
+    - Remove obsolete python magic from debian/rules.
 
- -- Jonas Meurer <mejo at debian.org>  Tue, 18 Oct 2011 12:02:43 +0200
+ -- Jonas Meurer <mejo at debian.org>  Tue, 18 Oct 2011 12:45:53 +0200
 
 python-mysqldb (1.2.3-0ubuntu1) oneiric; urgency=low
 

Modified: packages/python-mysqldb/trunk/debian/control
===================================================================
--- packages/python-mysqldb/trunk/debian/control	2011-10-18 10:06:10 UTC (rev 18975)
+++ packages/python-mysqldb/trunk/debian/control	2011-10-18 10:48:00 UTC (rev 18976)
@@ -19,7 +19,7 @@
 Replaces: python2.3-mysqldb, python2.4-mysqldb
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
-Description: A Python interface to MySQL
+Description: Python interface to MySQL
  MySQLdb is an interface to the popular MySQL database server for
  Python. The design goals are:
  .
@@ -36,7 +36,7 @@
 Architecture: any
 Depends: python-mysqldb (= ${binary:Version}), python-dbg, ${shlibs:Depends}
 Suggests: python-egenix-mxdatetime-dbg
-Description: A Python interface to MySQL (debug extension)
+Description: Python interface to MySQL (debug extension)
  MySQLdb is an interface to the popular MySQL database server for
  Python.
  .

Modified: packages/python-mysqldb/trunk/debian/rules
===================================================================
--- packages/python-mysqldb/trunk/debian/rules	2011-10-18 10:06:10 UTC (rev 18975)
+++ packages/python-mysqldb/trunk/debian/rules	2011-10-18 10:48:00 UTC (rev 18976)
@@ -4,84 +4,58 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-#take care of python libdirs and options
--include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
-  py_sitename = site-packages
-  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-  py_sitename_sh = $(py_sitename)
-  py_libdir_sh = $(py_libdir)
-endif
-
 # export some vars
 export mysqlversion=5.1
 export mysqlclient=mysqlclient_r
 export mysqloptlibs=ssl crypto
 
-PYVERS=$(shell pyversions -r)
+PYVERS=$(shell pyversions -vs)
 
-build: build-stamp
-build-stamp:
+clean: $(PYVERS:%=clean-python%)
+clean-python%:
 	dh_testdir
-	
-	set -e; \
-	for PYTHON in $(PYVERS); do \
-		echo "--- Compiling for $$PYTHON"; \
-		$$PYTHON setup.py build; \
-		echo "--- Compiling for $$PYTHON-dbg"; \
-		$$PYTHON-dbg setup.py build; \
-	done
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	@echo "--- Cleaning"
-	rm -f build-stamp install-stamp
-	rm -rf build
+	python$* setup.py clean
 	find . -name "*.py[co]" -exec rm -f {} \;
+	dh_testroot
+	rm -fr build build-python$*
 	dh_clean
 
-install: install-stamp
-install-stamp: build-stamp
+build: $(PYVERS:%=build-python%)
+	touch $@
+build-python%:
+	python$*     setup.py build
+	python$*-dbg setup.py build
+	touch $@
+
+install: build $(PYVERS:%=install-python%)
+install-python%:
 	dh_testdir
 	dh_testroot
+	dh_installdirs
+	python$*     setup.py install --install-layout=deb --root $(CURDIR)/debian/python-mysqldb
+	python$*-dbg setup.py install --install-layout=deb --root $(CURDIR)/debian/python-mysqldb-dbg
 
-	set -e; \
-	for PYTHON in $(PYVERS); do \
-		echo "--- Installing for $$PYTHON"; \
-		$$PYTHON setup.py install --root `pwd`/debian/python-mysqldb $(py_setup_install_args); \
-		echo "--- Installing for $$PYTHON-dbg"; \
-		$$PYTHON-dbg setup.py install --root `pwd`/debian/python-mysqldb-dbg $(py_setup_install_args); \
-	done
-	
-	@echo "  -- Cleaning build from *.py[co] files"
-	-find debian -name '*.py[co]' | xargs -n 50 rm -f
-	
-	find debian/python-mysqldb-dbg ! -type d ! -name '*_d.so' | xargs rm -f
-	find debian/python-mysqldb-dbg -depth -empty -exec rmdir {} \;
-	touch install-stamp
-
-
 # Build architecture-independent files here.
 binary-indep: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install
+	dh_testdir
+	dh_testroot
 	dh_installdocs
 	rm -rf debian/python-mysqldb-dbg/usr/share/doc/python-mysqldb-dbg 
 	ln -s python-mysqldb debian/python-mysqldb-dbg/usr/share/doc/python-mysqldb-dbg 
+	dh_link
 	dh_strip -ppython-mysqldb --dbg-package=python-mysqldb-dbg
 	dh_compress
 	dh_fixperms
 	dh_python2
+	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-
 	
 binary: binary-indep binary-arch
-.PHONY: build clean install binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary install