[Python-modules-commits] r19885 - in packages/cherrypy3/trunk/debian (5 files)

[kov at users.alioth.debian.org]

    Date: Friday, January 6, 2012 @ 12:19:33
  Author: kov
Revision: 19885

Port to dh_python2 and generate manpage during build

The dh_python2 work comes from St?\195?\169phane Graber <stgraber at ubuntu.com>.

Modified:
  packages/cherrypy3/trunk/debian/changelog
  packages/cherrypy3/trunk/debian/control
  packages/cherrypy3/trunk/debian/manpages
  packages/cherrypy3/trunk/debian/rules
Deleted:
  packages/cherrypy3/trunk/debian/pyversions

Modified: packages/cherrypy3/trunk/debian/changelog
===================================================================
--- packages/cherrypy3/trunk/debian/changelog	2012-01-06 02:43:51 UTC (rev 19884)
+++ packages/cherrypy3/trunk/debian/changelog	2012-01-06 12:19:33 UTC (rev 19885)
@@ -13,8 +13,25 @@
     + Don't hit on the -py3 release by blocking '-' from the version.
     + Mangle upstream version, inserting a tilde for beta/rc.
 
- -- Gustavo Noronha Silva <kov at debian.org>  Fri, 06 Jan 2012 00:41:46 -0200
+  [ Stéphane Graber <stgraber at ubuntu.com> ]
+   * Convert from python-support to dh_python2 (#654375)
+    - debian/pyversions: Removed (no longer needed)
+    - debian/rules
+     + Replace call to dh_pysupport by dh_python2
+     + Add --with=python2 to all dh calls
+    - debian/control
+     + Drop build-depends on python-support
+     + Bump build-depends on python-all to >= 2.6.6-3~
+     + Replace XS-Python-Version by X-Python-Version
+     + Remove XB-Python-Version from binary package
 
+  [ Gustavo Noronha ]
+  * debian/control, debian/rules, debian/manpages:
+   - use help2man to generate a manpage for cherryd at build time, since
+    one is no longer shipped along with the source code
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Fri, 06 Jan 2012 10:13:27 -0200
+
 cherrypy3 (3.1.2-1) unstable; urgency=low
 
   * New upstream release (Closes: #528473)

Modified: packages/cherrypy3/trunk/debian/control
===================================================================
--- packages/cherrypy3/trunk/debian/control	2012-01-06 02:43:51 UTC (rev 19884)
+++ packages/cherrypy3/trunk/debian/control	2012-01-06 12:19:33 UTC (rev 19885)
@@ -3,17 +3,16 @@
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.0), quilt, python-setuptools (>= 0.6a9), python-all (>= 2.3.5-11), python-support (>= 0.6.4)
+Build-Depends: debhelper (>= 7.0.0), quilt, python-setuptools (>= 0.6a9), python-all (>= 2.6.6-3~), help2man
 Build-Depends-Indep: python-epydoc
 Standards-Version: 3.8.4
 Homepage: http://www.cherrypy.org/
-XS-Python-Version: >= 2.3
+X-Python-Version: >= 2.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/cherrypy3/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/cherrypy3/trunk/
 
 Package: python-cherrypy3
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Conflicts: python2.3-cherrypy, python2.4-cherrypy, python-cherrypy

Modified: packages/cherrypy3/trunk/debian/manpages
===================================================================
--- packages/cherrypy3/trunk/debian/manpages	2012-01-06 02:43:51 UTC (rev 19884)
+++ packages/cherrypy3/trunk/debian/manpages	2012-01-06 12:19:33 UTC (rev 19885)
@@ -1 +1 @@
-docs/cherryd.1
+debian/cherryd.1

Deleted: packages/cherrypy3/trunk/debian/pyversions
===================================================================
--- packages/cherrypy3/trunk/debian/pyversions	2012-01-06 02:43:51 UTC (rev 19884)
+++ packages/cherrypy3/trunk/debian/pyversions	2012-01-06 12:19:33 UTC (rev 19885)
@@ -1 +0,0 @@
-2.3-
\ No newline at end of file

Modified: packages/cherrypy3/trunk/debian/rules
===================================================================
--- packages/cherrypy3/trunk/debian/rules	2012-01-06 02:43:51 UTC (rev 19884)
+++ packages/cherrypy3/trunk/debian/rules	2012-01-06 12:19:33 UTC (rev 19885)
@@ -3,19 +3,22 @@
 include /usr/share/quilt/quilt.make
 
 PY_DEFAULT = $(strip $(shell pyversions -d))
+UPSTREAM_VERSION=$(shell dpkg-parsechangelog --format dpkg | grep ^Version | cut -d ' ' -f 2 | cut -d '-' -f 1)
 
 clean: unpatch
-	dh clean
+	dh clean --with=python2
 	-rm -rf api
 	-rm -rf CherryPy.egg-info/
+	-rm -f debian/cherryd.1
 
 build: $(QUILT_STAMPFN)
+	help2man -n cherryd -s 1 -o debian/cherryd.1 --version-string=$(UPSTREAM_VERSION)  ./cherrypy/cherryd
 	env PYTHONPATH=`pwd` epydoc --name CherryPy3 --url http://www.cherrypy.org/ -o api cherrypy
-	dh build
+	dh build --with=python2
 
 
 install: build
-	dh install --before dh_pysupport
+	dh install --with=python2 --before dh_python2
 
 	# the 'daemonization' helper should be made available properly
 	mv debian/python-cherrypy3/usr/lib/$(PY_DEFAULT)/*/cherrypy/cherryd \
@@ -26,13 +29,13 @@
 	# no additional licensing files wanted =)
 	find debian/python-cherrypy3/ -name LICENSE.txt -exec rm {} \;
 
-	dh install --remaining
+	dh install --remaining --with=python2
 
 
 binary-indep: build install
-	dh binary-indep --before dh_compress
-	dh_compress -X.py -X.pdf
-	dh binary-indep --remaining
+	dh binary-indep --before dh_compress --with=python2
+	dh_compress -X.py -X.pdf --with=python2
+	dh binary-indep --remaining --with=python2
 
 
 binary-arch: build install