[Python-apps-commits] r2642 - in packages/sonata/trunk/debian (5 files)

[nijel at users.alioth.debian.org]

    Date: Wednesday, March 18, 2009 @ 15:21:33
  Author: nijel
Revision: 2642

Use dh to simplify debian/rules.

Modified:
  packages/sonata/trunk/debian/changelog
  packages/sonata/trunk/debian/compat
  packages/sonata/trunk/debian/control
  packages/sonata/trunk/debian/rules
  packages/sonata/trunk/debian/sonata.install

Modified: packages/sonata/trunk/debian/changelog
===================================================================
--- packages/sonata/trunk/debian/changelog	2009-03-18 15:13:51 UTC (rev 2641)
+++ packages/sonata/trunk/debian/changelog	2009-03-18 15:21:33 UTC (rev 2642)
@@ -10,8 +10,9 @@
   * Switch from pycentral to pysupport.
   * Bump standards to 3.8.1 (no changes needed).
   * Update debian/copyright (years, link to GPL-3).
+  * Use dh to simplify debian/rules.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 18 Mar 2009 16:12:49 +0100
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 18 Mar 2009 16:21:11 +0100
 
 sonata (1.5.3-1) unstable; urgency=low
 

Modified: packages/sonata/trunk/debian/compat
===================================================================
--- packages/sonata/trunk/debian/compat	2009-03-18 15:13:51 UTC (rev 2641)
+++ packages/sonata/trunk/debian/compat	2009-03-18 15:21:33 UTC (rev 2642)
@@ -1 +1 @@
-5
+7

Modified: packages/sonata/trunk/debian/control
===================================================================
--- packages/sonata/trunk/debian/control	2009-03-18 15:13:51 UTC (rev 2641)
+++ packages/sonata/trunk/debian/control	2009-03-18 15:21:33 UTC (rev 2642)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Michal ÄŒihaÅ™ <nijel at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), 
+Build-Depends: debhelper (>= 7.0.50),
     python-support (>= 0.5.3),
     python-all-dev (>= 2.3.5-11), 
     pkg-config, 

Modified: packages/sonata/trunk/debian/rules
===================================================================
--- packages/sonata/trunk/debian/rules	2009-03-18 15:13:51 UTC (rev 2641)
+++ packages/sonata/trunk/debian/rules	2009-03-18 15:21:33 UTC (rev 2642)
@@ -20,77 +20,44 @@
 	CFLAGS += -O2
 endif
 
-PYVERSIONS=$(shell pyversions -r)
+PYVERSIONS=$(shell pyversions -v -r)
+PYDEF=$(shell pyversions -v -d)
 
+$(subst $(PYDEF),python,$*)
+
+override_dh_auto_build-%:
+	python$(subst $(PYDEF),,$*) setup.py build
+
+override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build-%)
+
+override_dh_auto_install-%:
+	python$(subst $(PYDEF),,$*) setup.py install \
+		 --no-compile --root=$(CURDIR)/debian/tmp $(py_setup_install_args)
+
+override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install-%)
+
 build: build-stamp
 
 build-stamp:
-	dh_testdir
+	dh build
 	chmod -x sonata/pixmaps/*
-	set -e; \
-	for python in $(PYVERSIONS) ; do \
-		PKG_CONFIG_PATH=${PKGCONFIGPATH}:/usr/lib/pkgconfig/$$python \
-					$$python setup.py build ; \
-	done
 	touch $@
 
 clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	rm -rf build 
-	find . -name '*.pyc' -print0 | xargs -0 -r rm -f
-	dh_clean 
+	dh $@
 
 install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	set -e; \
-	for python in $(PYVERSIONS) ; do \
-		$$python setup.py install --no-compile --root=$(CURDIR)/debian/tmp $(py_setup_install_args) ; \
-	done
-	# Need to install default version as last to have proper #! line in main script
-	python setup.py install --no-compile --root=$(CURDIR)/debian/tmp $(py_setup_install_args)
+	dh $@
 	# We install docs other way
-	rm -rf $(CURDIR)/debian/tmp/usr/share/sonata
-	install -m644 debian/sonata.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps
+	rm -rf $(CURDIR)/debian/sonata/usr/share/sonata
 
 # Build architecture-independent files here.
 binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i CHANGELOG
-	dh_installdocs -i
-	dh_install -i --sourcedir=debian/tmp
-	dh_installmenu -i
-	dh_pysupport -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+	dh $@
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a CHANGELOG
-	dh_installdocs -a
-	dh_install -a --sourcedir=debian/tmp
-	dh_pysupport -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh $@
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

Modified: packages/sonata/trunk/debian/sonata.install
===================================================================
--- packages/sonata/trunk/debian/sonata.install	2009-03-18 15:13:51 UTC (rev 2641)
+++ packages/sonata/trunk/debian/sonata.install	2009-03-18 15:21:33 UTC (rev 2642)
@@ -2,3 +2,4 @@
 usr/share
 usr/lib/python*/*-packages/Sonata*
 usr/lib/python*/*-packages/sonata
+debian/sonata.xpm usr/share/pixmaps