--- cherrypy3-3.2.2.orig/debian/README.source
+++ cherrypy3-3.2.2/debian/README.source
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
--- cherrypy3-3.2.2.orig/debian/NEWS
+++ cherrypy3-3.2.2/debian/NEWS
@@ -0,0 +1,13 @@
+python-cherrypy (2.1.1-2) unstable; urgency=low
+
+  This release is incompatible with CherryPy 2.0. If you are using
+  that version, take a look at this page for how to upgrade your code:
+
+    http://www.cherrypy.org/wiki/WhatsNewIn21
+
+  This release also marks a big overhaul on the package layout, which
+  is now using python-support, and also providing EGG-INFO information
+  so that systems like TurboGears are able to find and use CherryPy.
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun,  2 Apr 2006 12:47:11 -0300
+
--- cherrypy3-3.2.2.orig/debian/watch
+++ cherrypy3-3.2.2/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="uversionmangle=s/([a-z]+\d+)$/~$1/" \
+ http://download.cherrypy.org/cherrypy/([\d\.a-zA-Z]+)/CherryPy-([^-]+)\.tar\.gz
--- cherrypy3-3.2.2.orig/debian/compat
+++ cherrypy3-3.2.2/debian/compat
@@ -0,0 +1 @@
+5
--- cherrypy3-3.2.2.orig/debian/manpages
+++ cherrypy3-3.2.2/debian/manpages
@@ -0,0 +1 @@
+debian/cherryd.1
--- cherrypy3-3.2.2.orig/debian/changelog
+++ cherrypy3-3.2.2/debian/changelog
@@ -0,0 +1,429 @@
+cherrypy3 (3.2.2-1) unstable; urgency=low
+
+  [ JCF Ploemen ]
+  * New upstream release (Closes: #571196).
+  * Bumped Standards-Version to 3.8.4 (no changes needed).
+  * Removing patch 02: no longer needed, incorporated upstream.
+  * Updating patch 00 to match release.
+  * Install cherryd man page via debian/manpages.
+  * debian/copyright:
+    + Added notice for cherrypy/lib/httpauth.py.
+    + Fixed years.
+  * debian/watch:
+    + Don't hit on the -py3 release by blocking '-' from the version.
+    + Mangle upstream version, inserting a tilde for beta/rc.
+
+  [ Stéphane Graber <stgraber@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
+  * debian/control:
+  - add python-nose to Build-Depends, since it's used during the
+    documentation build for cross-reference generation
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Fri, 06 Jan 2012 10:13:27 -0200
+
+cherrypy3 (3.1.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #528473)
+  * debian/rules:
+  - use the quilt make include file instead of using custom code; should
+    make the package convertable to the new quilt source format
+    (Closes: #538677)
+  * debian/control:
+  - updated Standards-Version with no changes
+  * debian/python-cherrypy3.links:
+  - fix link to point to the new place where python-support installs files
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sat, 15 Aug 2009 14:52:43 -0300
+
+cherrypy3 (3.1.1-3) unstable; urgency=low
+
+  [ Bernd Zeimetz ]
+  * debian/rules: Fixed to work with dh >= 7.3.5 which will build with all
+    installed Python versions.
+  * debian/control: Replace the python-all-dev Build-Dep by python-all.
+    Cherrypy doesn't build extensions, so we don't need the C headers.
+
+ -- Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>  Tue, 21 Jul 2009 11:04:48 +0200
+
+cherrypy3 (3.1.1-2) unstable; urgency=low
+
+  * Making lintian happy release
+  - uploading to unstable
+  * debian/control:
+  - added ${misc:Depends} to python-cherrypy3's Depends line
+  * debian/rules, debian/control:
+  - use debhelper 7 instead of cdbs; this rework also makes our
+    installation process stop depending on python-support locations
+    (Closes: #516144)
+  - use quilt for patches
+  * debian/README.source:
+  - added, to document usage of quilt
+  * debian/rules:
+  - remove aditional LICENSE.txt file that is being installed
+  * debian/rules, debian/python-cherrypy3.dirs, debian/python-cherrypy3.links,
+    debian/patches/01_cherryd_location_fix.diff:
+  - don't move the tutorial module to the documentation directory, since
+    the cherrypy test structure, which is useful, actually wants to have
+    it where it is; move the cherryd utility to /usr/sbin; the patch fixes
+    where the tests want to run cherryd from
+  * debian/python-cherrypy3.doc-base.api:
+  - fixed manual section
+  * debian/source.lintian-overrides:
+  - removed; no longer needed
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun, 22 Feb 2009 14:20:28 -0300
+
+cherrypy3 (3.1.1-1) experimental; urgency=low
+
+  [ Gustavo Noronha Silva ]
+  * New upstream version
+  * debian/patches/03_CVE-2008-0252.diff:
+  - removed; applied upstream
+  * debian/control:
+  - remove -1 from build-dependency
+  - upgrade Standards-Version to 3.8.0, with no further changes
+
+  [ Sandro Tosi ]
+  * debian/control
+    - switch Vcs-Browser field to viewsvn
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Wed, 01 Oct 2008 08:21:45 -0300
+
+cherrypy3 (3.0.2-2) unstable; urgency=low
+
+  [ Piotr Ożarowski ]
+  * Vcs-Browser and Homepage fields added
+  * Rename XS-Vcs-Svn to Vcs-Svn
+
+  [ Sandro Tosi ]
+  * debian/control
+    - fix Vcs-Browser field
+
+  [ Gustavo Noronha Silva ]
+  * This update addresses the following security issue:
+    - Directory traversal vulnerability in the _get_file_path function
+      in filter/sessionfilter.py allows remote attackers to create or
+      delete arbitrary files, and possibly read and write portions of
+      arbitrary files, via a crafted session id in a cookie
+      (CVE-2008-0252).
+  * debian/control:
+  - updated standards-version to 3.7.3; no changes
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Thu, 24 Jan 2008 14:30:48 -0200
+
+cherrypy3 (3.0.2-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/rules:
+  - call epydoc with full-name arguments; thanks to Cyril Brulebois
+    <cyril.brulebois@enst-bretagne.fr> for providing the fix.
+    (Closes: #433904)
+  * debian/python-cherrypy3.doc-base.api:
+  - fix HTML files location
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Thu, 09 Aug 2007 21:14:40 -0300
+
+cherrypy3 (3.0.1-2) unstable; urgency=low
+
+  [ Piotr Ożarowski ]
+  * New python-support handles egg's directory name correctly
+    - bump python-support required version
+    - remove mv part from debian/rules
+    (Closes: #423749)
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sat, 19 May 2007 17:01:51 -0300
+
+cherrypy3 (3.0.1-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/watch:
+  - updated to understand the new layout of the new download
+    source for CherryPy
+  * debian/rules:
+  - I heartly agree with Sam Clegg on this; the tutorial should be
+    in /usr/share/doc/python-cherrypy3, not inside the Python package
+    namespace (Closes: #415526)
+  * debian/control:
+  - updated python-support and python-all-dev version requirements
+    and moved them to build-deps because they are needed on clean
+  * debian/control, debian/rules, debian/python-cherrypy3.doc-base.api,
+    debian/python-cherrypy3.install:
+  - build API documentation as a step in the package build and install
+    it; this uses epydoc
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sat, 21 Apr 2007 14:40:09 -0300
+
+cherrypy3 (3.0.0-1) unstable; 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/rules:
+  - cleaning up for newer cdbs version
+  * debian/patches/00_supress_profiler_warning.diff:
+  - updated for the new version
+
+  * Piotr Ozarowski <ozarow@gmail.com>:
+  - Added XS-Vcs-Svn field
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Mon,  8 Jan 2007 22:51:47 -0200
+
+python-cherrypy (2.2.1-3) unstable; urgency=low
+
+  * 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@debian.org>  Sun,  4 Jun 2006 23:50:37 -0300
+
+python-cherrypy (2.2.1-2) unstable; urgency=low
+
+  * debian/patches/02_eggify.diff:
+  - fixed to only patch setup.py, so that it imports setup
+    from setuptools instead of distutils; ez_setup is not
+    needed
+  * debian/patches/00_supress_profiler_warning.diff:
+  - stop warning about the profiler module not being packaged
+    in the main python distribution; that is documented in
+    README.Debian
+  * debian/control:
+  - move python and python-setuptools to Build-Depends,
+    since they are needed at the clean target
+  * debian/watch:
+  - new uscan support file, using the sf.net trick
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun,  4 Jun 2006 23:44:26 -0300
+
+python-cherrypy (2.2.1-1) unstable; urgency=low
+
+  * debian/patches/*:
+  - renamed to have numbers defining the order in which they
+    should be applied
+  * debian/README.Debian:
+  - added, documenting the Python profiler only being available
+    in a non-free package problem
+  * debian/rules, debian/python-cherrypy.{postinst,prerm}:
+  - install py files to the python-cherrypy instead of cherrypy
+    for python-support; using the package name is the correct,
+    documented way of doing it.
+  * debian/patches/01_auto-reload-with-python-support.diff:
+  - removed because python-support >= 0.2, which I depend upon
+    provides symlinks for the .py files;
+  * debian/control:
+  - depend on python-support >= 0.2; see above
+  - Standards-Version to 3.7.2, no changes
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sat, 13 May 2006 17:06:10 -0300
+
+python-cherrypy (2.2.0-3) unstable; urgency=low
+
+  * Upload to unstable (duh)
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Thu,  4 May 2006 00:25:21 -0300
+
+python-cherrypy (2.2.0-2) experimental; urgency=low
+
+  * debian/source.lintian-overrides:
+  - this package needs debhelper and cdbs for the clean target
+    to be run
+  * debian/control:
+  - increased Standards-Version to 3.7 with no changes
+  * debian/rules:
+  - use --install-lib instead of moving stuff manually
+  - also install tutorial and test using --install-data
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Thu,  4 May 2006 00:00:28 -0300
+
+python-cherrypy (2.2.0-1) unstable; urgency=low
+
+  * 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
+  * debian/control:
+  - moved cdbs and debhelper to Build-Depends
+  * debian/rules:
+  - removed the code to auto-generate the Uploaders field, since
+    it will not be used
+  - fix the arguments passed to dh_compress so .py and .pdf files
+    are actually not compressed
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun, 23 Apr 2006 10:08:43 -0300
+
+python-cherrypy (2.1.1-3) unstable; urgency=low
+
+  * Python Modules Team upload
+  * debian/control:
+  - added the team in Uploaders field
+  * debian/rules:
+  - install the egg info without the python version in the name of
+    the directory
+  * debian/NEWS.Debian -> debian/NEWS:
+  - renamed so debhelper will take care of installing it;
+    (Closes: #362039).
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun, 16 Apr 2006 16:56:12 -0300
+
+python-cherrypy (2.1.1-2) unstable; urgency=low
+
+  * Debian revision with source package name change
+  * changed source package name back to something more generic, since
+    it seems like there won't be compatibility breakage again anytime
+    soon
+  * use python-support
+  * debian/patches/eggify.diff:
+  - add patch to provide EGG-INFO stuff, so that packages that depend
+    on that information, such as TurboGears, will be able to use
+    CherryPy
+  * debian/patches/auto-reload-with-python-support.diff:
+  - auto-reload doesn't like the .py files to be in a different path as the
+    pyc files; I need a better solution for this, but for now the auto-reloader
+    simply ignores the files in the cherrypy distribution (which is OK, since they
+    are not supposed to be modified after the package is installed).
+  * debian/control:
+  - build-depends on python-setup-tools >= 0.6a9-1, needed to provide the
+    EGG-INFO stuff
+  * debian/copyright:
+  - de-wikify the authors names
+  * debian/control, debian/rules:
+  - add dummy transition packages for python-cherrypy2.1, and deal with what
+    cdbs's python stuff likes to do when it sees lots of python${ver}-module
+    packages on the control file =D
+  * debian/NEWS.Debian:
+  - document big changes, and that this version is incompatible with
+    CherryPy 2.0
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun,  2 Apr 2006 12:47:52 -0300
+
+cherrypy2.1 (2.1.1-1) unstable; urgency=low
+
+  * SECURITY bug fix (CVE-2006-0847)
+  * New upstream release fixing a security bug (Closes: #353542)
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Tue, 21 Feb 2006 07:47:33 -0300
+
+cherrypy2.1 (2.1.0-1) unstable; urgency=low
+
+  * New backwards-incompatible version, thus new source
+    package to keep both on the archive (Closes: #334933)
+  * debian/control:
+  - packages conflict with their 2.0 versions counterparts
+  - enhanced description, mention the backwards incompatibility
+    and that it's part of the Turbo Gears framework
+  - changed maintainer to myself
+  * debian/copyright:
+  - modified downloaded from location to mention cherrypy.org instead
+    of the sourceforge page
+  * debian/rules:
+  - avoid compressing the pdf and py files on the tutorial documentation
+    directory
+  - do not try to move the tutorial from unversioned site-packages
+    directory since there's no tutorial in there
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun, 13 Nov 2005 20:24:08 -0200
+
+python-cherrypy (2.0.0f-2) unstable; urgency=low
+
+  * Packaging based on the work by Bob Tanner <tanner@real-time.com>
+  * New Upstream Release
+  * debian/control:
+  - Standards-Version is now 3.6.2
+  - add python to the Build-Depends (Closes: #322452)
+  * debian/rules:
+  - clean hack to work around cdbs bug
+  * debian/changelog:
+  - fixed date format on the 0.9-1 upload (Web->Wed)
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun, 13 Nov 2005 19:24:27 -0200
+
+python-cherrypy (2.0.0f-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+  - turn all packages into Arch: all packages, as they should be
+  - create packages for python2.3 and python2.4
+  - Build-Depend-Indep on python2.3-dev and python2.4-dev (Closes: #306381)
+  * debian/rules:
+  - adapted post-install rule to work with multiple python versions
+    supported
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Mon, 20 Jun 2005 16:45:45 -0300
+
+python-cherrypy (2.0.0b-1) experimental; urgency=low
+
+  * New upstream version. (Closes: #284511)
+  - package rebuilt from scratch, changelog kept for historic
+    reasons
+  - comaintaince with Raphael Goulais
+  * Source package name change.
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun, 17 Apr 2005 16:39:06 -0300
+
+cherrypy (0.10-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Raphael Goulais <rafou@debian.org>  Mon, 26 Apr 2004 18:01:00 +0200
+ 
+cherrypy (0.9-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Raphael Goulais (Rafou) <raphael@nicedays.net>  Wed, 28 Nov 2003 12:34:37 +0100
+
+cherrypy (0.8.99rc1-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Raphael Goulais (Rafou) <raphael@nicedays.net>  Tue, 18 Nov 2003 15:03:08 +0100
+
+cherrypy (0.8-3) unstable; urgency=low
+
+  * Removed python2.1 and python2.3 from build depends (Closes: #192715)
+
+ -- Raphael Goulais (Rafou) <raphael@nicedays.net>  Mon, 12 May 2003 16:12:00 +0200
+
+cherrypy (0.8-2) unstable; urgency=low
+
+  * White Space Policy : Changed 4 spaces to tabs in lib files
+  * Removed CR/LF from most files
+  * Backported python2.3 fixes from CVS
+  * Removed doc sources from cherrypy-doc
+  * Modified doc/Makefile (more targets, added clean)
+  * Regenerated html doc with png images instead of gif
+
+ -- Raphael Goulais (Rafou) <raphael@nicedays.net>  Wed, 16 Apr 2003 21:29:00 +0200
+
+cherrypy (0.8-1) unstable; urgency=low
+
+  * Initial Release (Closes: #188144)
+
+ -- Raphael Goulais (Rafou) <raphael@nicedays.net>  Tue, 08 Apr 2003 15:20:00 +0200
+
--- cherrypy3-3.2.2.orig/debian/rules
+++ cherrypy3-3.2.2/debian/rules
@@ -0,0 +1,47 @@
+#!/usr/bin/make -f
+
+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 --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 --with=python2
+
+
+install: build
+	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 \
+		debian/python-cherrypy3/usr/sbin/
+	chmod a+x debian/python-cherrypy3/usr/sbin/cherryd
+	rm -f debian/python-cherrypy3/usr/lib/*/*/cherrypy/cherryd
+
+	# no additional licensing files wanted =)
+	find debian/python-cherrypy3/ -name LICENSE.txt -exec rm {} \;
+
+	dh install --remaining --with=python2
+
+
+binary-indep: build install
+	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
+
+
+binary: build binary-indep binary-arch
+
+
+.PHONY: build clean install binary-indep binary-arch binary
--- cherrypy3-3.2.2.orig/debian/python-cherrypy3.dirs
+++ cherrypy3-3.2.2/debian/python-cherrypy3.dirs
@@ -0,0 +1 @@
+usr/sbin
--- cherrypy3-3.2.2.orig/debian/copyright
+++ cherrypy3-3.2.2/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Gustavo Noronha Silva <kov@debian.org> on
+Thu, 10 Mar 2005 09:32:58 -0300.
+
+It was downloaded from http://www.cherrypy.org/
+
+Copyright:
+
+Copyright (c) 2004-2009, CherryPy Team (team@cherrypy.org)
+
+cherrypy/lib/httpauth.py:
+Copyright (c) 2005, Tiago Cogumbreiro <cogumbreiro@users.sf.net>
+
+
+Upstream Authors:   Remi Delon
+	 	    Carlos Ribeiro
+		    Remco Boerma
+		    Jesir Vargas
+		    Pawel Maczewski
+		    Peter Hunt
+		    Jaroslaw Zabiello
+		    Robert Szefler
+		    and others
+
+License:
+
+This package is licensed under the BSD license which can be found,
+on Debian systems, at /usr/share/common-licenses/BSD.
--- cherrypy3-3.2.2.orig/debian/docs
+++ cherrypy3-3.2.2/debian/docs
@@ -0,0 +1 @@
+README.txt
--- cherrypy3-3.2.2.orig/debian/README.Debian
+++ cherrypy3-3.2.2/debian/README.Debian
@@ -0,0 +1,31 @@
+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
+Debian.
+
+If you want to use it, you'll have to install the python-profiler
+package from the non-free section; Notice that if you are using a
+version of Python that is different from the default Python version
+for Debian you need to install the package that matches your version
+(for example, python2.3-profiler, if you are using python2.3).
+
+See this page for details:
+
+    http://www.cherrypy.org/wiki/ProfilingOnDebian
+
+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@debian.org>, Mon,  8 Jan 2007 22:26:52 -0200
--- cherrypy3-3.2.2.orig/debian/python-cherrypy3.links
+++ cherrypy3-3.2.2/debian/python-cherrypy3.links
@@ -0,0 +1 @@
+usr/share/pyshared/cherrypy/tutorial usr/share/doc/python-cherrypy3/tutorial
--- cherrypy3-3.2.2.orig/debian/python-cherrypy3.install
+++ cherrypy3-3.2.2/debian/python-cherrypy3.install
@@ -0,0 +1 @@
+api/* usr/share/doc/python-cherrypy3/api/
--- cherrypy3-3.2.2.orig/debian/python-cherrypy3.doc-base.api
+++ cherrypy3-3.2.2/debian/python-cherrypy3.doc-base.api
@@ -0,0 +1,15 @@
+Document: cherrypy3-api
+Title: CherryPy 3.x API Reference
+Author: Remi Delon, Robert Brewer and others
+Abstract: 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
+ protocols. CherryPy allows developers to build web applications in
+ much the same way they would build any other object-oriented Python
+ program. This usually results in smaller source code developed in
+ less time. This is the documentation for version 3 of CherryPy.
+Section: Web Development
+
+Format: HTML
+Index: /usr/share/doc/python-cherrypy3/api/index.html
+Files: /usr/share/doc/python-cherrypy3/api/*.html
--- cherrypy3-3.2.2.orig/debian/control
+++ cherrypy3-3.2.2/debian/control
@@ -0,0 +1,36 @@
+Source: cherrypy3
+Section: python
+Priority: optional
+Maintainer: Gustavo Noronha Silva <kov@debian.org>
+Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7.0.0), quilt, python-setuptools (>= 0.6a9), python-all (>= 2.6.6-3~), help2man, python-nose
+Build-Depends-Indep: python-epydoc
+Standards-Version: 3.8.4
+Homepage: http://www.cherrypy.org/
+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
+Depends: ${python:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+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
+ protocols. CherryPy allows developers to build web applications in
+ much the same way they would build any other object-oriented Python
+ 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.
+ .
+ This version is backwards incompatible with the 2.2 version in some
+ ways. See http://www.cherrypy.org/wiki/UpgradeTo30.
--- cherrypy3-3.2.2.orig/debian/patches/01_cherryd_location_fix.diff
+++ cherrypy3-3.2.2/debian/patches/01_cherryd_location_fix.diff
@@ -0,0 +1,11 @@
+--- a/cherrypy/test/helper.py~	2008-11-08 17:19:39.000000000 -0200
++++ b/cherrypy/test/helper.py	2008-12-10 10:53:48.000000000 -0200
+@@ -284,7 +284,7 @@
+         """Start cherryd in a subprocess."""
+         cherrypy._cpserver.wait_for_free_port(self.host, self.port)
+         
+-        args = [sys.executable, os.path.join(thisdir, '..', 'cherryd'),
++        args = [sys.executable, '/usr/sbin/cherryd',
+                 '-c', self.config_file, '-p', self.pid_file]
+         
+         if not isinstance(imports, (list, tuple)):
--- cherrypy3-3.2.2.orig/debian/patches/series
+++ cherrypy3-3.2.2/debian/patches/series
@@ -0,0 +1,2 @@
+00_supress_profiler_warning.diff
+01_cherryd_location_fix.diff
--- cherrypy3-3.2.2.orig/debian/patches/00_supress_profiler_warning.diff
+++ cherrypy3-3.2.2/debian/patches/00_supress_profiler_warning.diff
@@ -0,0 +1,24 @@
+Index: cherrypy3-3.2.0~rc1/cherrypy/lib/profiler.py
+===================================================================
+--- cherrypy3-3.2.0~rc1.orig/cherrypy/lib/profiler.py	2009-10-17 20:17:35.000000000 +0200
++++ cherrypy3-3.2.0~rc1/cherrypy/lib/profiler.py	2010-02-22 01:08:27.928135547 +0100
+@@ -163,11 +163,14 @@
+             a single file. If False (the default), each HTTP request will
+             dump its profile data into a separate file.
+         """
+-        if profile is None or pstats is None:
+-            msg = ("Your installation of Python does not have a profile module. "
+-                   "If you're on Debian, try `sudo apt-get install python-profiler`. "
+-                   "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
++        #
++        #if profile is None or pstats is None:
++        #    msg = ("Your installation of Python does not have a profile module. "
++        #           "If you're on Debian, try `sudo apt-get install python-profiler`. "
++        #           "See http://www.cherrypy.org/wiki/ProfilingOnDebian for details.")
++        #    warnings.warn(msg)
+         
+         self.nextapp = nextapp
+         self.aggregate = aggregate
--- cherrypy3-3.2.2.orig/debian/source/format
+++ cherrypy3-3.2.2/debian/source/format
@@ -0,0 +1 @@
+1.0
