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

[piotr at users.alioth.debian.org]

    Date: Sunday, April 12, 2009 @ 00:13:09
  Author: piotr
Revision: 8226

* Prepare for Python 2.6:
  + use py_libdir in debian/rules (LP: #359482)
* python and python-all-dev build dependencies replaced with python-all
* Standards-Version bumped to 3.8.1 (no changes needed)

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

Modified: packages/pastescript/trunk/debian/changelog
===================================================================
--- packages/pastescript/trunk/debian/changelog	2009-04-11 23:51:37 UTC (rev 8225)
+++ packages/pastescript/trunk/debian/changelog	2009-04-12 00:13:09 UTC (rev 8226)
@@ -1,3 +1,12 @@
+pastescript (1.7.3-3) unstable; urgency=low
+
+  * Prepare for Python 2.6:
+    + use py_libdir in debian/rules (LP: #359482)
+  * python and python-all-dev build dependencies replaced with python-all
+  * Standards-Version bumped to 3.8.1 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 12 Apr 2009 01:23:26 +0200
+
 pastescript (1.7.3-2) unstable; urgency=low
 
   * Change Debian packaging license to MIT (to match upstream)

Modified: packages/pastescript/trunk/debian/control
===================================================================
--- packages/pastescript/trunk/debian/control	2009-04-11 23:51:37 UTC (rev 8225)
+++ packages/pastescript/trunk/debian/control	2009-04-12 00:13:09 UTC (rev 8226)
@@ -4,9 +4,9 @@
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: python (>= 2.3.5-11), python-all-dev, python-support (>= 0.6.4),
+Build-Depends-Indep: python-all (>= 2.3.5-11), python-support (>= 0.6.4),
  python-setuptools (>= 0.6b3-1~), python-sphinx, python-paste, python-pastedeploy
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://pythonpaste.org/script/
 XS-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pastescript/trunk/

Modified: packages/pastescript/trunk/debian/rules
===================================================================
--- packages/pastescript/trunk/debian/rules	2009-04-11 23:51:37 UTC (rev 8225)
+++ packages/pastescript/trunk/debian/rules	2009-04-12 00:13:09 UTC (rev 8226)
@@ -6,8 +6,18 @@
 PYVERS=$(shell pyversions -vr)
 PKGDIR=$(CURDIR)/debian/python-pastescript
 
-include /usr/share/dpatch/dpatch.make 
+include /usr/share/dpatch/dpatch.make
 
+# if $py_setup_install_args will contain "--install-layout=deb" dist-packages
+# will be used instead of site-packages for Python >= 2.6;
+# --install-layout=deb and python.mk are available since python >= 2.5.4-1~,
+# here's backwards compatible code:
+-include /usr/share/python/python.mk
+ifeq (,$(py_libdir))
+    py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+endif
+
+
 clean: unpatch
 	dh_testdir
 	dh_testroot
@@ -41,13 +51,12 @@
 	touch $@
 
 install-python%: patch
-	python$* setup.py install \
-		--single-version-externally-managed \
-		--root $(PKGDIR)
+	python$* setup.py install --root $(PKGDIR) \
+		--single-version-externally-managed $(py_setup_install_args)
 	# pth file is not needed since all paste* packages are installed in the same directory
-	rm -f $(PKGDIR)/usr/lib/python$*/site-packages/PasteScript-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
+	rm -f $(PKGDIR)/$(call py_libdir,$*)/PasteScript-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
 	# python-support's namespace feature will handle this
-	rm -f $(PKGDIR)/usr/lib/python$*/site-packages/paste/__init__.py
+	rm -f $(PKGDIR)$(call py_libdir,$*)/paste/__init__.py
 	# create /usr/bin/pasterX.Y symlink
 	install -m 755 $(CURDIR)/scripts/paster $(PKGDIR)/usr/bin/paster$*
 	sed -i -e '1s,usr/bin/.*,usr/bin/python$*,' $(PKGDIR)/usr/bin/paster$*
@@ -60,7 +69,7 @@
 	dh_testroot -i
 	dh_installchangelogs -i docs/news.txt
 	dh_installdocs -i
-	dh_installman -i 
+	dh_installman -i
 	dh_install scripts/paster /usr/bin/
 	dh_pysupport -i -X/usr/bin/paster
 	dh_compress -i -X.py -X.js