From 43ef983337a702bd8a3cbf84d87aab1f9bbf502f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 20 Jun 2012 20:52:05 +0300
Subject: [PATCH] SABnzbd: update to SABnzbd-0.7.0

---
 packages/3rdparty/download/SABnzbd/meta       |  4 +--
 ...7.0-001_remove_default_settings-0.3.patch} | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)
 rename packages/3rdparty/download/SABnzbd/patches/{SABnzbd-0.6.15-001_remove_default_settings-0.3.patch => SABnzbd-0.7.0-001_remove_default_settings-0.3.patch} (89%)

diff --git a/packages/3rdparty/download/SABnzbd/meta b/packages/3rdparty/download/SABnzbd/meta
index 32bf67d1b4..33f21569c4 100644
--- a/packages/3rdparty/download/SABnzbd/meta
+++ b/packages/3rdparty/download/SABnzbd/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="SABnzbd"
-PKG_VERSION="0.6.15"
+PKG_VERSION="0.7.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://sabnzbd.org/"
-PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/sabnzbd-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
+PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
 PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
 PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
 PKG_PRIORITY="optional"
diff --git a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.15-001_remove_default_settings-0.3.patch b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.0-001_remove_default_settings-0.3.patch
similarity index 89%
rename from packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.15-001_remove_default_settings-0.3.patch
rename to packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.0-001_remove_default_settings-0.3.patch
index 0ce5dbbb2c..d3080986c5 100644
--- a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.15-001_remove_default_settings-0.3.patch
+++ b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.0-001_remove_default_settings-0.3.patch
@@ -1,6 +1,7 @@
-diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_directories.tmpl
---- SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl	2011-06-08 00:02:34.000000000 +0200
-+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_directories.tmpl	2011-06-13 16:37:49.027611932 +0200
+diff --git a/interfaces/Plush/templates/config_folders.tmpl b/interfaces/Plush/templates/config_folders.tmpl
+index 92bb5d1..94c1502 100644
+--- a/interfaces/Plush/templates/config_folders.tmpl
++++ b/interfaces/Plush/templates/config_folders.tmpl
 @@ -76,16 +76,6 @@
            <span class="component-desc">$T('explain-dirscan_speed')</span>
          </label>
@@ -68,9 +69,10 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl SABn
    <div class="component-group-last clearfix">
      <div class="component-group-desc">
        <h3>&nbsp;</h3>
-diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_general.tmpl
---- SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl	2011-06-08 00:02:34.000000000 +0200
-+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_general.tmpl	2011-06-13 16:35:26.411903234 +0200
+diff --git a/interfaces/Plush/templates/config_general.tmpl b/interfaces/Plush/templates/config_general.tmpl
+index 0c293ec..56f9488 100644
+--- a/interfaces/Plush/templates/config_general.tmpl
++++ b/interfaces/Plush/templates/config_general.tmpl
 @@ -14,82 +14,6 @@
      </div>
      <fieldset class="component-group-list">
@@ -154,7 +156,7 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-
          <label class="nocheck clearfix" for="language">
            <span class="component-title">$T('opt-language')</span>
            <select name="language" id="language" id="language" class="select">
-@@ -129,13 +53,6 @@
+@@ -131,13 +55,6 @@
            <span class="component-desc">$T('explain-nzbkey')</span>
          </label>
        </div>
@@ -168,7 +170,7 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-
      </fieldset>
    </div><!-- /component-group1 -->
  
-@@ -152,36 +69,6 @@
+@@ -154,36 +71,6 @@
            <span class="component-desc">$T('explain-enable_https')</span>
          </label>
        </div>
@@ -205,9 +207,10 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-
      </fieldset>
    </div><!-- /component-group2 -->
  
-diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_switches.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_switches.tmpl
---- SABnzbd-0.6.4/interfaces/Plush/templates/config_switches.tmpl	2011-06-08 00:02:34.000000000 +0200
-+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_switches.tmpl	2011-06-13 16:35:26.446903654 +0200
+diff --git a/interfaces/Plush/templates/config_switches.tmpl b/interfaces/Plush/templates/config_switches.tmpl
+index a8f1069..6f50b49 100644
+--- a/interfaces/Plush/templates/config_switches.tmpl
++++ b/interfaces/Plush/templates/config_switches.tmpl
 @@ -12,20 +12,6 @@
        <h3>$T('swtag-general')</h3>
      </div>