[Python-apps-commits] r7488 - in packages/sabnzbdplus/trunk/debian (15 files)

jcfp-guest at users.alioth.debian.org jcfp-guest at users.alioth.debian.org
Fri Aug 26 15:49:29 UTC 2011


    Date: Friday, August 26, 2011 @ 15:49:27
  Author: jcfp-guest
Revision: 7488

Switch to source format 3.0 (quilt)

Added:
  packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff
  packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff
  packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
  packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
  packages/sabnzbdplus/trunk/debian/patches/series
Modified:
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/control
  packages/sabnzbdplus/trunk/debian/rules
  packages/sabnzbdplus/trunk/debian/source/format
Deleted:
  packages/sabnzbdplus/trunk/debian/README.source
  packages/sabnzbdplus/trunk/debian/patches/00list
  packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.dpatch
  packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.dpatch
  packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.dpatch
  packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch

Deleted: packages/sabnzbdplus/trunk/debian/README.source
===================================================================
--- packages/sabnzbdplus/trunk/debian/README.source	2011-08-26 15:03:34 UTC (rev 7487)
+++ packages/sabnzbdplus/trunk/debian/README.source	2011-08-26 15:49:27 UTC (rev 7488)
@@ -1,33 +0,0 @@
-== Patch system ==
-
-This package is using dpatch patch system. 
-
-To patch the source:
- * debian/rules patch
-To add a new patch:
- * put it under debian/patches
- * add it to debian/patches/00list
-
-See /usr/share/doc/dpatch/README.source.gz for more information.
-
-
-== Init script ==
-
-Properly handling shutdown of the program from the init script
-is complicated by the program's new builtin option of restarting
-from its web interface. This causes it to forget python options
-(like -OO), as well as change its command line, pid, and stuff
-in /proc/$pid/ that start-stop-daemon relies on for identifying
-which pid to act on. As a result, we cannot rely on any of those,
-and instead use pgrep and a makeshift pidfile to make sure
-start-stop-daemon gets it right after all.
-
-
-== Suggested vs. Recommended -theme packages ==
-
-The mobile interface is suggested rather than recommended
-because it cannot be selected in the configuration wizard
-(like smpl and Plush). Upstream's choice here makes sense,
-since mobile only implements a limited subset of the
-functionality and configuration options available in the
-program.

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2011-08-26 15:03:34 UTC (rev 7487)
+++ packages/sabnzbdplus/trunk/debian/changelog	2011-08-26 15:49:27 UTC (rev 7488)
@@ -1,3 +1,9 @@
+sabnzbdplus (0.6.8-2) UNRELEASED; urgency=low
+
+  * Switch to source format 3.0 (quilt).
+
+ -- JCF Ploemen (jcfp) <linux at jp.pp.ru>  Fri, 26 Aug 2011 17:37:22 +0200
+
 sabnzbdplus (0.6.8-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control	2011-08-26 15:03:34 UTC (rev 7487)
+++ packages/sabnzbdplus/trunk/debian/control	2011-08-26 15:49:27 UTC (rev 7488)
@@ -4,7 +4,7 @@
 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), imagemagick
+Build-Depends: debhelper (>= 7.0.0), 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/

Deleted: packages/sabnzbdplus/trunk/debian/patches/00list
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/00list	2011-08-26 15:03:34 UTC (rev 7487)
+++ packages/sabnzbdplus/trunk/debian/patches/00list	2011-08-26 15:49:27 UTC (rev 7488)
@@ -1,4 +0,0 @@
-02_find_parts_in_usr_share.dpatch
-04_use_config_when_daemon.dpatch
-06_use_packaged_modules.dpatch
-08_disable_new_version_check.dpatch

Added: packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff	                        (rev 0)
+++ packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff	2011-08-26 15:49:27 UTC (rev 7488)
@@ -0,0 +1,27 @@
+# Make the program find the interface templates, private python modules under /usr/share
+--- a/SABnzbd.py
++++ b/SABnzbd.py
+@@ -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,5):
+     print "Sorry, requires Python 2.5 or higher."
+     sys.exit(1)
+--- a/sabnzbd/constants.py
++++ b/sabnzbd/constants.py
+@@ -77,10 +77,10 @@
+ DEF_ADMIN_DIR    = 'admin'
+ DEF_LOG_DIR      = 'logs'
+ DEF_NZBBACK_DIR  = ''
+-DEF_LANGUAGE     = 'locale'
+-DEF_INTERFACES   = 'interfaces'
++DEF_LANGUAGE     = '../share/sabnzbdplus/locale'
++DEF_INTERFACES   = '../share/sabnzbdplus/interfaces'
+ DEF_INT_LANGUAGE = 'locale'
+-DEF_EMAIL_TMPL   = 'email'
++DEF_EMAIL_TMPL   = '../share/sabnzbdplus/email'
+ DEF_STDINTF      = 'Plush'
+ DEF_SKIN_COLORS  = {'smpl':'white', 'classic':'darkblue', 'mobile':'light', 'plush' : 'gold'}
+ DEF_MAIN_TMPL    = 'templates/main.tmpl'

