[Python-modules-commits] r29371 - in packages/cherrypy3/trunk/debian (7 files)
barry at users.alioth.debian.org
barry at users.alioth.debian.org
Tue Jun 17 22:37:03 UTC 2014
Date: Tuesday, June 17, 2014 @ 22:37:02
Author: barry
Revision: 29371
* Team upload.
* New upstream version.
- Closes: #494342
* debian/control: Bump Standards-Version to 3.9.5 with no other
changes necessary.
* Rebuild drops dependency on python3.3. Closes: #751642
* debian/watch: Updated to point to PyPI page.
* debian/rules: Temporarily make cherrypy/cherryd executable so
help2man can extract the --help text.
* debian/patches:
- 00_supress_profiler_warning.diff: Refreshed.
- 01_cherryd_location_fix.diff: Refreshed.
- 02_compat.diff: Removed; applied upstream. Closes: #722671
Modified:
packages/cherrypy3/trunk/debian/changelog
packages/cherrypy3/trunk/debian/control
packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff
packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff
packages/cherrypy3/trunk/debian/patches/series
packages/cherrypy3/trunk/debian/rules
packages/cherrypy3/trunk/debian/watch
Modified: packages/cherrypy3/trunk/debian/changelog
===================================================================
--- packages/cherrypy3/trunk/debian/changelog 2014-06-17 21:35:27 UTC (rev 29370)
+++ packages/cherrypy3/trunk/debian/changelog 2014-06-17 22:37:02 UTC (rev 29371)
@@ -1,11 +1,28 @@
-cherrypy3 (3.2.2-5) UNRELEASED; urgency=medium
+cherrypy3 (3.3.0-1) UNRELEASED; urgency=medium
- * debian/rules: Move cherryd to /usr/sbin/ where it belongs
- * debian/control, debian/tests/: Add autopkgtest. Thanks Chuck Short
- * debian/control: Add missing depends on python-routes. LP: #463065
+ * Team upload.
- -- Jackson Doak <noskcaj at ubuntu.com> Thu, 27 Feb 2014 08:00:55 +1100
+ [ Jackson Doak ]
+ * debian/rules: Move cherryd to /usr/sbin/ where it belongs
+ * debian/control, debian/tests/: Add autopkgtest. Thanks Chuck Short
+ * debian/control: Add missing depends on python-routes. LP: #463065
+ [ Barry Warsaw ]
+ * New upstream version.
+ - Closes: #494342
+ * debian/control: Bump Standards-Version to 3.9.5 with no other
+ changes necessary.
+ * Rebuild drops dependency on python3.3. Closes: #751642
+ * debian/watch: Updated to point to PyPI page.
+ * debian/rules: Temporarily make cherrypy/cherryd executable so
+ help2man can extract the --help text.
+ * debian/patches:
+ - 00_supress_profiler_warning.diff: Refreshed.
+ - 01_cherryd_location_fix.diff: Refreshed.
+ - 02_compat.diff: Removed; applied upstream. Closes: #722671
+
+ -- Barry Warsaw <barry at debian.org> Tue, 17 Jun 2014 18:02:39 -0400
+
cherrypy3 (3.2.2-4) unstable; urgency=low
* Team upload.
Modified: packages/cherrypy3/trunk/debian/control
===================================================================
--- packages/cherrypy3/trunk/debian/control 2014-06-17 21:35:27 UTC (rev 29370)
+++ packages/cherrypy3/trunk/debian/control 2014-06-17 22:37:02 UTC (rev 29371)
@@ -5,7 +5,7 @@
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 9), python-setuptools (>= 0.6a9), python-all (>= 2.6.6-3~), help2man, python-nose, python3-all, python3-nose, python3-setuptools, dh-python
Build-Depends-Indep: python-epydoc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.5
Homepage: http://www.cherrypy.org/
X-Python-Version: >= 2.3
X-Python3-Version: >= 3.2
Modified: packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff
===================================================================
--- packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff 2014-06-17 21:35:27 UTC (rev 29370)
+++ packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff 2014-06-17 22:37:02 UTC (rev 29371)
@@ -1,22 +1,26 @@
--- a/cherrypy/lib/profiler.py
+++ b/cherrypy/lib/profiler.py
-@@ -166,11 +166,14 @@
+@@ -171,13 +171,16 @@
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.")
+- 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
++ # 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)
-
++ ## 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
Modified: packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff
===================================================================
--- packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff 2014-06-17 21:35:27 UTC (rev 29370)
+++ packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff 2014-06-17 22:37:02 UTC (rev 29371)
@@ -1,11 +1,12 @@
---- 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."""
+--- a/cherrypy/test/helper.py
++++ b/cherrypy/test/helper.py
+@@ -467,7 +467,8 @@
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)):
+
+ args = [
+- os.path.join(thisdir, '..', 'cherryd'),
++ #os.path.join(thisdir, '..', 'cherryd'),
++ '/usr/sbin/cherryd',
+ '-c', self.config_file,
+ '-p', self.pid_file,
+ ]
Modified: packages/cherrypy3/trunk/debian/patches/series
===================================================================
--- packages/cherrypy3/trunk/debian/patches/series 2014-06-17 21:35:27 UTC (rev 29370)
+++ packages/cherrypy3/trunk/debian/patches/series 2014-06-17 22:37:02 UTC (rev 29371)
@@ -1,3 +1,2 @@
00_supress_profiler_warning.diff
01_cherryd_location_fix.diff
-02_compat.diff
Modified: packages/cherrypy3/trunk/debian/rules
===================================================================
--- packages/cherrypy3/trunk/debian/rules 2014-06-17 21:35:27 UTC (rev 29370)
+++ packages/cherrypy3/trunk/debian/rules 2014-06-17 22:37:02 UTC (rev 29371)
@@ -16,7 +16,9 @@
dh_clean
override_dh_auto_build:
+ chmod +x cherrypy/cherryd
PYTHONPATH=. help2man -n cherryd -s 1 -o debian/cherryd.1 --version-string=$(DEB_VERSION_UPSTREAM) ./cherrypy/cherryd
+ chmod -x cherrypy/cherryd
env PYTHONPATH=`pwd` epydoc --name CherryPy3 --url http://www.cherrypy.org/ -o api cherrypy
dh_auto_build --buildsystem pybuild
Modified: packages/cherrypy3/trunk/debian/watch
===================================================================
--- packages/cherrypy3/trunk/debian/watch 2014-06-17 21:35:27 UTC (rev 29370)
+++ packages/cherrypy3/trunk/debian/watch 2014-06-17 22:37:02 UTC (rev 29371)
@@ -1,3 +1,2 @@
version=3
-opts="uversionmangle=s/([a-z]+\d+)$/~$1/" \
- http://download.cherrypy.org/cherrypy/([\d\.a-zA-Z]+)/CherryPy-([^-]+)\.tar\.gz
+https://pypi.python.org/packages/source/C/CherryPy/CherryPy-(.*).tar.gz
More information about the Python-modules-commits
mailing list