[Python-modules-commits] r1649 - in /packages/cherrypy3/trunk/debian: README.Debian changelog control patches/00_supress_profiler_warning.diff pyversions rules source.lintian-overrides

kov at users.alioth.debian.org kov at users.alioth.debian.org
Tue Jan 9 01:36:42 CET 2007 

Author: kov
Date: Tue Jan  9 01:36:42 2007
New Revision: 1649

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1649
Log:
  * New upstream release
  * debian/control:
  - updated for the new source and binary packages names
  - conflict with python-cherrypy
  - add source information for new python policy
  * debian/pyversions:
  - added; was missing
  * debian/README.Debian:
  - document that this version of CherryPy is incompatible with
    2.2, and where to find the upgrade instructions
  * debian/rules, debian/source.lintian-overrides:
  - updated for the new package name
  * debian/patches/00_supress_profiler_warning.diff:
  - updated for the new version

Added:
    packages/cherrypy3/trunk/debian/pyversions
Modified:
    packages/cherrypy3/trunk/debian/README.Debian
    packages/cherrypy3/trunk/debian/changelog
    packages/cherrypy3/trunk/debian/control
    packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff
    packages/cherrypy3/trunk/debian/rules
    packages/cherrypy3/trunk/debian/source.lintian-overrides

Modified: packages/cherrypy3/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/python-modules/packages/cherrypy3/trunk/debian/README.Debian?rev=1649&op=diff
==============================================================================
--- packages/cherrypy3/trunk/debian/README.Debian (original)
+++ packages/cherrypy3/trunk/debian/README.Debian Tue Jan  9 01:36:42 2007
@@ -1,5 +1,8 @@
 Notes about the CherryPy package for Debian
 -------------------------------------------
+
+1. The profiler module
+======================
 
 The profiler module of Python has a non-DFSG-compliant license. It is,
 thus, not included in the Python package distributed officialy by
@@ -15,4 +18,14 @@
 
     http://www.cherrypy.org/wiki/ProfilingOnDebian
 
- -- Gustavo Noronha Silva <kov at debian.org>
+2. Using along with or upgrading from CherryPy 2.2
+
+Upgrade instructions for applications using CherryPy 2.2 are available
+at the upstream website here:
+
+   http://www.cherrypy.org/wiki/UpgradeTo30
+
+Usage along the 2.2 version seems to be possible, but ways of doing so
+with the current Debian packaging are still being studied.
+
+ -- Gustavo Noronha Silva <kov at debian.org>, Mon,  8 Jan 2007 22:26:52 -0200

