[Python-modules-commits] r1651 - in /packages/cherrypy3/trunk/debian: changelog control rules

[kov at users.alioth.debian.org]

Author: kov
Date: Tue Jan  9 01:55:43 2007
New Revision: 1651

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1651
Log:
cleanup for newer cdbs (required by control) and fixed XS-Vcs-Svn
(thanks to POX for pointing out)

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

Modified: packages/cherrypy3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/cherrypy3/trunk/debian/changelog?rev=1651&op=diff
==============================================================================
--- packages/cherrypy3/trunk/debian/changelog (original)
+++ packages/cherrypy3/trunk/debian/changelog Tue Jan  9 01:55:43 2007
@@ -12,13 +12,15 @@
     2.2, and where to find the upgrade instructions
   * debian/rules, debian/source.lintian-overrides:
   - updated for the new package name
+  * debian/rules:
+  - cleaning up for newer cdbs version
   * debian/patches/00_supress_profiler_warning.diff:
   - updated for the new version
 
   * Piotr Ozarowski <ozarow at gmail.com>:
   - Added XS-Vcs-Svn field
 
- -- Gustavo Noronha Silva <kov at debian.org>  Mon,  8 Jan 2007 22:35:51 -0200
+ -- Gustavo Noronha Silva <kov at debian.org>  Mon,  8 Jan 2007 22:51:47 -0200
 
 python-cherrypy (2.2.1-3) unstable; urgency=low
 

Modified: packages/cherrypy3/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/cherrypy3/trunk/debian/control?rev=1651&op=diff
==============================================================================
--- packages/cherrypy3/trunk/debian/control (original)
+++ packages/cherrypy3/trunk/debian/control Tue Jan  9 01:55:43 2007
@@ -3,11 +3,11 @@
 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 (>= 0.4.41), debhelper (>= 5.0.37.1), python-setuptools (>= 0.6a9-1)
+Build-Depends: cdbs (>= 0.4.42), 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: >= 2.3
-XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-cherrypy/trunk/
+XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/cherrypy3/trunk/
 
 Package: python-cherrypy3
 Architecture: all

Modified: packages/cherrypy3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/cherrypy3/trunk/debian/rules?rev=1651&op=diff
==============================================================================
--- packages/cherrypy3/trunk/debian/rules (original)
+++ packages/cherrypy3/trunk/debian/rules Tue Jan  9 01:55:43 2007
@@ -7,17 +7,10 @@
 include /usr/share/cdbs/1/class/python-distutils.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 --install-lib usr/share/python-support/python-cherrypy3 --install-data usr/share/doc/python-cherrypy3
-# hack around CDBS bug -- see #373678
-DEB_PYTHON_INSTALL_ARGS := ${DEB_PYTHON_INSTALL_ARGS_ALL}
+DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
 PYVER=$(shell python -V 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1-2)
 
 common-binary-post-install-indep::
-	mv debian/python-cherrypy3/usr/share/python-support/python-cherrypy3/CherryPy-${UPSTREAM_VERSION}-py${PYVER}.egg-info \
-		debian/python-cherrypy3/usr/share/python-support/python-cherrypy3/CherryPy-${UPSTREAM_VERSION}.egg-info
-
-clean::
-	# hack (CDBS bug -- see #300149)
-	-rm -rf build
+	mv debian/python-cherrypy3/usr/share/python-support/python-cherrypy3/CherryPy-${DEB_UPSTREAM_VERSION}-py${PYVER}.egg-info \
+		debian/python-cherrypy3/usr/share/python-support/python-cherrypy3/CherryPy-${DEB_UPSTREAM_VERSION}.egg-info