[Python-modules-commits] r16725 - in packages/pubtal/trunk/debian (control rules)

[rodrigo at users.alioth.debian.org]

    Date: Saturday, April 23, 2011 @ 17:01:08
  Author: rodrigo
Revision: 16725

Migrate packaging to use dh_python2 (Closes: #616953).

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

Modified: packages/pubtal/trunk/debian/control
===================================================================
--- packages/pubtal/trunk/debian/control	2011-04-23 15:32:01 UTC (rev 16724)
+++ packages/pubtal/trunk/debian/control	2011-04-23 17:01:08 UTC (rev 16725)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Luis Rodrigo Gallardo Cruz <rodrigo at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python
-Build-Depends-Indep: python-central (>=0.5), docbook-to-man
-XS-Python-Version: >=2.3
+Build-Depends: debhelper (>= 5.0.37.2), python (>= 2.6.6-3~)
+Build-Depends-Indep: docbook-to-man
+X-Python-Version: >=2.5
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pubtal/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pubtal/trunk/
@@ -13,7 +13,6 @@
 
 Package: pubtal
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends}, python-simpletal (>=4.1-6)
 Suggests: python-textile (>=1:2.1.4)
 Description: Template driven web site builder for small sites

Modified: packages/pubtal/trunk/debian/rules
===================================================================
--- packages/pubtal/trunk/debian/rules	2011-04-23 15:32:01 UTC (rev 16724)
+++ packages/pubtal/trunk/debian/rules	2011-04-23 17:01:08 UTC (rev 16725)
@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
--include /usr/share/python/python.mk
+include /usr/share/python/python.mk
 
 configure: configure-stamp
 configure-stamp:
@@ -43,11 +43,16 @@
 	dh_clean -k 
 	dh_installdirs
 
-	python setup.py install --no-compile --root=$(CURDIR)/debian/pubtal $(py_setup_install_args)
-	find $(CURDIR)/debian/pubtal/usr/lib -type d -name plugins | xargs cp -r optional-plugins/* 
-	mv $(CURDIR)/debian/pubtal/usr/bin/updateSite.py $(CURDIR)/debian/pubtal/usr/bin/updateSite
-	mv $(CURDIR)/debian/pubtal/usr/bin/uploadSite.py $(CURDIR)/debian/pubtal/usr/bin/uploadSite
-# Fix wrong execute permissions
+	python setup.py install --no-compile --root=$(CURDIR)/debian/pubtal \
+	  $(py_setup_install_args)
+	find $(CURDIR)/debian/pubtal/usr/lib -type d -name plugins \
+	  | xargs cp -r optional-plugins/*
+	mv $(CURDIR)/debian/pubtal/usr/bin/updateSite.py \
+	  $(CURDIR)/debian/pubtal/usr/bin/updateSite
+	mv $(CURDIR)/debian/pubtal/usr/bin/uploadSite.py \
+	  $(CURDIR)/debian/pubtal/usr/bin/uploadSite
+
+	# Fix wrong execute permissions
 	find $(CURDIR)/debian/pubtal/usr/lib/ -name \*.py -exec chmod a-x {} \;
 
 # Build architecture-independent files here.
@@ -60,7 +65,7 @@
 	dh_link
 	dh_compress
 	dh_fixperms
-	dh_pycentral
+	dh_python2
 # Delete empty dirs
 	find $(CURDIR)/debian/pubtal -depth -type d -empty -exec rmdir -- {} \;
 	dh_installdeb