[Python-apps-commits] r2936 - in packages/sabnzbdplus/trunk/debian (5 files)

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

    Date: Wednesday, May 13, 2009 @ 16:01:05
  Author: jcfp-guest
Revision: 2936

Use packaged python-configobj

Added:
  packages/sabnzbdplus/trunk/debian/patches/07_use_system_configobj.dpatch
Modified:
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/control
  packages/sabnzbdplus/trunk/debian/patches/00list
  packages/sabnzbdplus/trunk/debian/rules

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2009-05-13 02:28:49 UTC (rev 2935)
+++ packages/sabnzbdplus/trunk/debian/changelog	2009-05-13 16:01:05 UTC (rev 2936)
@@ -2,12 +2,14 @@
 
   * Initial release. (Closes: #514156)
   * Adding patches:
-    + debian/patches/01_remove_script_headers.dpatch: prevent lintian 
+    + debian/patches/01_remove_script_headers.dpatch: prevent lintian
       from complaining about non-executable scripts.
-    + debian/patches/02_find_parts_in_usr_share.dpatch: make the program 
+    + debian/patches/02_find_parts_in_usr_share.dpatch: make the program
       find parts (interface templates, python modules) under /usr/share.
-    + debian/patches/04_use_config_when_daemon.dpatch: use the normal 
-      configuration when run as a daemon to prevent the program from trying 
+    + debian/patches/04_use_config_when_daemon.dpatch: use the normal
+      configuration when run as a daemon to prevent the program from trying
       to store its configuration and internal accounting files in /usr/bin.
+    + debian/patches/07_use_system_configobj.dpatch: use the system
+      configobj rather than the included stock copy.
 
  -- JCF Ploemen (jcfp) <linux at jp.pp.ru>  Fri, 27 Mar 2009 20:19:16 +0100

Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control	2009-05-13 02:28:49 UTC (rev 2935)
+++ packages/sabnzbdplus/trunk/debian/control	2009-05-13 16:01:05 UTC (rev 2936)
@@ -12,7 +12,8 @@
 
 Package: sabnzbdplus
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-cherrypy (>= 2.2.1), python-cheetah (>= 2.0.1),
+Depends: ${python:Depends}, ${misc:Depends},
+ python-cherrypy (>= 2.2.1), python-cheetah (>= 2.0.1), python-configobj,
  python (>= 2.5) | python-celementtree (>= 1.0.5) | python-elementtree (>= 1.2.6)
 Recommends: python-feedparser (>= 4.1), python-yenc (>= 0.3), python-openssl (>= 0.6),
  unzip (>= 5.52), par2 (>= 0.4), unrar (>= 3.6.6)

Modified: packages/sabnzbdplus/trunk/debian/patches/00list
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/00list	2009-05-13 02:28:49 UTC (rev 2935)
+++ packages/sabnzbdplus/trunk/debian/patches/00list	2009-05-13 16:01:05 UTC (rev 2936)
@@ -1,3 +1,4 @@
 01_remove_script_headers.dpatch
 02_find_parts_in_usr_share.dpatch
 04_use_config_when_daemon.dpatch
+07_use_system_configobj.dpatch

Added: packages/sabnzbdplus/trunk/debian/patches/07_use_system_configobj.dpatch
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/07_use_system_configobj.dpatch	                        (rev 0)
+++ packages/sabnzbdplus/trunk/debian/patches/07_use_system_configobj.dpatch	2009-05-13 16:01:05 UTC (rev 2936)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_use_system_configobj.dpatch by JCF Ploemen (jcfp) <linux at jp.pp.ru>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use system configobj rather than included stock copy.
+
+ at DPATCH@
+diff -urNad sabnzbdplus-0.4.9~/SABnzbd.py sabnzbdplus-0.4.9/SABnzbd.py
+--- sabnzbdplus-0.4.9~/SABnzbd.py	2009-05-13 17:03:14.000000000 +0200
++++ sabnzbdplus-0.4.9/SABnzbd.py	2009-05-13 17:04:20.000000000 +0200
+@@ -43,7 +43,7 @@
+ 
+ sys.path.insert(0,'/usr/share/sabnzbdplus')
+ import sabnzbd
+-from sabnzbd.utils.configobj import ConfigObj, ConfigObjError
++from configobj import ConfigObj, ConfigObjError
+ from sabnzbd.__init__ import check_setting_str, check_setting_int, dir_setup
+ from sabnzbd.interface import *
+ from sabnzbd.constants import *
+diff -urNad sabnzbdplus-0.4.9~/sabnzbd/interface.py sabnzbdplus-0.4.9/sabnzbd/interface.py
+--- sabnzbdplus-0.4.9~/sabnzbd/interface.py	2009-05-13 17:03:14.000000000 +0200
++++ sabnzbdplus-0.4.9/sabnzbd/interface.py	2009-05-13 17:06:37.000000000 +0200
+@@ -41,7 +41,7 @@
+ from sabnzbd.utils.multiauth.providers import DictAuthProvider
+ 
+ from sabnzbd.utils import listquote
+-from sabnzbd.utils.configobj import ConfigObj
++from configobj import ConfigObj
+ from Cheetah.Template import Template
+ from sabnzbd.email import email_send
+ from sabnzbd.misc import real_path, create_real_path, save_configfile, \


Property changes on: packages/sabnzbdplus/trunk/debian/patches/07_use_system_configobj.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2009-05-13 02:28:49 UTC (rev 2935)
+++ packages/sabnzbdplus/trunk/debian/rules	2009-05-13 16:01:05 UTC (rev 2936)
@@ -29,7 +29,8 @@
 install-main: install-prereq
 	dh_install \
 		--exclude=javascripts/jquery.js \
-		--exclude=static/MochiKit/
+		--exclude=static/MochiKit/ \
+		--exclude=utils/configobj.py
 
 install-finish: install-main
 	# Strip caps and script extension from executable