[Python-apps-commits] r13186 - in packages/sabnzbdplus/trunk/debian (11 files)

jcfp-guest at users.alioth.debian.org jcfp-guest at users.alioth.debian.org
Mon May 9 20:39:54 UTC 2016 

    Date: Monday, May 9, 2016 @ 20:39:53
  Author: jcfp-guest
Revision: 13186

Merge the theme packages into the main package

Modified:
  packages/sabnzbdplus/trunk/debian/README.Debian
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/control
  packages/sabnzbdplus/trunk/debian/rules
  packages/sabnzbdplus/trunk/debian/sabnzbdplus.install
  packages/sabnzbdplus/trunk/debian/sabnzbdplus.links
Deleted:
  packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-glitter.install
  packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-glitter.links
  packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-plush.install
  packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.install
  packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.links

Modified: packages/sabnzbdplus/trunk/debian/README.Debian
===================================================================
--- packages/sabnzbdplus/trunk/debian/README.Debian	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/README.Debian	2016-05-09 20:39:53 UTC (rev 13186)
@@ -1,10 +1,10 @@
 == Cherrypy ==
 
-Upstream releases include a specific version of Cherrypy,
+Upstream releases include a patched version of Cherrypy,
 known to work with the program. Cherrypy releases have
 often suffered from crippling bugs when used with SABnzbd+.
 
-Currently (version 1.0.0), the program includes a modified
+Currently (version 1.0.x), the program includes a modified
 Cherrypy 3.8.0 with several bug fixes and enhancements:
 https://github.com/sabnzbd/sabnzbd/commit/1b477f488551f4e8652920c59f95d375d56202c4
 https://github.com/sabnzbd/sabnzbd/commit/bd33a729adbcba2c09ea064367308602ae61e413
@@ -49,8 +49,7 @@
 Adding any interface templates that are not available in the
 repositories can be done by putting those templates in their
 own directory under /usr/share/sabnzbdplus/interfaces/. 
