r1840 - in python-tz/trunk/debian (changelog control rules)

[jinty-guest at users.alioth.debian.org]

    Date: Tuesday, October 13, 2009 @ 06:39:56
  Author: jinty-guest
Revision: 1840

Apply modified patch from Kumar Appaiah to use Use
/usr/share/python/python.mk to allow building on python2.6.
(Closes: #547857)

Modified:
  python-tz/trunk/debian/changelog
  python-tz/trunk/debian/control
  python-tz/trunk/debian/rules

Modified: python-tz/trunk/debian/changelog
===================================================================
--- python-tz/trunk/debian/changelog	2009-10-12 06:51:28 UTC (rev 1839)
+++ python-tz/trunk/debian/changelog	2009-10-13 06:39:56 UTC (rev 1840)
@@ -1,3 +1,11 @@
+python-tz (2009n-2) unstable; urgency=low
+
+  * Apply modified patch from Kumar Appaiah to use Use
+    /usr/share/python/python.mk to allow building on python2.6.
+    (Closes: #547857)
+
+ -- Brian Sutherland <brian at vanguardistas.net>  Tue, 13 Oct 2009 08:37:46 +0200
+
 python-tz (2009n-1) unstable; urgency=low
 
   * New upstream release.

Modified: python-tz/trunk/debian/control
===================================================================
--- python-tz/trunk/debian/control	2009-10-12 06:51:28 UTC (rev 1839)
+++ python-tz/trunk/debian/control	2009-10-13 06:39:56 UTC (rev 1840)
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
-Uploaders: Brian Sutherland <jinty at web.de>, Fabio Tranchitella <kobold at debian.org>
+Uploaders: Brian Sutherland <brian at vanguardistas.net>, Fabio Tranchitella <kobold at debian.org>
 Build-Depends: debhelper (>= 5.0.38)
 Build-Depends-Indep: python-all-dev (>= 2.3.5-9), python-central (>= 0.5)
 Build-Conflicts: python-setuptools

Modified: python-tz/trunk/debian/rules
===================================================================
--- python-tz/trunk/debian/rules	2009-10-12 06:51:28 UTC (rev 1839)
+++ python-tz/trunk/debian/rules	2009-10-13 06:39:56 UTC (rev 1840)
@@ -9,6 +9,12 @@
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
 		             | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
 
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+  py_sitename = site-packages
+  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+endif
+
 build: $(PYVERS:%=build-python%)
 	touch $@
 build-python%:
@@ -40,9 +46,9 @@
 	install -D debian/test-pytz debian/$(PACKAGE)/usr/lib/python-tz/test-pytz.py
 
 install-python%:
-	PYTHONPATH=$(CURDIR) python$* setup.py install --no-compile --root=debian/$(PACKAGE)
+	PYTHONPATH=$(CURDIR) python$* setup.py install --no-compile --root=debian/$(PACKAGE) $(py_setup_install_args)
 	# remove zoneinfo, our patch to pytz makes it use the one from tzdata
-	rm -rf debian/$(PACKAGE)/usr/lib/python$*/site-packages/pytz/zoneinfo
+	rm -rf debian/$(PACKAGE)$(call py_libdir,$*)/pytz/zoneinfo
 
 .PHONY: binary-common
 binary-common: