[Python-apps-commits] r4059 - in packages/pytagsfs/trunk/debian (control rules)

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

    Date: Friday, October 30, 2009 @ 10:10:59
  Author: rrs-guest
Revision: 4059

Merge branch 'master' into local-svn/trunk

Conflicts:
	debian/control
	debian/rules

Modified:
  packages/pytagsfs/trunk/debian/control
  packages/pytagsfs/trunk/debian/rules

Modified: packages/pytagsfs/trunk/debian/control
===================================================================
--- packages/pytagsfs/trunk/debian/control	2009-10-29 22:54:29 UTC (rev 4058)
+++ packages/pytagsfs/trunk/debian/control	2009-10-30 10:10:59 UTC (rev 4059)
@@ -4,7 +4,7 @@
 Maintainer: Ritesh Raj Sarraf <rrs at researchut.com>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.38), quilt
-Build-Depends-Indep: python-central (>= 0.5.6), python-sclapp (>= 0.5.2), xsltproc, docbook-xsl, python-libxml2, python-fuse (>= 0.2)
+Build-Depends-Indep: python-support, python-sclapp (>= 0.5.2), xsltproc, docbook-xsl, python-libxml2, python-fuse (>= 0.2)
 Standards-Version: 3.8.3
 XS-Python-Version: all
 Homepage: http://www.pytagsfs.org/

Modified: packages/pytagsfs/trunk/debian/rules
===================================================================
--- packages/pytagsfs/trunk/debian/rules	2009-10-29 22:54:29 UTC (rev 4058)
+++ packages/pytagsfs/trunk/debian/rules	2009-10-30 10:10:59 UTC (rev 4059)
@@ -5,6 +5,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+PYVERS=$(shell pyversions -vr)
+
 PKG_NAME=pytagsfs
 PKG_VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
@@ -13,9 +15,12 @@
 
 
 build: patch build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build-stamp: $(QUILT_STAMPFN) $(PYVERS:%=build-python%)
+	touch $@
+
+build-python%:
 	dh_testdir
-	python setup.py build
+	python$* setup.py build
 	touch $@
 
 clean: unpatch
@@ -27,12 +32,15 @@
 	rm -f modules/pytagsfs/version.py
 	dh_clean 
 
-install: build
+install: $(PYVERS:%=install-python%)
+	touch $@
+	
+install-python%: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	python setup.py install --root=$(CURDIR)/debian/pytagsfs
+	python$* setup.py install --root=$(CURDIR)/debian/pytagsfs
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -40,7 +48,7 @@
 	dh_testroot
 	dh_installchangelogs NEWS
 	dh_installdocs
-	dh_pycentral
+	dh_pysupport
 	dh_compress -X.py
 	dh_fixperms
 	dh_installdeb