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

[piotr at users.alioth.debian.org]

    Date: Saturday, May 28, 2011 @ 16:28:49
  Author: piotr
Revision: 17210

* Convert to dh_python2
* Source format changed to 3.0 (quilt)
* Standards-Version bumped to 3.9.2 (no changes needed)

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

Modified: packages/pastewebkit/trunk/debian/changelog
===================================================================
--- packages/pastewebkit/trunk/debian/changelog	2011-05-28 15:40:25 UTC (rev 17209)
+++ packages/pastewebkit/trunk/debian/changelog	2011-05-28 16:28:49 UTC (rev 17210)
@@ -1,3 +1,11 @@
+pastewebkit (1.0-6) unstable; urgency=low
+
+  * Convert to dh_python2
+  * Source format changed to 3.0 (quilt)
+  * Standards-Version bumped to 3.9.2 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sat, 28 May 2011 18:12:19 +0200
+
 pastewebkit (1.0-5) unstable; urgency=low
 
   * Move paster's templates to /usr/share/paster_templates/

Modified: packages/pastewebkit/trunk/debian/control
===================================================================
--- packages/pastewebkit/trunk/debian/control	2011-05-28 15:40:25 UTC (rev 17209)
+++ packages/pastewebkit/trunk/debian/control	2011-05-28 16:28:49 UTC (rev 17210)
@@ -4,17 +4,17 @@
 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)
-Build-Depends-Indep: python (>= 2.3.5-11), python-all, python-support (>= 0.6.4),
+Build-Depends-Indep: python-all (>= 2.6.6-3),
  python-setuptools (>= 0.6b3-1~), python-docutils
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://pythonpaste.org/webkit/
-XS-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pastewebkit/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pastewebkit/trunk/
+X-Python-Version: >= 2.4
 
 Package: python-pastewebkit
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-paste (>= 1.7-1~), python-pastedeploy, python-pastescript,
+Depends: ${python:Depends}, ${misc:Depends}, python-paste, python-pastedeploy, python-pastescript,
  python-pkg-resources
 Description: port/reimplementation of Webware WebKit in WSGI and Paste
  This is a reimplementation of the Webware WebKit servlet API. This

Modified: packages/pastewebkit/trunk/debian/rules
===================================================================
--- packages/pastewebkit/trunk/debian/rules	2011-05-28 15:40:25 UTC (rev 17209)
+++ packages/pastewebkit/trunk/debian/rules	2011-05-28 16:28:49 UTC (rev 17210)
@@ -4,6 +4,8 @@
 
 PYVERS=$(shell pyversions -vr)
 DOCS=$(shell cd docs && find ./ -name "*.txt" -printf "%p " | sed "s/.txt//g")
+PKGDIR=$(CURDIR)/debian/python-pastewebkit
+include /usr/share/python/python.mk
 
 clean:
 	dh_testdir
@@ -26,16 +28,13 @@
 	dh_install
 
 install-python%:
-	python$* setup.py install --prefix=/usr \
-		--single-version-externally-managed \
-		--root $(CURDIR)/debian/python-pastewebkit \
-		--install-lib=/usr/lib/python$*/site-packages
-	# pth file is not needed since all paste* packages are installed in the same directory
-	rm -f debian/python-pastewebkit/usr/lib/python$*/site-packages/*.pth
+	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 same directory
+	find $(PKGDIR) -name '*.pth' -or -name 'namespace_packages.txt' -delete
 	# installed to /usr/share/paster_templates/ via dh_install
 	rm -rf debian/python-pastewebkit/usr/lib/python$*/site-packages/paste/webkit/paster_templates/
-	# provided by paste-common package:
-	rm -f debian/python-pastewebkit/usr/lib/python$*/site-packages/paste/__init__.py
+	rm -rf $(PKGDIR)$(call py_libdir,$*)/paste/webkit/paster_templates
 
 binary-indep: build install
 	dh_testdir -i
@@ -43,7 +42,7 @@
 	dh_installchangelogs -i
 	dh_installdocs -i
 	dh_link usr/share/doc/python-pastewebkit/docs /usr/share/doc/python-paste/docs/webkit
-	dh_pysupport -i
+	dh_python2 -i
 	dh_compress -i -X.py
 	dh_fixperms -i
 	dh_installdeb -i