[Python-apps-commits] r14416 - in packages/sabnzbdplus/trunk/debian/patches (4 files)

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

    Date: Thursday, October 12, 2017 @ 09:44:48
  Author: jcfp-guest
Revision: 14416

patches: remove fuzz from 02, 04, 08 and 09

Modified:
  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/08_disable_new_version_check.diff
  packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff

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	2017-10-12 09:43:52 UTC (rev 14415)
+++ packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff	2017-10-12 09:44:48 UTC (rev 14416)
@@ -11,7 +11,7 @@
      sys.exit(1)
 --- a/sabnzbd/constants.py
 +++ b/sabnzbd/constants.py
-@@ -61,9 +61,9 @@
+@@ -60,9 +60,9 @@
  DEF_COMPLETE_DIR = 'Downloads/complete'
  DEF_ADMIN_DIR = 'admin'
  DEF_NZBBACK_DIR = ''

Modified: packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff	2017-10-12 09:43:52 UTC (rev 14415)
+++ packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff	2017-10-12 09:44:48 UTC (rev 14416)
@@ -1,7 +1,7 @@
 # Use the normal configuration when run as a daemon
 --- a/SABnzbd.py
 +++ b/SABnzbd.py
-@@ -325,20 +325,7 @@
+@@ -324,20 +324,7 @@
  def GetProfileInfo(vista_plus):
      """ Get the default data locations """
      ok = False

Modified: packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff	2017-10-12 09:43:52 UTC (rev 14415)
+++ packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff	2017-10-12 09:44:48 UTC (rev 14416)
@@ -1,7 +1,7 @@
 # Disable the builtin check for newer versions.
 --- a/sabnzbd/misc.py
 +++ b/sabnzbd/misc.py
-@@ -636,6 +636,8 @@
+@@ -648,6 +648,8 @@
          they are already using an alpha/beta/rc.
          RC's are valued higher than Beta's, which are valued higher than Alpha's.
      """
@@ -12,7 +12,7 @@
          return
 --- a/sabnzbd/scheduler.py
 +++ b/sabnzbd/scheduler.py
-@@ -177,16 +177,6 @@
+@@ -183,16 +183,6 @@
                                        kronos.method.sequential, None, None)
          __SCHED.add_single_task(rss.run_method, 'RSS', 15, kronos.method.sequential, None, None)
  

Modified: packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff	2017-10-12 09:43:52 UTC (rev 14415)
+++ packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff	2017-10-12 09:44:48 UTC (rev 14416)
@@ -19,7 +19,7 @@
                  <input type="hidden" name="session" value="$session" />
 --- a/sabnzbd/__init__.py
 +++ b/sabnzbd/__init__.py
-@@ -1161,6 +1161,8 @@
+@@ -1164,6 +1164,8 @@
          logging.debug("Test IPv6: Disabling IPv6, because it looks like it's not available. Reason: %s", sys.exc_info()[0] )
          return False
  
@@ -42,7 +42,7 @@
      try:
 --- a/interfaces/Glitter/templates/include_overlays.tmpl
 +++ b/interfaces/Glitter/templates/include_overlays.tmpl
-@@ -96,7 +96,12 @@
+@@ -90,7 +90,12 @@
                          </div>
                          <div class="row">
                              <div class="col-sm-6">$T('dashboard-publicIP4')</div>
@@ -57,7 +57,7 @@
                          <div class="row">
 --- a/interfaces/Plush/templates/status.tmpl
 +++ b/interfaces/Plush/templates/status.tmpl
-@@ -148,7 +148,11 @@
+@@ -152,7 +152,11 @@
                  <!--#if $publicipv4#-->
                      $publicipv4
                  <!--#else#-->