[Python-modules-commits] r280 - in /packages/python-cherrypy/trunk/debian: changelog control patches/auto-reload-with-python-support.diff rules

Sat Apr 22 15:04:18 UTC 2006

Author: kov
Date: Sat Apr 22 15:04:16 2006
New Revision: 280

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=280
Log:
* New upstream release
* debian/control, debian/rules:
- no longer provides the transition packages for cherrypy2.1
* debian/patches/auto-reload-with-python-support.diff:
- updated for the new version

Modified:
    packages/python-cherrypy/trunk/debian/changelog
    packages/python-cherrypy/trunk/debian/control
    packages/python-cherrypy/trunk/debian/patches/auto-reload-with-python-support.diff
    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=280&op=diff
==============================================================================

--- packages/python-cherrypy/trunk/debian/changelog (original)
+++ packages/python-cherrypy/trunk/debian/changelog Sat Apr 22 15:04:16 2006
@@ -1,8 +1,12 @@
-python-cherrypy (2.1.1-4) UNRELEASED; urgency=low
+python-cherrypy (2.2.0-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release
+  * debian/control, debian/rules:
+  - no longer provides the transition packages for cherrypy2.1
+  * debian/patches/auto-reload-with-python-support.diff:
+  - updated for the new version
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sun, 16 Apr 2006 17:32:57 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Sat, 22 Apr 2006 11:49:13 -0300
 
 python-cherrypy (2.1.1-3) unstable; urgency=low
 

Modified: packages/python-cherrypy/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-cherrypy/trunk/debian/control?rev=280&op=diff
==============================================================================
--- packages/python-cherrypy/trunk/debian/control (original)
+++ packages/python-cherrypy/trunk/debian/control Sat Apr 22 15:04:16 2006
@@ -3,7 +3,7 @@
 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-Indep: cdbs, debhelper (>= 4.1.0), python, python-dev, python2.4-dev, python-setuptools (>= 0.6a9-1), python2.4-setuptools (>= 0.6a9-1)
+Build-Depends-Indep: cdbs, debhelper (>= 4.1.0), python, python-dev, python-setuptools (>= 0.6a9-1)
 Standards-Version: 3.6.2
 
 Package: python-cherrypy
@@ -25,24 +25,3 @@
  This version is backwards incompatible with the 2.0 version, and is
  the version used by the Turbo Gears framework. Visit the Turbo Gears
  webpage for more: http://www.turbogears.org/
-
-Package: python-cherrypy2.1
-Architecture: all
-Depends: python-cherrypy (>= 2.1.1-2)
-Description: Dummy upgrade package for python-cherrypy
- This is a transitional package to smooth upgrades; see the python-cherrypy
- package instead.
-
-Package: python2.3-cherrypy2.1
-Architecture: all
-Depends: python-cherrypy (>= 2.1.1-2)
-Description: Dummy upgrade package for python-cherrypy
- This is a transitional package to smooth upgrades; see the python-cherrypy
- package instead.
-
-Package: python2.4-cherrypy2.1
-Architecture: all
-Depends: python-cherrypy (>= 2.1.1-2)
-Description: Dummy upgrade package for python-cherrypy
- This is a transitional package to smooth upgrades; see the python-cherrypy
- package instead.

Modified: packages/python-cherrypy/trunk/debian/patches/auto-reload-with-python-support.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/python-cherrypy/trunk/debian/patches/auto-reload-with-python-support.diff?rev=280&op=diff
==============================================================================
--- packages/python-cherrypy/trunk/debian/patches/auto-reload-with-python-support.diff (original)
+++ packages/python-cherrypy/trunk/debian/patches/auto-reload-with-python-support.diff Sat Apr 22 15:04:16 2006
@@ -1,13 +1,13 @@
---- cherrypy/lib/autoreload.py.orig	2006-01-10 12:51:06.000000000 -0200
-+++ cherrypy/lib/autoreload.py	2006-04-02 13:21:42.000000000 -0300
-@@ -20,6 +20,10 @@
-             if filename:
-                 if filename.endswith(".pyc"):
-                     filename = filename[:-1]
+--- cherrypy/lib/autoreload.py.orig	2005-11-15 10:43:32.000000000 -0200
++++ cherrypy/lib/autoreload.py	2006-04-22 11:52:30.000000000 -0300
+@@ -21,6 +21,10 @@
+     while RUN_RELOADER:
+         for filename in map(fileattr, sys.modules.values()) + reloadFiles:
+             if filename:
 +                # Debian-specific hack to allow reloader to work with the
 +                # python-support infra-structure
 +                if filename.startswith("/var/lib/python-support/"):
 +                    continue
-                 try:
-                     mtime = os.stat(filename).st_mtime
-                 except OSError:
+                 if filename.endswith(".pyc"):
+                     filename = filename[:-1]
+                 try:

Modified: packages/python-cherrypy/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-cherrypy/trunk/debian/rules?rev=280&op=diff
==============================================================================
--- packages/python-cherrypy/trunk/debian/rules (original)
+++ packages/python-cherrypy/trunk/debian/rules Sat Apr 22 15:04:16 2006
@@ -15,11 +15,7 @@
 PYVER=$(shell python -V 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1-2)
 
 common-binary-post-install-indep::
-	mkdir -p debian/python-cherrypy/usr/lib
-	mv debian/python${PYVER}-cherrypy2.1/usr/lib/* debian/python-cherrypy/usr/lib
-	rm -rf debian/python*-cherrypy2.1/usr/lib
 	rm -rf debian/python-cherrypy/usr/lib/python${PYVER}/site-packages/cherrypy/test/
-	mkdir -p debian/python-cherrypy/usr/share/doc/python-cherrypy
 	mv debian/python-cherrypy/usr/lib/python${PYVER}/site-packages/cherrypy/tutorial/ debian/python-cherrypy/usr/share/doc/python-cherrypy
 	mkdir -p debian/python-cherrypy/usr/share/python-support/cherrypy/
 	mv debian/python-cherrypy/usr/lib/python${PYVER}/site-packages/* debian/python-cherrypy/usr/share/python-support/cherrypy/


