[Python-apps-commits] r4996 - in packages/sabnzbdplus/trunk/debian (4 files)

[jcfp-guest at users.alioth.debian.org]

    Date: Tuesday, March 23, 2010 @ 10:58:08
  Author: jcfp-guest
Revision: 4996

Install patched upstream cherrypy

Modified:
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/control
  packages/sabnzbdplus/trunk/debian/rules
  packages/sabnzbdplus/trunk/debian/sabnzbdplus.install

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2010-03-23 10:27:12 UTC (rev 4995)
+++ packages/sabnzbdplus/trunk/debian/changelog	2010-03-23 10:58:08 UTC (rev 4996)
@@ -49,6 +49,8 @@
   * Using debian/sabnzbdplus.examples rather than sabnzbdplus.docs for
     the sample post-processing script.
   * Bumped Standards-Version to 3.8.4 (no changes needed).
+  * Install included patched copy of cherrypy3: both 3.1.x and 3.2.0rc1
+    suffer from crippling bugs in the https implementation.
 
  -- JCF Ploemen (jcfp) <linux at jp.pp.ru>  Sun, 21 Feb 2010 21:32:58 +0100
 

Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control	2010-03-23 10:27:12 UTC (rev 4995)
+++ packages/sabnzbdplus/trunk/debian/control	2010-03-23 10:58:08 UTC (rev 4996)
@@ -15,7 +15,6 @@
 Depends:
  ${python:Depends},
  ${misc:Depends},
- python-cherrypy3 (>= 3.2~),
  python-cheetah (>= 2.0.1),
  python-configobj,
  python-feedparser,

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2010-03-23 10:27:12 UTC (rev 4995)
+++ packages/sabnzbdplus/trunk/debian/rules	2010-03-23 10:58:08 UTC (rev 4996)
@@ -33,7 +33,10 @@
 		--exclude=utils/feedparser.py \
 		--exclude=utils/configobj.py \
 		--exclude=excanvas/excanvas.js \
-		--exclude=images/plush-default-split.tar.gz
+		--exclude=images/plush-default-split.tar.gz \
+		--exclude=cherrypy/LICENSE.txt \
+		--exclude=cherrypy/cherryd \
+		--exclude=cherrypy/scaffold
 
 install-finish: install-main
 	# Strip caps and script extension from the executable

Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.install	2010-03-23 10:27:12 UTC (rev 4995)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.install	2010-03-23 10:58:08 UTC (rev 4996)
@@ -9,3 +9,6 @@
 
 # translations
 language /usr/share/sabnzbdplus/
+
+# tmp: patched cherrypy svn included by upstream
+cherrypy /usr/share/sabnzbdplus/