-Make sure they follow the standard subdirectory layout (like
-the Default template):
+Make sure they follow the standard subdirectory layout:
 
 /usr/share/sabnzbdplus/interfaces/<NAME>/templates/*.tmpl
 

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/changelog	2016-05-09 20:39:53 UTC (rev 13186)
@@ -3,17 +3,19 @@
   * New upstream release. (Closes: #819896)
   * Patches:
     + refresh all.
+    + expand patch 02 to also deal with the newly added systray icons.
     + make patch 08 also remove the version check option from the
       scheduler and the configuration interface.
     + rename and expand patch 09 to deal with more potential privacy
       breaches.
-  * Add new Glitter theme binary package.
+  * Merge the theme packages into the main package, and add Breaks and
+    Replaces for all. With fewer interface themes and the reduced disk
+    space requirements of a unified Config interface the case for
+    splitting these up no longer exists.
   * Control:
     + bump required Python version to >= 2.6 (from >= 2.5).
     + recommend p7zip-full (7z support) and libavahi-compat-libdnssd1
       (bonjour/zeroconf support), suggest python-gtk2 (tray icon).
-    + make the new Glitter theme a hard dependency and demote Plush to
-      recommended as the former replaces the latter as default interface.
     + depend on various javascript libraries (libjs-bootstrap,
       libjs-jquery, libjs-jquery-ui, libjs-moment) and provide the
       necessary symlinks within the Config and Glitter interfaces.
@@ -21,23 +23,18 @@
       dialog. Config requires a jquery release >= 1.9.1 (and << 3) to
       prevent problems with the folder select dialogs in the "Folders"
       and "Categories" sections.
-    + Plush: add enhances and versioned dependency on sabnzbdplus.
-    + turn Mobile and Classic template packages into dummies (dropped
-      upstream).
     + remove obsolete versioning of par2, python-{openssl,yenc} deps.
     + use https for upstream homepage.
-  * Install systray icons under /usr/share/sabnzbdplus; expand patch 02
-    to make that work.
   * Rules:
     + remove dh_installinit override: no longer needed with dependency
       based boot order.
     + exclude sabtray.py (windows-only) and upstream cherrypy diff (not
       needed by end users) from install.
-    + drop exclude for cherrypy/scaffold (files removed by upstream).
-    + install README.txt as upstream changelog for the main package; the
-      previously used CHANGELOG.txt was dropped upstream.
+    + drop exclude for cherrypy/scaffold (removed upstream).
+    + install README.txt as upstream changelog; the previously used
+      CHANGELOG.txt was dropped upstream.
   * Watch: point to github (upstream is moving away from sf.net).
-  * Examples: upstream moved sample scripts into a subdir.
+  * Examples: upstream moved the sample scripts into a subdir.
   * Desktop file, description: capitalize Usenet.
   * Manpage: update renamed command line option and changed default
     listening host; remove mention of a long defunct indexer.
@@ -48,7 +45,7 @@
   * Lintian:
     + simplify override for source-is-missing to a single line.
     + override insane-line-length-in-source-file: effectively duplicates
-      (already overridden) source-contains-prebuilt-javascript-object.
+      already overridden source-contains-prebuilt-javascript-object.
 
  -- JCF Ploemen (jcfp) <linux at jcf.pm>  Mon, 23 Nov 2015 21:57:55 +0000
 

Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/control	2016-05-09 20:39:53 UTC (rev 13186)
@@ -23,11 +23,15 @@
  ${python:Depends},
  ${misc:Depends},
  libjs-bootstrap,
+ libjs-excanvas,
  libjs-jquery (>= 1.11),
+ libjs-jquery (<< 3),
+ libjs-jquery-ui,
+ libjs-mochikit (>= 1.4),
+ libjs-moment,
  python-cheetah (>= 2.0.1),
  python-configobj,
- python-feedparser,
- sabnzbdplus-theme-glitter (= ${source:Version})
+ python-feedparser
 Recommends:
  consolekit,
  libavahi-compat-libdnssd1,
@@ -36,14 +40,26 @@
  python-dbus,
  python-openssl,
  python-yenc,
- sabnzbdplus-theme-smpl,
- sabnzbdplus-theme-plush,
  unzip,
  unrar (>= 1:3.8.0) | rar (>= 1:3.8.0)
 Suggests:
  python-gtk2,
  python-notify
-Description: web-based binary newsgrabber with nzb support
+Breaks:
+ sabnzbdplus-theme-classic (<< 1.0.2),
+ sabnzbdplus-theme-glitter (<< 1.0.2),
+ sabnzbdplus-theme-iphone (<< 1.0.2),
+ sabnzbdplus-theme-mobile (<< 1.0.2),
+ sabnzbdplus-theme-plush (<< 1.0.2),
+ sabnzbdplus-theme-smpl (<< 1.0.2)
+Replaces:
+ sabnzbdplus-theme-classic (<< 1.0.2),
+ sabnzbdplus-theme-glitter (<< 1.0.2),
+ sabnzbdplus-theme-iphone (<< 1.0.2),
+ sabnzbdplus-theme-mobile (<< 1.0.2),
+ sabnzbdplus-theme-plush (<< 1.0.2),
+ sabnzbdplus-theme-smpl (<< 1.0.2)
+Description: web-based binary newsreader with nzb support
  SABnzbd+ is a web-based binary newsgrabber written in Python, with support for
  the popular nzb file format. It greatly simplifies the process of downloading
  from Usenet, thanks to a friendly web-based, fully customizable user interface
@@ -55,86 +71,5 @@
  automatic sorting, a download history, email notifications, and custom
  post-processing scripts. An extensive API allows third party applications to
  interact with the program.
-
-Package: sabnzbdplus-theme-glitter
-Architecture: all
-Depends:
- ${misc:Depends},
- libjs-bootstrap,
- libjs-jquery (>= 1.9.1),
- libjs-jquery (<< 3),
- libjs-jquery-ui,
- libjs-moment
-Recommends: sabnzbdplus
-Description: glitter interface templates for the SABnzbd+ binary newsgrabber
- Glitter is a set of interface templates for the SABnzbd+ binary newsgrabber,
- providing access to a full set of features, designed to work on desktop,
- mobile, and tablet.
  .
- This package contains the Glitter interface templates, as distributed with
- the SABnzbd+ program releases starting with version 0.8.0.
-
-Package: sabnzbdplus-theme-plush
-Architecture: all
-Depends:
- ${misc:Depends},
- sabnzbdplus (= ${source:Version})
-Enhances: sabnzbdplus
-Description: plush interface templates for the SABnzbd+ binary newsgrabber
- Plush is a set of interface templates for the SABnzbd+ binary newsgrabber,
- providing access to a full set of features, even including a built-in IRC
- client. To this end, extensive use is made of ajax technology, with various
- graphical enhancements and artwork providing the finishing touch.
- .
- This package contains the Plush interface templates, as distributed with
- the SABnzbd+ program releases.
-
-Package: sabnzbdplus-theme-smpl
-Architecture: all
-Depends:
- ${misc:Depends},
- libjs-excanvas,
- libjs-mochikit (>= 1.4),
- sabnzbdplus (= ${source:Version})
-Description: smpl interface templates for the SABnzbd+ binary newsgrabber
- Smpl is a set of interface templates for the SABnzbd+ binary newsgrabber,
- featuring a simple, clean design, automatic updating of queue, history, and
- download speed at the refresh rate of your choice, a download graph,
- re-designed config look, AJAX form submitting, and dual Queue and history
- views.
- .
- This package contains the smpl interface templates, as distributed with
- the SABnzbd+ program releases.
-
-Package: sabnzbdplus-theme-iphone
-Architecture: all
-Section: contrib/oldlibs
-Priority: extra
-Depends: ${misc:Depends}
-Description: dummy package in place of the former iphone interface templates
- This package used to contain the iphone interface templates, that were
- part of the 0.4.x series of the SABnzbd+ program releases.
- .
- This dummy package may be safely removed after upgrading.
-
-Package: sabnzbdplus-theme-mobile
-Architecture: all
-Section: contrib/oldlibs
-Priority: extra
-Depends: ${misc:Depends}
-Description: dummy package in place of the former Mobile interface templates
- This package used to contain the Mobile interface templates, that were
- part of the SABnzbd+ program releases between version 0.5.0 and 0.8.0.
- .
- This dummy package may be safely removed after upgrading.
-
-Package: sabnzbdplus-theme-classic
-Architecture: all
-Section: contrib/oldlibs
-Priority: extra
-Depends: ${misc:Depends}
-Description: dummy package in place of the former Classic interface templates
- This package used to contain the Classic interface templates, that
- were part of the SABnzbd+ program releases before version 0.8.0.
- .
- This dummy package may be safely removed after upgrading.
+ This package contains the program itself and all interface templates.

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/rules	2016-05-09 20:39:53 UTC (rev 13186)
@@ -47,10 +47,7 @@
 	mv $(DESTDIR)/usr/bin/SABnzbd.py $(DESTDIR)/usr/bin/sabnzbdplus
 
 override_dh_installchangelogs:
-	dh_installchangelogs
-	dh_installchangelogs -p sabnzbdplus README.txt
-	dh_installchangelogs -p sabnzbdplus-theme-plush -k interfaces/Plush/README.txt
-	dh_installchangelogs -p sabnzbdplus-theme-smpl -k interfaces/smpl/README.txt
+	dh_installchangelogs README.txt
 
 
 DEB_DIR := $(abspath $(dir $(MAKEFILE_LIST)))

Deleted: packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-glitter.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-glitter.install	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-glitter.install	2016-05-09 20:39:53 UTC (rev 13186)
@@ -1 +0,0 @@
-interfaces/Glitter/templates /usr/share/sabnzbdplus/interfaces/Glitter/

Deleted: packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-glitter.links
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-glitter.links	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-glitter.links	2016-05-09 20:39:53 UTC (rev 13186)
@@ -1,8 +0,0 @@
-/usr/share/javascript/bootstrap/css/bootstrap.min.css /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/css/bootstrap.min.css
-/usr/share/javascript/bootstrap/js/bootstrap.min.js /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/js/bootstrap.min.js
-/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.eot /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/fonts/glyphicons-halflings-regular.eot
-/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.svg /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/fonts/glyphicons-halflings-regular.svg
-/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.ttf /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
-/usr/share/javascript/jquery-ui/jquery-ui.min.js /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/javascripts/jquery-ui.min.js
-/usr/share/javascript/jquery/jquery.min.js /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/javascripts/jquery-1.11.2.min.js
-/usr/share/javascript/moment/moment.min.js /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/javascripts/moment.js

Deleted: packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-plush.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-plush.install	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-plush.install	2016-05-09 20:39:53 UTC (rev 13186)
@@ -1 +0,0 @@
-interfaces/Plush/templates /usr/share/sabnzbdplus/interfaces/Plush/

Deleted: packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.install	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.install	2016-05-09 20:39:53 UTC (rev 13186)
@@ -1 +0,0 @@
-interfaces/smpl/templates /usr/share/sabnzbdplus/interfaces/smpl/

Deleted: packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.links
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.links	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.links	2016-05-09 20:39:53 UTC (rev 13186)
@@ -1,2 +0,0 @@
-/usr/share/javascript/mochikit/MochiKit.js /usr/share/sabnzbdplus/interfaces/smpl/templates/static/MochiKit/MochiKit.js
-/usr/share/javascript/excanvas/excanvas.js /usr/share/sabnzbdplus/interfaces/smpl/templates/static/excanvas/excanvas.js

Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.install	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.install	2016-05-09 20:39:53 UTC (rev 13186)
@@ -28,3 +28,8 @@
 
 # systray icons
 icons/sabnzbd* /usr/share/sabnzbdplus/icons
+
+# interface theme templates
+interfaces/Glitter/templates /usr/share/sabnzbdplus/interfaces/Glitter/
+interfaces/Plush/templates /usr/share/sabnzbdplus/interfaces/Plush/
+interfaces/smpl/templates /usr/share/sabnzbdplus/interfaces/smpl/

Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.links
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.links	2016-05-09 13:27:08 UTC (rev 13185)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.links	2016-05-09 20:39:53 UTC (rev 13186)
@@ -1,3 +1,4 @@
+# config
 /usr/share/javascript/bootstrap/css/bootstrap.min.css /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/bootstrap/css/bootstrap.min.css
 /usr/share/javascript/bootstrap/js/bootstrap.min.js /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/bootstrap/js/bootstrap.min.js
 /usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.eot /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.eot
@@ -4,3 +5,15 @@
 /usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.svg /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.svg
 /usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.ttf /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.ttf
 /usr/share/javascript/jquery/jquery.min.js /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/js/jquery-1.11.2.min.js
+# glitter
+/usr/share/javascript/bootstrap/css/bootstrap.min.css /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/css/bootstrap.min.css
+/usr/share/javascript/bootstrap/js/bootstrap.min.js /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/js/bootstrap.min.js
+/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.eot /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/fonts/glyphicons-halflings-regular.eot
+/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.svg /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/fonts/glyphicons-halflings-regular.svg
+/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.ttf /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
+/usr/share/javascript/jquery-ui/jquery-ui.min.js /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/javascripts/jquery-ui.min.js
+/usr/share/javascript/jquery/jquery.min.js /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/javascripts/jquery-1.11.2.min.js
+/usr/share/javascript/moment/moment.min.js /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/javascripts/moment.js
+# smpl
+/usr/share/javascript/mochikit/MochiKit.js /usr/share/sabnzbdplus/interfaces/smpl/templates/static/MochiKit/MochiKit.js
+/usr/share/javascript/excanvas/excanvas.js /usr/share/sabnzbdplus/interfaces/smpl/templates/static/excanvas/excanvas.js

More information about the Python-apps-commits mailing list