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

[bzed at users.alioth.debian.org]

    Date: Thursday, August 27, 2009 @ 10:43:29
  Author: bzed
Revision: 9524

* Removing myself from uploaders.
* Use py_setup_install_args from /usr/share/python/python.mk 

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	2009-08-27 08:47:29 UTC (rev 9523)
+++ packages/python-mysqldb/trunk/debian/changelog	2009-08-27 10:43:29 UTC (rev 9524)
@@ -1,10 +1,15 @@
 python-mysqldb (1.2.2-10) unstable; urgency=low
 
+  [ Jonas Meurer ]
   * NOT RELEASED YET
   * add --install-layout=deb to python setup.py invokations in debian/rules
 
- -- Jonas Meurer <mejo at debian.org>  Wed, 26 Aug 2009 14:52:34 +0200
+  [ Bernd Zeimetz ]
+  * Removing myself from uploaders.
+  * Use py_setup_install_args from /usr/share/python/python.mk 
 
+ -- Bernd Zeimetz <bzed at debian.org>  Thu, 27 Aug 2009 12:43:11 +0200
+
 python-mysqldb (1.2.2-9) unstable; urgency=low
 
   * Add 02_python_2.6.dpatch to fix python 2.6 related warnings. Thanks to

Modified: packages/python-mysqldb/trunk/debian/control
===================================================================
--- packages/python-mysqldb/trunk/debian/control	2009-08-27 08:47:29 UTC (rev 9523)
+++ packages/python-mysqldb/trunk/debian/control	2009-08-27 10:43:29 UTC (rev 9524)
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Jonas Meurer <mejo at debian.org>, Bernd Zeimetz <bzed at debian.org>, Monty Taylor <monty at inaugust.com>
+Uploaders: Jonas Meurer <mejo at debian.org>, Monty Taylor <monty at inaugust.com>
 Build-Depends: debhelper (>= 6.0.0), dpatch, python-all-dev (>= 2.4.4-3), python-all-dbg, libmysqlclient-dev, zlib1g-dev, python-support (>= 0.6), python-setuptools
 XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-mysqldb/trunk/

Modified: packages/python-mysqldb/trunk/debian/rules
===================================================================
--- packages/python-mysqldb/trunk/debian/rules	2009-08-27 08:47:29 UTC (rev 9523)
+++ packages/python-mysqldb/trunk/debian/rules	2009-08-27 10:43:29 UTC (rev 9524)
@@ -4,6 +4,15 @@
 # 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
+
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
@@ -45,9 +54,9 @@
 	set -e; \
 	for PYTHON in $(PYVERS); do \
 		echo "--- Installing for $$PYTHON"; \
-		$$PYTHON setup.py install --root `pwd`/debian/python-mysqldb --install-layout=deb; \
+		$$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 --install-layout=deb; \
+		$$PYTHON-dbg setup.py install --root `pwd`/debian/python-mysqldb-dbg $(py_setup_install_args); \
 	done
 	
 	@echo "  -- Cleaning build from *.py[co] files"