[Python-apps-commits] r3899 - in packages/sabnzbdplus/trunk/debian (3 files)

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

    Date: Monday, October 5, 2009 @ 20:26:10
  Author: jcfp-guest
Revision: 3899

Fix patch 08 for real, drop versioning of some dep.

Modified:
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/control
  packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2009-10-05 17:44:01 UTC (rev 3898)
+++ packages/sabnzbdplus/trunk/debian/changelog	2009-10-05 20:26:10 UTC (rev 3899)
@@ -18,6 +18,7 @@
     + assorted minor tweaks.
   * Changed Priority to extra, following dependency python-cherrypy that
     was demoted from optional to extra in 2.3.0-3.
+  * Drop versioning of dependencies on unzip, unrar.
 
  -- JCF Ploemen (jcfp) <linux at jp.pp.ru>  Mon, 10 Aug 2009 23:59:26 +0200
 

Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control	2009-10-05 17:44:01 UTC (rev 3898)
+++ packages/sabnzbdplus/trunk/debian/control	2009-10-05 20:26:10 UTC (rev 3899)
@@ -16,7 +16,7 @@
  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)
+ unzip, par2 (>= 0.4), unrar
 Suggests: sabnzbdplus-theme-plush, sabnzbdplus-theme-smpl, sabnzbdplus-theme-iphone
 XB-Python-Version: ${python:Versions}
 Description: web-based binary newsgrabber with nzb support

Modified: packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch	2009-10-05 17:44:01 UTC (rev 3898)
+++ packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.dpatch	2009-10-05 20:26:10 UTC (rev 3899)
@@ -2,18 +2,18 @@
 ## 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 builtin check for newer versions by overruling the setting.
+## DP: Disable the builtin check for newer versions.
 
 @DPATCH@
-diff -urNad sabnzbdplus-0.4.12~/sabnzbd/__init__.py sabnzbdplus-0.4.12/sabnzbd/__init__.py
---- sabnzbdplus-0.4.12~/sabnzbd/__init__.py	2009-09-30 21:32:47.000000000 +0200
-+++ sabnzbdplus-0.4.12/sabnzbd/__init__.py	2009-10-05 19:26:31.184323661 +0200
-@@ -348,7 +348,7 @@
-     API_KEY = check_setting_str(CFG, 'misc', 'api_key', create_api_key())
-     NO_API_KEY = bool(check_setting_int(CFG, 'misc', 'disable_api_key', 0))
- 
--    VERSION_CHECK = bool(check_setting_int(CFG, 'misc', 'check_new_rel', 1))
-+    VERSION_CHECK = bool(0)
- 
-     REPLACE_SPACES = bool(check_setting_int(CFG, 'misc', 'replace_spaces', 0))
-     REPLACE_ILLEGAL = bool(check_setting_int(CFG, 'misc', 'replace_illegal', 1))
+diff -urNad sabnzbdplus-0.4.12~/sabnzbd/misc.py sabnzbdplus-0.4.12/sabnzbd/misc.py
+--- sabnzbdplus-0.4.12~/sabnzbd/misc.py	2009-09-30 21:32:47.000000000 +0200
++++ sabnzbdplus-0.4.12/sabnzbd/misc.py	2009-10-05 21:05:07.444323540 +0200
+@@ -851,6 +851,8 @@
+ def check_latest_version():
+     """ Do an online check for the latest version """
+     current, testver = ConvertVersion(sabnzbd.__version__)
++    logging.debug("[%s] Version check disabled by Ubuntu/Debian packaging", __NAME__)
++    return
+     if not current:
+         logging.debug("[%s] Unsupported release number (%s), will not check", __NAME__, sabnzbd.__version__)
+         return