[Python-modules-commits] r861 - in /packages/python-cherrypy/trunk/debian: changelog compat control python-cherrypy.postinst python-cherrypy.prerm rules

[kov at users.alioth.debian.org]

Author: kov
Date: Thu Jun 15 23:07:41 2006
New Revision: 861

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=861
Log:
supporting the new python policy

Removed:
    packages/python-cherrypy/trunk/debian/python-cherrypy.postinst
    packages/python-cherrypy/trunk/debian/python-cherrypy.prerm
Modified:
    packages/python-cherrypy/trunk/debian/changelog
    packages/python-cherrypy/trunk/debian/compat
    packages/python-cherrypy/trunk/debian/control
    packages/python-cherrypy/trunk/debian/rules

Modified: packages/python-cherrypy/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-cherrypy/trunk/debian/changelog?rev=861&op=diff
==============================================================================
--- packages/python-cherrypy/trunk/debian/changelog (original)
+++ packages/python-cherrypy/trunk/debian/changelog Thu Jun 15 23:07:41 2006
@@ -1,6 +1,11 @@
 python-cherrypy (2.2.1-3) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * debian/rules, debian/control:
+  - updated to follow the new Python Policy, build-depending on the
+    newest versions of cdbs, python-support and debhelper
+    (Closes: #373517)
+  * debian/python-cherrypy.{postinst,prerm}:
+  - removed; generated by python-support
 
  -- Gustavo Noronha Silva <kov at debian.org>  Sun,  4 Jun 2006 23:50:37 -0300
 

Modified: packages/python-cherrypy/trunk/debian/compat
URL: http://svn.debian.org/wsvn/python-modules/packages/python-cherrypy/trunk/debian/compat?rev=861&op=diff
==============================================================================
--- packages/python-cherrypy/trunk/debian/compat (original)
+++ packages/python-cherrypy/trunk/debian/compat Thu Jun 15 23:07:41 2006
@@ -1,1 +1,1 @@
-4
+5

Modified: packages/python-cherrypy/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-cherrypy/trunk/debian/control?rev=861&op=diff
==============================================================================
--- packages/python-cherrypy/trunk/debian/control (original)
+++ packages/python-cherrypy/trunk/debian/control Thu Jun 15 23:07:41 2006
@@ -3,13 +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: cdbs, debhelper (>= 4.1.0), python, python-setuptools (>= 0.6a9-1)
-Build-Depends-Indep: python-dev
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5.0.37.1), python-setuptools (>= 0.6a9-1)
+Build-Depends-Indep: python-dev, python-support (>= 0.2.3)
 Standards-Version: 3.7.2
+XS-Python-Version: all
 
 Package: python-cherrypy
 Architecture: all
-Depends: python (>= 2.3), python (<< 2.5), python-support (>= 0.2)
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}
+Provides: ${python:Provides}
 Conflicts: python2.4-cherrypy2.1 (<= 2.1.1-1), python2.3-cherrypy2.1 (<= 2.1.1-1)
 Replaces: python2.4-cherrypy2.1, python2.3-cherrypy2.1
 Description: Python web development framework

Modified: packages/python-cherrypy/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-cherrypy/trunk/debian/rules?rev=861&op=diff
==============================================================================
--- packages/python-cherrypy/trunk/debian/rules (original)
+++ packages/python-cherrypy/trunk/debian/rules Thu Jun 15 23:07:41 2006
@@ -1,15 +1,17 @@
 #!/usr/bin/make -f
 
+DEB_PYTHON_SYSTEM := pysupport
+
 include /usr/share/cdbs/1/rules/buildcore.mk
-# python-distutils before debhelper to avoid it calling dh_python
-# itself
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 UPSTREAM_VERSION=$(shell head -n 1 debian/changelog | cut -d '(' -f 2 | cut -d ')' -f 1 | cut -d '-' -f 1)
 DEB_COMPRESS_EXCLUDE=.py .pdf
-DEB_PYTHON_INSTALL_ARGS_ALL = --single-version-externally-managed --no-compile -O0 --install-lib usr/share/python-support/python-cherrypy --install-data usr/share/doc/python-cherrypy
+DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed --install-lib usr/share/python-support/python-cherrypy --install-data usr/share/doc/python-cherrypy
+# hack around CDBS bug -- see #373678
+DEB_PYTHON_INSTALL_ARGS := ${DEB_PYTHON_INSTALL_ARGS_ALL}
 PYVER=$(shell python -V 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1-2)
 
 common-binary-post-install-indep::