[Python-apps-commits] r8741 - in packages/sabnzbdplus/trunk/debian (6 files)

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

    Date: Monday, May 21, 2012 @ 19:49:50
  Author: jcfp-guest
Revision: 8741

Prep for new upstream release 0.7.0

Modified:
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/control
  packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff
  packages/sabnzbdplus/trunk/debian/rules
  packages/sabnzbdplus/trunk/debian/sabnzbdplus.1
  packages/sabnzbdplus/trunk/debian/sabnzbdplus.install

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2012-05-21 07:34:53 UTC (rev 8740)
+++ packages/sabnzbdplus/trunk/debian/changelog	2012-05-21 19:49:50 UTC (rev 8741)
@@ -1,9 +1,16 @@
-sabnzbdplus (0.6.15-2) UNRELEASED; urgency=low
+sabnzbdplus (0.7.0-1) UNRELEASED; urgency=low
 
+  * New upstream release:
+    + Refresh patch 02.
+    + Add suggested dependency on python-notify.
+    + Install the new unified configuration interface as part of the
+      main package.
+    + Minor man page update.
+    + TBD: update copyright file.
   * Bumped Standards-Version to 3.9.3 (no changes needed).
-  * Changed maintainer email address.
+  * Changed my email address.
 
- -- JCF Ploemen (jcfp) <linux at jcf.pm>  Thu, 01 Mar 2012 21:36:17 +0100
+ -- JCF Ploemen (jcfp) <linux at jcf.pm>  Mon, 21 May 2012 21:35:18 +0200
 
 sabnzbdplus (0.6.15-1) unstable; urgency=low
 

Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control	2012-05-21 07:34:53 UTC (rev 8740)
+++ packages/sabnzbdplus/trunk/debian/control	2012-05-21 19:49:50 UTC (rev 8741)
@@ -29,6 +29,7 @@
  sabnzbdplus-theme-smpl
 Suggests:
  sabnzbdplus-theme-mobile,
+ python-notify,
  python-dbus
 Description: web-based binary newsgrabber with nzb support
  SABnzbd+ is a web-based binary newsgrabber written in Python, with support for

Modified: packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff	2012-05-21 07:34:53 UTC (rev 8740)
+++ packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff	2012-05-21 19:49:50 UTC (rev 8741)
@@ -11,7 +11,7 @@
      sys.exit(1)
 --- a/sabnzbd/constants.py
 +++ b/sabnzbd/constants.py
-@@ -77,10 +77,10 @@
+@@ -78,10 +78,10 @@
  DEF_ADMIN_DIR    = 'admin'
  DEF_LOG_DIR      = 'logs'
  DEF_NZBBACK_DIR  = ''
@@ -22,6 +22,6 @@
  DEF_INT_LANGUAGE = 'locale'
 -DEF_EMAIL_TMPL   = 'email'
 +DEF_EMAIL_TMPL   = '../share/sabnzbdplus/email'
+ DEF_STDCONFIG    = 'Config'
  DEF_STDINTF      = 'Plush'
  DEF_SKIN_COLORS  = {'smpl':'white', 'classic':'darkblue', 'mobile':'light', 'plush' : 'gold'}
- DEF_MAIN_TMPL    = 'templates/main.tmpl'

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2012-05-21 07:34:53 UTC (rev 8740)
+++ packages/sabnzbdplus/trunk/debian/rules	2012-05-21 19:49:50 UTC (rev 8741)
@@ -37,6 +37,7 @@
 	dh_install \
 		--exclude=static/MochiKit/ \
 		--exclude=wizard/README.TXT \
+		--exclude=Config/README.txt \
 		--exclude=utils/feedparser.py \
 		--exclude=utils/configobj.py \
 		--exclude=excanvas/excanvas.js \

Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.1
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.1	2012-05-21 07:34:53 UTC (rev 8740)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.1	2012-05-21 19:49:50 UTC (rev 8741)
@@ -44,7 +44,7 @@
 .IP "\-2  \-\-template2 <template>"
 Secondary templates, available at http://<host>:<port>/sabnzbd/m
 .IP "\-l  \-\-logging <0..2>"
-Log level (0 for least, 2 for most)
+Log level (\-1 for off, 0 for least, 2 for most)
 .IP "\-w  \-\-weblogging <0..2>"
 Cherrypy (built\-in web\-server) logging (0 for off, 1 for on, 2 for file\-only)
 .IP "\-b  \-\-browser <0..1>"

Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.install	2012-05-21 07:34:53 UTC (rev 8740)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.install	2012-05-21 19:49:50 UTC (rev 8741)
@@ -1,6 +1,9 @@
 # configuration wizard
 interfaces/wizard /usr/share/sabnzbdplus/interfaces/
 
+# config interface
+interfaces/Config /usr/share/sabnzbdplus/interfaces/
+
 # python stuff (as private pure-python module)
 sabnzbd /usr/share/sabnzbdplus/