[Python-apps-commits] r13691 - in packages/sabnzbdplus/trunk/debian (changelog control rules)

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

    Date: Friday, November 11, 2016 @ 20:25:36
  Author: jcfp-guest
Revision: 13691

Depend on python-six, cleanup d/rules

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

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2016-11-11 20:17:28 UTC (rev 13690)
+++ packages/sabnzbdplus/trunk/debian/changelog	2016-11-11 20:25:36 UTC (rev 13691)
@@ -1,14 +1,18 @@
 sabnzbdplus (1.1.1+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Rules: use Config's logo-arrow.svg as new basis for menu icon.
+  * Refresh all patches.
+  * Rules:
+    + use Config's logo-arrow.svg as new basis for menu icon.
+    + no longer exclude Patch-for-CP-3.8.0.diff from install, file was
+      removed upstream.
   * Control:
-    + add recommend on python-cryptography, used for certificate
-      (re)generation and encrypted rarfile detection.
-    + add build-dep on librsvg2-bin to enable svg handling in
+    + recommend python-cryptography, used for certificate generation
+      and encrypted rarfile detection.
+    + build-depend on librsvg2-bin to enable svg handling in
       imagemagick.
+    + depend on python-six, needed by recent cherrypy releases.
     + bump X-Python-Version to 2.7 (from 2.6).
-  * Refresh all patches.
   * Links: update Glitter links, upstream now omits jquery version from
     filename.
   * Copyright: minor updates only, to match upstream javascript and

Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control	2016-11-11 20:17:28 UTC (rev 13690)
+++ packages/sabnzbdplus/trunk/debian/control	2016-11-11 20:25:36 UTC (rev 13691)
@@ -32,7 +32,8 @@
  lsb-base (>= 3.0-6),
  python-cheetah (>= 2.0.1),
  python-configobj,
- python-feedparser
+ python-feedparser,
+ python-six
 Recommends:
  consolekit,
  libavahi-compat-libdnssd1,

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2016-11-11 20:17:28 UTC (rev 13690)
+++ packages/sabnzbdplus/trunk/debian/rules	2016-11-11 20:25:36 UTC (rev 13691)
@@ -34,7 +34,6 @@
 		--exclude=sabnzbd/sabtray.py \
 		--exclude=images-split.tar.gz \
 		--exclude=cherrypy/LICENSE.txt \
-		--exclude=cherrypy/Patch-for-CP-3.8.0.diff \
 		--exclude=cherrypy/cherryd \
 		--exclude=/src/
 	mv $(DESTDIR)/usr/bin/SABnzbd.py $(DESTDIR)/usr/bin/sabnzbdplus