Deleted: 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-08-26 15:03:34 UTC (rev 7487)
+++ packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.dpatch	2011-08-26 15:49:27 UTC (rev 7488)
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_find_parts_in_usr_share.dpatch by JCF Ploemen <linux at jp.pp.ru>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: make the program find the interface templates, private python modules under /usr/share
-
- at DPATCH@
-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,5):
-     print "Sorry, requires Python 2.5 or higher."
-     sys.exit(1)
-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     = 'locale'
--DEF_INTERFACES   = 'interfaces'
-+DEF_LANGUAGE     = '../share/sabnzbdplus/locale'
-+DEF_INTERFACES   = '../share/sabnzbdplus/interfaces'
- DEF_INT_LANGUAGE = 'locale'
--DEF_EMAIL_TMPL   = 'email'
-+DEF_EMAIL_TMPL   = '../share/sabnzbdplus/email'
- DEF_STDINTF      = 'Plush'
- DEF_SKIN_COLORS  = {'smpl':'white', 'classic':'darkblue', 'mobile':'light', 'plush' : 'gold'}
- DEF_MAIN_TMPL    = 'templates/main.tmpl'

Added: packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff	                        (rev 0)
+++ packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff	2011-08-26 15:49:27 UTC (rev 7488)
@@ -0,0 +1,25 @@
+# Use the normal configuration when run as a daemon
+--- a/SABnzbd.py
++++ b/SABnzbd.py
+@@ -374,20 +374,7 @@
+     """ Get the default data locations
+     """
+     ok = False
+-    if sabnzbd.DAEMON:
+-        # In daemon mode, do not try to access the user profile
+-        # just assume that everything defaults to the program dir
+-        sabnzbd.DIR_APPDATA = sabnzbd.DIR_PROG
+-        sabnzbd.DIR_LCLDATA = sabnzbd.DIR_PROG
+-        sabnzbd.DIR_HOME = sabnzbd.DIR_PROG
+-        if sabnzbd.WIN32:
+-            # Ignore Win32 "logoff" signal
+-            # This should work, but it doesn't
+-            # Instead the signal_handler will ignore the "logoff" signal
+-            #signal.signal(5, signal.SIG_IGN)
+-            pass
+-        ok = True
+-    elif sabnzbd.WIN32:
++    if sabnzbd.WIN32:
+         specials = get_user_shellfolders()
+         try:
+             sabnzbd.DIR_APPDATA = '%s\\%s' % (specials['AppData'], DEF_WORKDIR)

Deleted: packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.dpatch
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.dpatch	2011-08-26 15:03:34 UTC (rev 7487)
+++ packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.dpatch	2011-08-26 15:49:27 UTC (rev 7488)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_use_config_when_daemon.dpatch by JCF Ploemen (jcfp) <linux at jp.pp.ru>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use the normal configuration when run as a daemon
-
- at DPATCH@
-diff -urNad sabnzbdplus-0.5.0~alpha3~/SABnzbd.py sabnzbdplus-0.5.0~alpha3/SABnzbd.py
---- sabnzbdplus-0.5.0~alpha3~/SABnzbd.py	2009-06-03 20:59:44.000000000 +0200
-+++ sabnzbdplus-0.5.0~alpha3/SABnzbd.py	2009-06-03 21:01:09.000000000 +0200
-@@ -284,20 +284,7 @@
-     """ Get the default data locations
-     """
-     ok = False
--    if sabnzbd.DAEMON:
--        # In daemon mode, do not try to access the user profile
--        # just assume that everything defaults to the program dir
--        sabnzbd.DIR_APPDATA = sabnzbd.DIR_PROG
--        sabnzbd.DIR_LCLDATA = sabnzbd.DIR_PROG
--        sabnzbd.DIR_HOME = sabnzbd.DIR_PROG
--        if sabnzbd.WIN32:
--            # Ignore Win32 "logoff" signal
--            # This should work, but it doesn't
--            # Instead the signal_handler will ignore the "logoff" signal
--            #signal.signal(5, signal.SIG_IGN)
--            pass
--        ok = True
--    elif sabnzbd.WIN32:
-+    if sabnzbd.WIN32:
-         specials = get_user_shellfolders()
-         try:
-             sabnzbd.DIR_APPDATA = '%s\\%s' % (specials['AppData'], DEF_WORKDIR)

