[Python-apps-commits] r7107 - in packages/sabnzbdplus/trunk/debian (15 files)
jcfp-guest at users.alioth.debian.org
jcfp-guest at users.alioth.debian.org
Mon May 16 18:37:29 UTC 2011
Date: Monday, May 16, 2011 @ 18:37:09
Author: jcfp-guest
Revision: 7107
Prep for new upstream release 0.6.1
Added:
packages/sabnzbdplus/trunk/debian/sabnzbdplus.desktop
packages/sabnzbdplus/trunk/debian/sabnzbdplus.menu
Modified:
packages/sabnzbdplus/trunk/debian/changelog
packages/sabnzbdplus/trunk/debian/control
packages/sabnzbdplus/trunk/debian/copyright
packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.dpatch
packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.dpatch
packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch
packages/sabnzbdplus/trunk/debian/rules
packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-classic.install
packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-mobile.install
packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-plush.install
packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.install
packages/sabnzbdplus/trunk/debian/sabnzbdplus.1
packages/sabnzbdplus/trunk/debian/sabnzbdplus.install
Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/changelog 2011-05-16 18:37:09 UTC (rev 7107)
@@ -1,14 +1,25 @@
-sabnzbdplus (0.5.6-2) UNRELEASED; urgency=low
+sabnzbdplus (0.6.1-1) UNRELEASED; urgency=low
+ * New upstream release:
+ + Updating copyright, man page, and patches 02, 06, and 08 to match.
+ * Switch from dh_pysupport to dh_python2.
+ * Adding menu entries.
* Init script:
- + Properly read the exit status of mktemp.
+ Permit setting a group too (chown syntax, USER=u:g).
- * Allow all Python 2.x versions >= 2.4.
- * debian/rules: replace dh_clean -k with dh_prep.
- * Require debhelper 7.0.0 (for dh_prep).
- * Switch from dh_pysupport to dh_python2.
+ * debian/rules:
+ + Replace dh_clean -k with dh_prep.
+ + Generate translations on build.
+ + Install menu entries.
+ * debian/control:
+ + Allow all Python 2.x versions >= 2.5.
+ + Build-depend on imagemagick, for converting icons.
+ + Downgrade smpl dependency to recommended, and make plush a hard
+ dependency (plush is the default and fallback theme in >= 0.6.0).
+ + Require debhelper 7.0.0 (for dh_prep).
+ + Drop transitional package sabnzbdplus-theme-iphone.
+ * Bumped Standards-Version to 3.9.2 (no changes needed).
- -- JCF Ploemen (jcfp) <linux at jp.pp.ru> Thu, 21 Apr 2011 21:47:04 +0200
+ -- JCF Ploemen (jcfp) <linux at jp.pp.ru> Mon, 16 May 2011 18:24:15 +0200
sabnzbdplus (0.5.6-1) unstable; urgency=low
Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/control 2011-05-16 18:37:09 UTC (rev 7107)
@@ -4,9 +4,9 @@
Priority: optional
Maintainer: JCF Ploemen (jcfp) <linux at jp.pp.ru>
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.0), dpatch, python (>= 2.6.6-3)
-Standards-Version: 3.9.1
-X-Python-Version: >= 2.4
+Build-Depends: debhelper (>= 7.0.0), dpatch, python (>= 2.6.6-3), imagemagick
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.5
Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/sabnzbdplus/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/sabnzbdplus/trunk/
@@ -18,7 +18,7 @@
python-cheetah (>= 2.0.1),
python-configobj,
python-feedparser,
- sabnzbdplus-theme-smpl (= ${source:Version})
+ sabnzbdplus-theme-plush (= ${source:Version})
Recommends:
python-yenc (>= 0.3),
python-openssl (>= 0.6),
@@ -26,7 +26,7 @@
par2 (>= 0.4),
unrar (>= 3.8.0) | rar (>= 3.8.0),
sabnzbdplus-theme-classic,
- sabnzbdplus-theme-plush
+ sabnzbdplus-theme-smpl
Suggests:
sabnzbdplus-theme-mobile,
python-dbus
@@ -49,9 +49,8 @@
Package: sabnzbdplus-theme-plush
Architecture: all
Depends:
- ${misc:Depends},
- sabnzbdplus (= ${source:Version})
-Enhances: sabnzbdplus
+ ${misc:Depends}
+Recommends: 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
@@ -66,8 +65,9 @@
Depends:
${misc:Depends},
libjs-mochikit (>= 1.4),
- libjs-excanvas
-Recommends: sabnzbdplus
+ libjs-excanvas,
+ sabnzbdplus (= ${source:Version})
+Enhances: sabnzbdplus
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
@@ -78,24 +78,14 @@
This package contains the smpl interface templates, as distributed with
the SABnzbd+ program releases.
-Package: sabnzbdplus-theme-iphone
-# to be removed after the latest supported upgrade path from 0.4.x is gone
-Architecture: all
-Depends:
- ${misc:Depends},
- sabnzbdplus-theme-mobile
-Description: transitional package for migration to sabnzbdplus-theme-mobile
- Transitional package for users of the former iphone interface templates for
- the 0.4.x series of the SABnzbd+ binary newsgrabber to its successor, Mobile.
- .
- This dummy package may be safely removed after upgrading.
-
Package: sabnzbdplus-theme-mobile
Architecture: all
Depends:
${misc:Depends},
sabnzbdplus (= ${source:Version})
Enhances: sabnzbdplus
+Conflicts: sabnzbdplus-theme-iphone
+Replaces: sabnzbdplus-theme-iphone
Description: mobile interface templates for the SABnzbd+ binary newsgrabber
Mobile is a set of interface templates for the SABnzbd+ binary newsgrabber,
specifically designed for use with mobile devices.
Modified: packages/sabnzbdplus/trunk/debian/copyright
===================================================================
--- packages/sabnzbdplus/trunk/debian/copyright 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/copyright 2011-05-16 18:37:09 UTC (rev 7107)
@@ -8,7 +8,7 @@
The SABnzbd-Team <team at sabnzbd.org>
Copyright:
- Copyright (C) 2007-2010 by The SABnzbd-Team <team at sabnzbd.org>
+ Copyright (C) 2007-2011 by The SABnzbd-Team <team at sabnzbd.org>
License:
This program is free software; you can redistribute it and/or
@@ -78,7 +78,7 @@
* sabnzbd/utils/listquote.py
Copyright (C) 2004, 2005 by Michael Foord <fuzzyman at voidspace.org.uk>
License:
- Copyright (c) 2003-2007, Michael Foord
+ Copyright (c) 2003-2010, Michael Foord
All rights reserved.
E-mail : fuzzyman AT voidspace DOT org DOT uk
@@ -112,10 +112,10 @@
* sabnzbd/utils/configobj.py
- Copyright (C) 2003-2007 by Michael Foord <fuzzyman at voidspace.org.uk>,
- Copyright (C) 2003-2007 by Nicola Larosa <nico at tekNico.net>
+ Copyright (C) 2005-2010 by Michael Foord <fuzzyman at voidspace.org.uk>,
+ Copyright (C) 2005-2010 by Nicola Larosa <nico at tekNico.net>
License:
- Copyright (c) 2003-2007, Michael Foord and Nicola Larosa
+ Copyright (c) 2003-2010, Michael Foord and Nicola Larosa
All rights reserved.
E-mail : fuzzyman AT voidspace DOT org DOT uk
@@ -205,6 +205,13 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* tools/msgfmt.py
+ Author: Martin v. Löwis <loewis at informatik.hu-berlin.de>
+ "The file tools/msgfmt.py was taken from the Python for Windows distribution
+ and is covered by the general Python license."
+License: PSF
+
+
* interfaces/Plush/*
* interfaces/Mobile/*
Copyright (C) by pairofdimes <pairofdimes at sabnzbd.org>
@@ -234,14 +241,14 @@
License: as the jQuery jQTouch Plugin: MIT
-* interfaces/Plush/templates/static/images/plush-default/sprite-jq-colorbox.png
+* interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/colorbox-*.png
Copyright (C) 2009 by Jack Moore
This image is composed of images released as part of the jQuery
ColorBox plugin, available from http://colorpowered.com/colorbox/
License: MIT
-* interfaces/Plush/templates/static/images/plush-default/sprite-config.png
+* interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-config.png
(composed of graphics from the Nuvola icon set)
* interfaces/smpl/templates/static/images/nuvola/*
* interfaces/smpl/templates/static/images/messagebox_critical.png
@@ -276,7 +283,7 @@
License: triple-licensed MIT, BSD-sizzle, GPL-2
-* interfaces/Plush/templates/static/javascripts/plush-config.js
+* interfaces/Plush/templates/static/javascripts/lib.js
This file contains code from a number of different sources:
"jquery"
Copyright (C) 2009 by John Resig
@@ -286,33 +293,19 @@
Copyright (C) 2009 by The Dojo Foundation
Origin: http://sizzlejs.com
License: triple-licensed MIT, BSD-sizzle, GPL-2
- "jquery ColorBox"
- Copyright (C) 2009 by Jack Moore
- Origin: http://colorpowered.com/colorbox/
-License: MIT
- "jQuery corner plugin: simple corner rounding"
- Copyright (C) 2009 by Dave Methvin,
- Copyright (C) 2009 by Mike Alsup
- Origin: http://jquery.malsup.com/corner/
+ "jQuery UI",
+ "jQuery UI Widget",
+ "jQuery UI Button",
+ "jQuery UI Tabs"
+ Copyright (C) 2011 by AUTHORS.txt (http://jqueryui.com/about)
+ Origin: http://jqueryui.com
License: dual-licensed MIT, GPL-2
-
-
-* interfaces/Plush/templates/static/javascripts/plush.js
-This file contains code from a number of different sources:
- "jquery"
- Copyright (C) 2009 by John Resig
- Origin: http://jquery.com
-License: dual-licensed MIT, GPL-2
- "Sizzle CSS Selector Engine"
- Copyright (C) 2009 by The Dojo Foundation
- Origin: http://sizzlejs.com
-License: triple-licensed MIT, BSD-sizzle, GPL-2
"jquery ColorBox"
- Copyright (C) 2009 by Jack Moore
+ Copyright (C) 2010 by Jack Moore <jack at colorpowered.com>
Origin: http://colorpowered.com/colorbox/
License: MIT
"jQuery Cookie plugin"
- Copyright (C) 2006 by Klaus Hartl
+ Copyright (C) 2006 by Klaus Hartl (stilbuero.de)
Origin: http://stilbuero.de, http://plugins.jquery.com/project/Cookie
License: dual-licensed MIT, GPL-2
"jQuery hoverIntent"
@@ -320,7 +313,7 @@
Origin: http://cherne.net/brian/resources/jquery.hoverIntent.html
License: dual-licensed MIT, GPL-2
"jQuery LiveQuery"
- Copyright (C) 2008 by Brandon Aaron
+ Copyright (C) 2010 by Brandon Aaron
Origin: http://brandonaaron.net/code
License: dual-licensed MIT, GPL-2
"Pagination jQuery plugin"
@@ -346,6 +339,15 @@
License: GPL-3+
+* interfaces/Plush/templates/static/stylesheets/jqueryui/
+ "jQuery UI CSS Framework",
+ "jQuery UI Button",
+ "jQuery UI Tabs"
+ (including all images)
+ Copyright (C) 2010 jQuery UI Team
+License: dual-licensed MIT, GPL-2
+
+
* interfaces/smpl/templates/static/PlotKit/PlotKit.js
Copyright (C) 2005,2006 by Alastair Tse <alastair^liquidx.net>
License:
@@ -1295,3 +1297,53 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
+
+PSF:
+ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ --------------------------------------------
+
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using this software ("Python") in source or binary form and
+ its associated documentation.
+
+ 2. Subject to the terms and conditions of this License Agreement, PSF hereby
+ grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+ analyze, test, perform and/or display publicly, prepare derivative works,
+ distribute, and otherwise use Python alone or in any derivative version,
+ provided, however, that PSF's License Agreement and PSF's notice of copyright,
+ i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Python Software Foundation; All Rights Reserved" are retained in Python alone or
+ in any derivative version prepared by Licensee.
+
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python.
+
+ 4. PSF is making Python available to Licensee on an "AS IS"
+ basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee. This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+
+ 8. By copying, installing or otherwise using Python, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
Modified: packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.dpatch
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.dpatch 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.dpatch 2011-05-16 18:37:09 UTC (rev 7107)
@@ -5,28 +5,31 @@
## DP: make the program find the interface templates, private python modules under /usr/share
@DPATCH@
-diff -urNad sabnzbdplus-0.5.0~alpha7~/SABnzbd.py sabnzbdplus-0.5.0~alpha7/SABnzbd.py
---- sabnzbdplus-0.5.0~alpha7~/SABnzbd.py 2009-10-27 19:52:13.000000000 +0100
-+++ sabnzbdplus-0.5.0~alpha7/SABnzbd.py 2009-10-29 20:16:17.545578437 +0100
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sabnzbdplus-0.6.0~alpha9~/SABnzbd.py sabnzbdplus-0.6.0~alpha9/SABnzbd.py
+--- sabnzbdplus-0.6.0~alpha9~/SABnzbd.py 2010-12-27 23:03:29.000000000 +0100
++++ sabnzbdplus-0.6.0~alpha9/SABnzbd.py 2010-12-28 19:15:13.295229001 +0100
@@ -16,6 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import sys
+sys.path.insert(0,'/usr/share/sabnzbdplus')
- if sys.version_info < (2,4):
- print "Sorry, requires Python 2.4 or higher."
+ if sys.version_info < (2,5):
+ print "Sorry, requires Python 2.5 or higher."
sys.exit(1)
-diff -urNad sabnzbdplus-0.5.0~alpha7~/sabnzbd/constants.py sabnzbdplus-0.5.0~alpha7/sabnzbd/constants.py
---- sabnzbdplus-0.5.0~alpha7~/sabnzbd/constants.py 2009-10-29 20:16:16.935578949 +0100
-+++ sabnzbdplus-0.5.0~alpha7/sabnzbd/constants.py 2009-10-29 20:16:17.545578437 +0100
-@@ -67,8 +67,8 @@
- DEF_CACHE_DIR = 'cache'
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sabnzbdplus-0.6.0~alpha9~/sabnzbd/constants.py sabnzbdplus-0.6.0~alpha9/sabnzbd/constants.py
+--- sabnzbdplus-0.6.0~alpha9~/sabnzbd/constants.py 2010-12-27 23:03:29.000000000 +0100
++++ sabnzbdplus-0.6.0~alpha9/sabnzbd/constants.py 2010-12-28 19:14:22.685229002 +0100
+@@ -75,10 +75,10 @@
+ DEF_ADMIN_DIR = 'admin'
DEF_LOG_DIR = 'logs'
DEF_NZBBACK_DIR = ''
--DEF_LANGUAGE = 'language'
+-DEF_LANGUAGE = 'locale'
-DEF_INTERFACES = 'interfaces'
-+DEF_LANGUAGE = '../share/sabnzbdplus/language'
++DEF_LANGUAGE = '../share/sabnzbdplus/locale'
+DEF_INTERFACES = '../share/sabnzbdplus/interfaces'
- DEF_INT_LANGUAGE = 'language'
+ DEF_INT_LANGUAGE = 'locale'
+-DEF_EMAIL_TMPL = 'email'
++DEF_EMAIL_TMPL = '../share/sabnzbdplus/email'
DEF_STDINTF = 'smpl'
- DEF_SKIN_COLORS = {'smpl':'white', 'classic':'darkblue', 'mobile':'light'}
+ DEF_SKIN_COLORS = {'smpl':'white', 'classic':'darkblue', 'mobile':'light', 'plush' : 'gold'}
+ DEF_MAIN_TMPL = 'templates/main.tmpl'
Modified: packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.dpatch
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.dpatch 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.dpatch 2011-05-16 18:37:09 UTC (rev 7107)
@@ -5,27 +5,27 @@
## DP: Use system python modules rather than included copies.
@DPATCH@
-diff -urNad sabnzbdplus-0.5.0~alpha10~/sabnzbd/config.py sabnzbdplus-0.5.0~alpha10/sabnzbd/config.py
---- sabnzbdplus-0.5.0~alpha10~/sabnzbd/config.py 2009-11-16 22:54:35.749246121 +0100
-+++ sabnzbdplus-0.5.0~alpha10/sabnzbd/config.py 2009-11-16 22:54:36.259247394 +0100
-@@ -24,7 +24,7 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sabnzbdplus-0.6.0~alpha2~/sabnzbd/config.py sabnzbdplus-0.6.0~alpha2/sabnzbd/config.py
+--- sabnzbdplus-0.6.0~alpha2~/sabnzbd/config.py 2010-09-24 20:27:45.000000000 +0200
++++ sabnzbdplus-0.6.0~alpha2/sabnzbd/config.py 2010-09-25 10:31:29.404460001 +0200
+@@ -25,7 +25,7 @@
import sabnzbd.misc
import sabnzbd.constants as constants
from sabnzbd.utils import listquote
-from sabnzbd.utils import configobj
+import configobj
from sabnzbd.decorators import synchronized
- from sabnzbd.lang import Ta
-diff -urNad sabnzbdplus-0.5.0~alpha10~/sabnzbd/rss.py sabnzbdplus-0.5.0~alpha10/sabnzbd/rss.py
---- sabnzbdplus-0.5.0~alpha10~/sabnzbd/rss.py 2009-11-16 22:54:35.759244321 +0100
-+++ sabnzbdplus-0.5.0~alpha10/sabnzbd/rss.py 2009-11-16 22:54:36.259247394 +0100
-@@ -30,7 +30,7 @@
- import sabnzbd.cfg as cfg
- import sabnzbd.misc as misc
+ CONFIG_LOCK = threading.Lock()
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sabnzbdplus-0.6.0~alpha2~/sabnzbd/rss.py sabnzbdplus-0.6.0~alpha2/sabnzbd/rss.py
+--- sabnzbdplus-0.6.0~alpha2~/sabnzbd/rss.py 2010-09-24 20:27:45.000000000 +0200
++++ sabnzbdplus-0.6.0~alpha2/sabnzbd/rss.py 2010-09-25 10:33:19.844460002 +0200
+@@ -33,7 +33,7 @@
+ import sabnzbd.emailer as emailer
+ from sabnzbd.encoding import latin1, unicoder
-import sabnzbd.utils.feedparser as feedparser
+import feedparser
- from sabnzbd.lang import T, Ta
__RSS = None # Global pointer to RSS-scanner instance
+
Modified: packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch 2011-05-16 18:37:09 UTC (rev 7107)
@@ -5,15 +5,16 @@
## DP: Disable the builtin check for newer versions.
@DPATCH@
-diff -urNad sabnzbdplus-0.5.0~alpha6~/sabnzbd/misc.py sabnzbdplus-0.5.0~alpha6/sabnzbd/misc.py
---- sabnzbdplus-0.5.0~alpha6~/sabnzbd/misc.py 2009-10-07 20:44:30.778971249 +0200
-+++ sabnzbdplus-0.5.0~alpha6/sabnzbd/misc.py 2009-10-07 20:45:21.838971352 +0200
-@@ -506,6 +506,8 @@
- return
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sabnzbdplus-0.6.0~alpha2~/sabnzbd/misc.py sabnzbdplus-0.6.0~alpha2/sabnzbd/misc.py
+--- sabnzbdplus-0.6.0~alpha2~/sabnzbd/misc.py 2010-09-24 20:27:45.000000000 +0200
++++ sabnzbdplus-0.6.0~alpha2/sabnzbd/misc.py 2010-09-25 21:09:16.894460002 +0200
+@@ -708,6 +708,9 @@
- current, testver = convert_version(sabnzbd.__version__)
+ def check_latest_version():
+ """ Do an online check for the latest version """
+ logging.debug("Version check disabled by Ubuntu/Debian packaging")
+ return
- if not current:
- logging.debug("Unsupported release number (%s), will not check", sabnzbd.__version__)
++
+ if not cfg.version_check():
return
+
Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/rules 2011-05-16 18:37:09 UTC (rev 7107)
@@ -15,8 +15,9 @@
clean: unpatch
dh_testdir
dh_testroot
- rm -rf build/
- find . -name "*.pyc" -exec rm -f {} \;
+ rm -rf build/ locale/
+ find . -wholename "./email/*.tmpl" ! -name "*-en.tmpl" -delete
+ find . -name "*.pyc" -delete
dh_clean
install: build install-prereq install-main install-finish
@@ -27,13 +28,19 @@
dh_prep
install-main: install-prereq
+ # Generate translations
+ python tools/make_mo.py
+ find locale -type d -empty -delete
+ # Create icons, 32x32 xpm for Debian menu, 48x48 png for XDG menu
+ convert -resize 32x32 interfaces/wizard/static/images/icon_sab.png sabnzbdplus.xpm
+ convert -resize 48x48 interfaces/wizard/static/images/icon_sab.png sabnzbdplus.png
dh_install \
--exclude=static/MochiKit/ \
--exclude=wizard/README.TXT \
--exclude=utils/feedparser.py \
--exclude=utils/configobj.py \
--exclude=excanvas/excanvas.js \
- --exclude=images/plush-default-split.tar.gz \
+ --exclude=images-split.tar.gz \
--exclude=cherrypy/LICENSE.txt \
--exclude=cherrypy/cherryd \
--exclude=cherrypy/scaffold
@@ -55,6 +62,8 @@
dh_installexamples -i
dh_installman -i
dh_link -i
+ dh_icons -i
+ dh_installmenu -i
dh_lintian -i
dh_python2 -i
dh_installinit -i -- defaults 98 02
Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-classic.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-classic.install 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-classic.install 2011-05-16 18:37:09 UTC (rev 7107)
@@ -1,3 +1 @@
interfaces/Classic/templates /usr/share/sabnzbdplus/interfaces/Classic/
-# (veurleupug?) gein vortaolinge
-#interfaces/Classic/language /usr/share/sabnzbdplus/interfaces/Classic/
Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-mobile.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-mobile.install 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-mobile.install 2011-05-16 18:37:09 UTC (rev 7107)
@@ -1,2 +1 @@
interfaces/Mobile/templates /usr/share/sabnzbdplus/interfaces/Mobile/
-interfaces/Mobile/language /usr/share/sabnzbdplus/interfaces/Mobile/
Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-plush.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-plush.install 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-plush.install 2011-05-16 18:37:09 UTC (rev 7107)
@@ -1,2 +1 @@
interfaces/Plush/templates /usr/share/sabnzbdplus/interfaces/Plush/
-interfaces/Plush/language /usr/share/sabnzbdplus/interfaces/Plush/
Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.install 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus-theme-smpl.install 2011-05-16 18:37:09 UTC (rev 7107)
@@ -1,2 +1 @@
interfaces/smpl/templates /usr/share/sabnzbdplus/interfaces/smpl/
-interfaces/smpl/language /usr/share/sabnzbdplus/interfaces/smpl/
Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.1
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.1 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.1 2011-05-16 18:37:09 UTC (rev 7107)
@@ -13,7 +13,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-.TH SABNZBDPLUS 1 "August 2010" "Version 0.5.x"
+.TH SABNZBDPLUS 1 "May 2011" "Version 0.6.1"
.SH NAME
sabnzbdplus \- a web\-based binary newsgrabber with nzb support.
@@ -51,6 +51,8 @@
Automatically launch browser (0 for off, 1 for on)
.IP "\-d \-\-daemon"
Fork daemon process (run the program in the background)
+.IP "\-\-pid <path>"
+Create a pid file in the listed folder (full path)
.IP "\-\-force"
Discard web\-port timeout
.IP "\-v \-\-version"
@@ -61,6 +63,10 @@
Start paused
.IP "\-\-https <port>"
Port to listen on for https connections
+.IP "\-\-repair"
+Add orphaned jobs from the incomplete folder to the queue
+.IP "\-\-repair\-all"
+Try to reconstruct the queue from the incomplete folder with full data reconstruction
.IP "\-\-log\-all"
Log all article handling (for developers)
@@ -69,7 +75,7 @@
.RS
Default location for the program's configuration file and internal administration
.RE
-.I ~/downloads/
+.I ~/Downloads/
.RS
Default location for downloaded files
.RE
Added: packages/sabnzbdplus/trunk/debian/sabnzbdplus.desktop
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.desktop (rev 0)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.desktop 2011-05-16 18:37:09 UTC (rev 7107)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=SABnzbd+
+GenericName=Binary newsgrabber
+Comment=Download from usenet
+Exec=sabnzbdplus --browser 1
+Icon=sabnzbdplus
+Terminal=false
+Type=Application
+Categories=Network;FileTransfer;
Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.install 2011-05-16 01:37:01 UTC (rev 7106)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.install 2011-05-16 18:37:09 UTC (rev 7107)
@@ -8,7 +8,15 @@
SABnzbd.py /usr/bin/
# translations
-language /usr/share/sabnzbdplus/
+locale /usr/share/sabnzbdplus/
+# email templates
+email /usr/share/sabnzbdplus/
+
# tmp: patched cherrypy svn included by upstream
cherrypy /usr/share/sabnzbdplus/
+
+# desktop file, menu icons
+debian/sabnzbdplus.desktop /usr/share/applications/
+sabnzbdplus.xpm /usr/share/pixmaps/
+sabnzbdplus.png /usr/share/pixmaps/
Added: packages/sabnzbdplus/trunk/debian/sabnzbdplus.menu
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.menu (rev 0)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.menu 2011-05-16 18:37:09 UTC (rev 7107)
@@ -0,0 +1,5 @@
+?package(sabnzbdplus):needs="X11" \
+ section="Applications/Network/File Transfer" \
+ title="SABnzbd+" \
+ command="/usr/bin/sabnzbdplus --browser 1" \
+ icon="/usr/share/pixmaps/sabnzbdplus.xpm"
More information about the Python-apps-commits
mailing list