Modified: packages/cherrypy3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/cherrypy3/trunk/debian/changelog?rev=1649&op=diff
==============================================================================
--- packages/cherrypy3/trunk/debian/changelog (original)
+++ packages/cherrypy3/trunk/debian/changelog Tue Jan  9 01:36:42 2007
@@ -1,9 +1,24 @@
-python-cherrypy (2.2.1-4) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-  * Added XS-Vcs-Svn field
-
- -- Piotr Ozarowski <ozarow at gmail.com>  Thu, 23 Nov 2006 14:44:51 +0100
+cherrypy3 (3.0.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control:
+  - updated for the new source and binary packages names
+  - conflict with python-cherrypy
+  - add source information for new python policy
+  * debian/pyversions:
+  - added; was missing
+  * debian/README.Debian:
+  - document that this version of CherryPy is incompatible with
+    2.2, and where to find the upgrade instructions
+  * debian/rules, debian/source.lintian-overrides:
+  - updated for the new package name
+  * 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
 
 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=1649&op=diff
==============================================================================
--- packages/cherrypy3/trunk/debian/control (original)
+++ packages/cherrypy3/trunk/debian/control Tue Jan  9 01:36:42 2007
@@ -1,4 +1,4 @@
-Source: python-cherrypy
+Source: cherrypy3
 Section: python
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
@@ -6,17 +6,16 @@
 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
+XS-Python-Version: >= 2.3
 XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-cherrypy/trunk/
 
-Package: python-cherrypy
+Package: python-cherrypy3
 Architecture: all
 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
+Conflicts: python2.3-cherrypy, python2.4-cherrypy, python-cherrypy
+Description: Python web development framework - version 3
  CherryPy is a pythonic, object-oriented web development framework. It
  provides the foundation over which complex web-based applications can
  be written, with little or no knowledge of the underlying
@@ -25,8 +24,14 @@
  program. This usually results in smaller source code developed in
  less time.
  .
+ CherryPy is up-to-date with the latest developments on using Python
+ for web development: it features a bundled WSGI server, and is able
+ to integrate with other dispatching mechanisms, such as
+ Routes. CherryPy can be run as a standalone application, since it
+ provides its own HTTP server; setting it up behind another HTTP
+ server, such as Apache, or even with mod_python are also options.
+ .
   Homepage: http://www.cherrypy.org/
  .
- 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/
+ This version is backwards incompatible with the 2.2 version in some
+ ways. See http://www.cherrypy.org/wiki/UpgradeTo30.

Modified: packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff?rev=1649&op=diff
==============================================================================
--- packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff (original)
+++ packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff Tue Jan  9 01:36:42 2007
@@ -1,17 +1,20 @@
---- cherrypy/lib/profiler.py~	2006-06-04 23:45:51.000000000 -0300
-+++ cherrypy/lib/profiler.py	2006-06-04 23:46:23.000000000 -0300
-@@ -46,12 +46,12 @@
+--- cherrypy/lib/profiler.py.orig	2006-12-18 02:50:52.000000000 -0200
++++ cherrypy/lib/profiler.py	2007-01-08 22:32:51.000000000 -0200
+@@ -50,12 +50,15 @@
  except ImportError:
      profile = None
      pstats = None
 -    import warnings
--    msg = ("Your installation of Python doesn't have a profile module. "
+-    msg = ("Your installation of Python does not have a profile module. "
 -           "If you're on Debian, you can apt-get python2.4-profiler from "
 -           "non-free in a separate step. See http://www.cherrypy.org/wiki/"
 -           "ProfilingOnDebian for details.")
 -    warnings.warn(msg)
++    # do not advertise the non-free profiler everytime; its existence is
++    # already documented at the README.Debian file
++    #
 +    #import warnings
-+    #msg = ("Your installation of Python doesn't have a profile module. "
++    #msg = ("Your installation of Python does not have a profile module. "
 +    #       "If you're on Debian, you can apt-get python2.4-profiler from "
 +    #       "non-free in a separate step. See http://www.cherrypy.org/wiki/"
 +    #       "ProfilingOnDebian for details.")

Added: packages/cherrypy3/trunk/debian/pyversions
URL: http://svn.debian.org/wsvn/python-modules/packages/cherrypy3/trunk/debian/pyversions?rev=1649&op=file
==============================================================================
--- packages/cherrypy3/trunk/debian/pyversions (added)
+++ packages/cherrypy3/trunk/debian/pyversions Tue Jan  9 01:36:42 2007
@@ -1,0 +1,1 @@
+2.3-

Modified: packages/cherrypy3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/cherrypy3/trunk/debian/rules?rev=1649&op=diff
==============================================================================
--- packages/cherrypy3/trunk/debian/rules (original)
+++ packages/cherrypy3/trunk/debian/rules Tue Jan  9 01:36:42 2007
@@ -9,14 +9,14 @@
 
 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-cherrypy --install-data usr/share/doc/python-cherrypy
+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}
 PYVER=$(shell python -V 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1-2)
 
 common-binary-post-install-indep::
-	mv debian/python-cherrypy/usr/share/python-support/python-cherrypy/CherryPy-${UPSTREAM_VERSION}-py${PYVER}.egg-info \
-		debian/python-cherrypy/usr/share/python-support/python-cherrypy/CherryPy-${UPSTREAM_VERSION}.egg-info
+	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)

Modified: packages/cherrypy3/trunk/debian/source.lintian-overrides
URL: http://svn.debian.org/wsvn/python-modules/packages/cherrypy3/trunk/debian/source.lintian-overrides?rev=1649&op=diff
==============================================================================
--- packages/cherrypy3/trunk/debian/source.lintian-overrides (original)
+++ packages/cherrypy3/trunk/debian/source.lintian-overrides Tue Jan  9 01:36:42 2007
@@ -1,1 +1,1 @@
-python-cherrypy source: build-depends-without-arch-dep
+cherrypy3 source: build-depends-without-arch-dep

More information about the Python-modules-commits mailing list