Added: packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff	                        (rev 0)
+++ packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff	2011-08-26 15:49:27 UTC (rev 7488)
@@ -0,0 +1,23 @@
+# Use system python modules rather than included copies.
+--- a/sabnzbd/config.py
++++ b/sabnzbd/config.py
+@@ -25,7 +25,7 @@
+ import sabnzbd.misc
+ from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY
+ from sabnzbd.utils import listquote
+-from sabnzbd.utils import configobj
++import configobj
+ from sabnzbd.decorators import synchronized
+ 
+ CONFIG_LOCK = threading.Lock()
+--- a/sabnzbd/rss.py
++++ b/sabnzbd/rss.py
+@@ -35,7 +35,7 @@
+ import sabnzbd.emailer as emailer
+ from sabnzbd.encoding import latin1, unicoder, xml_name
+ 
+-import sabnzbd.utils.feedparser as feedparser
++import feedparser
+ 
+ __RSS = None  # Global pointer to RSS-scanner instance
+ 

Deleted: packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.dpatch
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.dpatch	2011-08-26 15:03:34 UTC (rev 7487)
+++ packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.dpatch	2011-08-26 15:49:27 UTC (rev 7488)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_use_packaged_modules.dpatch by JCF Ploemen (jcfp) <linux at jp.pp.ru>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use system python modules rather than included copies.
-
- at DPATCH@
-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
- 
- 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
- 
- __RSS = None  # Global pointer to RSS-scanner instance
- 

Added: packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff	                        (rev 0)
+++ packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff	2011-08-26 15:49:27 UTC (rev 7488)
@@ -0,0 +1,13 @@
+# Disable the builtin check for newer versions.
+--- a/sabnzbd/misc.py
++++ b/sabnzbd/misc.py
+@@ -515,6 +515,9 @@
+ 
+ def check_latest_version():
+     """ Do an online check for the latest version """
++    logging.debug("Version check disabled by Ubuntu/Debian packaging")
++    return
++
+     if not cfg.version_check():
+         return
+ 

Deleted: packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch	2011-08-26 15:03:34 UTC (rev 7487)
+++ packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch	2011-08-26 15:49:27 UTC (rev 7488)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_disable_new_version_check.dpatch by JCF Ploemen (jcfp) <linux at jp.pp.ru>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable the builtin check for newer versions.
-
- at DPATCH@
-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 @@
- 
- def check_latest_version():
-     """ Do an online check for the latest version """
-+    logging.debug("Version check disabled by Ubuntu/Debian packaging")
-+    return
-+
-     if not cfg.version_check():
-         return
- 

Added: packages/sabnzbdplus/trunk/debian/patches/series
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/series	                        (rev 0)
+++ packages/sabnzbdplus/trunk/debian/patches/series	2011-08-26 15:49:27 UTC (rev 7488)
@@ -0,0 +1,4 @@
+02_find_parts_in_usr_share.diff
+04_use_config_when_daemon.diff
+06_use_packaged_modules.diff
+08_disable_new_version_check.diff

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2011-08-26 15:03:34 UTC (rev 7487)
+++ packages/sabnzbdplus/trunk/debian/rules	2011-08-26 15:49:27 UTC (rev 7488)
@@ -4,18 +4,21 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Include dpatch targets
-include /usr/share/dpatch/dpatch.make
-
 # Install directory
 DESTDIR   = $(CURDIR)/debian/sabnzbdplus
 
 build: build-arch build-indep
 build-arch:
 build-indep: build-stamp
-build-stamp: patch
+build-stamp:
+	# 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
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -rf build/ locale/ sabnzbdplus.png sabnzbdplus.xpm
@@ -23,20 +26,14 @@
 	find . -name "*.pyc" -delete
 	dh_clean 
 
-install: build install-prereq install-main install-finish
+install: install-prereq install-main install-finish
 
-install-prereq: build
+install-prereq:
 	dh_testdir
 	dh_testroot
 	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 \

Modified: packages/sabnzbdplus/trunk/debian/source/format
===================================================================
--- packages/sabnzbdplus/trunk/debian/source/format	2011-08-26 15:03:34 UTC (rev 7487)
+++ packages/sabnzbdplus/trunk/debian/source/format	2011-08-26 15:49:27 UTC (rev 7488)
@@ -1 +1 @@
-1.0
+3.0 (quilt)




More information about the Python-apps-commits mailing list