[Python-modules-commits] r7095 - in packages/cherrypy3/trunk/debian (5 files)

[kov at users.alioth.debian.org]

    Date: Wednesday, December 10, 2008 @ 13:05:31
  Author: kov
Revision: 7095

reorganization of tutorial/test/cherryd

Added:
  packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff
  packages/cherrypy3/trunk/debian/python-cherrypy3.dirs
  packages/cherrypy3/trunk/debian/python-cherrypy3.links
Modified:
  packages/cherrypy3/trunk/debian/changelog
  packages/cherrypy3/trunk/debian/rules

Modified: packages/cherrypy3/trunk/debian/changelog
===================================================================
--- packages/cherrypy3/trunk/debian/changelog	2008-12-10 12:44:02 UTC (rev 7094)
+++ packages/cherrypy3/trunk/debian/changelog	2008-12-10 13:05:31 UTC (rev 7095)
@@ -5,8 +5,14 @@
   - added ${misc:Depends} to python-cherrypy3's Depends line
   * 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
 
- -- Gustavo Noronha Silva <kov at debian.org>  Wed, 10 Dec 2008 10:30:53 -0200
+ -- Gustavo Noronha Silva <kov at debian.org>  Wed, 10 Dec 2008 10:53:05 -0200
 
 cherrypy3 (3.1.1-1) experimental; urgency=low
 

Added: packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff
===================================================================
--- packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff	                        (rev 0)
+++ packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff	2008-12-10 13:05:31 UTC (rev 7095)
@@ -0,0 +1,11 @@
+--- cherrypy/test/helper.py~	2008-11-08 17:19:39.000000000 -0200
++++ 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)):

Added: packages/cherrypy3/trunk/debian/python-cherrypy3.dirs
===================================================================
--- packages/cherrypy3/trunk/debian/python-cherrypy3.dirs	                        (rev 0)
+++ packages/cherrypy3/trunk/debian/python-cherrypy3.dirs	2008-12-10 13:05:31 UTC (rev 7095)
@@ -0,0 +1 @@
+usr/sbin

Added: packages/cherrypy3/trunk/debian/python-cherrypy3.links
===================================================================
--- packages/cherrypy3/trunk/debian/python-cherrypy3.links	                        (rev 0)
+++ packages/cherrypy3/trunk/debian/python-cherrypy3.links	2008-12-10 13:05:31 UTC (rev 7095)
@@ -0,0 +1 @@
+usr/share/python-support/python-cherrypy3/cherrypy/tutorial usr/share/doc/python-cherrypy3/tutorial

Modified: packages/cherrypy3/trunk/debian/rules
===================================================================
--- packages/cherrypy3/trunk/debian/rules	2008-12-10 12:44:02 UTC (rev 7094)
+++ packages/cherrypy3/trunk/debian/rules	2008-12-10 13:05:31 UTC (rev 7095)
@@ -12,8 +12,11 @@
 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/tutorial/ \
-		debian/python-cherrypy3/usr/share/doc/python-cherrypy3/
+	# the 'daemonization' helper should be made available properly
+	mv debian/python-cherrypy3/usr/share/python-support/python-cherrypy3/cherrypy/cherryd \
+		debian/python-cherrypy3/usr/sbin/
+	chmod a+x debian/python-cherrypy3/usr/sbin/cherryd
+
 	rm debian/python-cherrypy3/usr/share/python-support/python-cherrypy3/cherrypy/LICENSE.txt
 
 post-patches::