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

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

    Date: Monday, May 25, 2009 @ 22:24:04
  Author: speijnik-guest
Revision: 8573

Not using hardcoded python2.5 in debian/rules anymore, added code for py_libdir in debian/rules.

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

Modified: packages/foolscap/trunk/debian/changelog
===================================================================
--- packages/foolscap/trunk/debian/changelog	2009-05-25 21:51:58 UTC (rev 8572)
+++ packages/foolscap/trunk/debian/changelog	2009-05-25 22:24:04 UTC (rev 8573)
@@ -5,8 +5,11 @@
   * Bumped Standards-Version to 3.8.1, no changes needed
   * Documentation should not end up in /usr/share/python-foolscap anymore, but
     /usr/share/python-foolscap/doc now.
+  * Added dependency on python-all (>= 2.5.4-1~).
+  * Using py_libdir in debian/rules now.
+  * Not using hardcoded python2.5 in debian/rules anymore.
 
- -- Stephan Peijnik <debian at sp.or.at>  Mon, 25 May 2009 23:51:31 +0200
+ -- Stephan Peijnik <debian at sp.or.at>  Tue, 26 May 2009 00:23:26 +0200
 
 foolscap (0.3.2.dfsg-2) unstable; urgency=low
 

Modified: packages/foolscap/trunk/debian/control
===================================================================
--- packages/foolscap/trunk/debian/control	2009-05-25 21:51:58 UTC (rev 8572)
+++ packages/foolscap/trunk/debian/control	2009-05-25 22:24:04 UTC (rev 8573)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stephan Peijnik <debian at sp.or.at>
 Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: python-support (>= 0.6.4), python-openssl, python-twisted-core, python-twisted-web, python-setuptools
+Build-Depends-Indep: python-all (>= 2.5.4-1~), python-support (>= 0.6.4), python-openssl, python-twisted-core, python-twisted-web, python-setuptools
 XS-Python-Version: all
 Standards-Version: 3.8.1
 Homepage: http://foolscap.lothar.com/

Modified: packages/foolscap/trunk/debian/rules
===================================================================
--- packages/foolscap/trunk/debian/rules	2009-05-25 21:51:58 UTC (rev 8572)
+++ packages/foolscap/trunk/debian/rules	2009-05-25 22:24:04 UTC (rev 8573)
@@ -5,7 +5,17 @@
 #export DH_VERBOSE=1
 
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | sed -rne 's,(.*)\+dfsg,\1,p')
+PYVERS=$(shell pyversions -vr)
 
+# 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
+
 get-orig-source:
 	uscan --force-download --destdir=. --rename \
 		--download-version=$(DEB_UPSTREAM_VERSION)
@@ -22,34 +32,36 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -rf build
-	find . -name *\.py[co] -exec rm {} \;
-	dh_clean
+	rm -rf $(CURDIR)/build
+	find $(CURDIR) -name '*\.py[co]' -delete
+	dh_clean $(PYVERS:%=install-python%)
 
 build:
-	python setup.py build
 
-install:
-	python setup.py install --root $(CURDIR)/debian/python-foolscap \
-		--install-layout=deb
+install: build $(PYVERS:%=install-python%)
+
+install-python%:
+	python$* setup.py install --root $(CURDIR)/debian/python-foolscap \
+		--single-version-externally-managed $(py_setup_install_args)
 	# No need to include the unit tests in the deb file.
 	rm -rf $(CURDIR)/debian/python-foolscap/usr/lib/python2.5/site-packages/foolscap/test
+	touch $@
 
 # Build architecture-independent files here.
 binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_install
-	dh_installchangelogs NEWS
-	dh_installdocs README
-	dh_installman
-	dh_pysupport
-	dh_compress -X.py -X.xhtml -X.txt
-	dh_fixperms 
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_testdir -i
+	dh_testroot -i
+	dh_install -i
+	dh_installchangelogs -i NEWS
+	dh_installdocs -i README
+	dh_installman -i
+	dh_pysupport -i
+	dh_compress -i -X.py -X.xhtml -X.txt
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 binary-arch:
 # We have nothing to do by default.