[Python-apps-commits] r13871 - in packages/sabnzbdplus/trunk/debian (10 files)
jcfp-guest at users.alioth.debian.org
jcfp-guest at users.alioth.debian.org
Sat Jan 14 17:10:24 UTC 2017
Date: Saturday, January 14, 2017 @ 17:10:22
Author: jcfp-guest
Revision: 13871
Initial work for new upstream release 1.2.0
Modified:
packages/sabnzbdplus/trunk/debian/changelog
packages/sabnzbdplus/trunk/debian/control
packages/sabnzbdplus/trunk/debian/copyright
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/09_remove_external_resources.diff
packages/sabnzbdplus/trunk/debian/sabnzbdplus.links
packages/sabnzbdplus/trunk/debian/sabnzbdplus.lintian-overrides
Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog 2017-01-13 18:32:21 UTC (rev 13870)
+++ packages/sabnzbdplus/trunk/debian/changelog 2017-01-14 17:10:22 UTC (rev 13871)
@@ -1,6 +1,15 @@
-sabnzbdplus (1.1.1+dfsg-2) UNRELEASED; urgency=medium
+sabnzbdplus (1.2.0+dfsg-1) UNRELEASED; urgency=medium
+ * New upstream release.
* Manpage: add links to API docs, upstream Github project page.
+ * Copyright: bump years.
+ * Refresh all patches.
+ * Control: drop recommended dep on python-openssl: no longer needed,
+ upstream switched to Python\'s builtin ssl.
+ * Links: match upstream version bump of jquery in Config to 3.1.1
+ (from 1.11.2).
+ * Lintian: remove unused override for convenience copy of jquery.js in
+ wizard: file no longer installed.
-- JCF Ploemen (jcfp) <linux at jcf.pm> Wed, 07 Dec 2016 10:58:24 +0000
Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control 2017-01-13 18:32:21 UTC (rev 13870)
+++ packages/sabnzbdplus/trunk/debian/control 2017-01-14 17:10:22 UTC (rev 13871)
@@ -41,7 +41,6 @@
par2,
python-cryptography,
python-dbus,
- python-openssl,
python-yenc,
unzip,
unrar (>= 1:3.8.0) | rar (>= 1:3.8.0)
Modified: packages/sabnzbdplus/trunk/debian/copyright
===================================================================
--- packages/sabnzbdplus/trunk/debian/copyright 2017-01-13 18:32:21 UTC (rev 13870)
+++ packages/sabnzbdplus/trunk/debian/copyright 2017-01-14 17:10:22 UTC (rev 13871)
@@ -8,7 +8,7 @@
The SABnzbd-Team <team at sabnzbd.org>
Copyright:
- Copyright (C) 2007-2016 by The SABnzbd-Team <team at sabnzbd.org>
+ Copyright (C) 2007-2017 by The SABnzbd-Team <team at sabnzbd.org>
License:
This program is free software; you can redistribute it and/or
@@ -610,7 +610,7 @@
* debian/*
- Copyright (C) 2007-2016 by JCF Ploemen <linux at jcf.pm>
+ Copyright (C) 2007-2017 by JCF Ploemen <linux at jcf.pm>
License: GPL-2+
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-01-13 18:32:21 UTC (rev 13870)
+++ packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff 2017-01-14 17:10:22 UTC (rev 13871)
@@ -11,7 +11,7 @@
sys.exit(1)
--- a/sabnzbd/constants.py
+++ b/sabnzbd/constants.py
-@@ -62,10 +62,10 @@
+@@ -63,10 +63,10 @@
DEF_ADMIN_DIR = 'admin'
DEF_LOG_DIR = 'logs'
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-01-13 18:32:21 UTC (rev 13870)
+++ packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff 2017-01-14 17:10:22 UTC (rev 13871)
@@ -1,7 +1,7 @@
# Use the normal configuration when run as a daemon
--- a/SABnzbd.py
+++ b/SABnzbd.py
-@@ -391,20 +391,7 @@
+@@ -353,20 +353,7 @@
def GetProfileInfo(vista_plus):
""" Get the default data locations """
ok = False
Modified: packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff 2017-01-13 18:32:21 UTC (rev 13870)
+++ packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff 2017-01-14 17:10:22 UTC (rev 13871)
@@ -10,14 +10,3 @@
from sabnzbd.decorators import synchronized
CONFIG_LOCK = threading.Lock()
---- a/sabnzbd/rss.py
-+++ b/sabnzbd/rss.py
-@@ -34,7 +34,7 @@
- import sabnzbd.emailer as emailer
- from sabnzbd.encoding import unicoder, xml_name
-
--import sabnzbd.utils.feedparser as feedparser
-+import feedparser
-
- __RSS = None # Global pointer to RSS-scanner instance
-
Modified: packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff 2017-01-13 18:32:21 UTC (rev 13870)
+++ packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff 2017-01-14 17:10:22 UTC (rev 13871)
@@ -1,7 +1,7 @@
# Disable the builtin check for newer versions.
--- a/sabnzbd/misc.py
+++ b/sabnzbd/misc.py
-@@ -568,6 +568,8 @@
+@@ -595,6 +595,8 @@
they are already using an alpha/beta/rc.
RC's are valued higher than Beta's, which are valued higher than Alpha's.
"""
@@ -10,24 +10,6 @@
if not cfg.version_check():
return
---- a/interfaces/Config/templates/config_switches.tmpl
-+++ b/interfaces/Config/templates/config_switches.tmpl
-@@ -17,15 +17,6 @@
- <span class="desc">$T('explain-auto_browser')</span>
- </div>
- <div class="field-pair">
-- <label class="config" for="check_new_rel">$T('opt-check_new_rel')</label>
-- <select name="check_new_rel" id="check_new_rel">
-- <option value="0" <!--#if $check_new_rel == 0 then 'selected="selected"' else ""#--> >$T('off')</option>
-- <option value="1" <!--#if $check_new_rel == 1 then 'selected="selected"' else ""#--> >$T('on')</option>
-- <option value="2" <!--#if $check_new_rel == 2 then 'selected="selected"' else ""#--> >$T('also-test')</option>
-- </select>
-- <span class="desc">$T('explain-check_new_rel')</span>
-- </div>
-- <div class="field-pair">
- <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
- <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> />
- <span class="desc">$T('explain-enable_https_verification')</span>
--- a/sabnzbd/scheduler.py
+++ b/sabnzbd/scheduler.py
@@ -171,16 +171,6 @@
@@ -47,3 +29,21 @@
action, hour, minute = sabnzbd.bpsmeter.BPSMeter.do.get_quota()
if action:
logging.info('Setting schedule for quota check daily at %s:%s', hour, minute)
+--- a/interfaces/Config/templates/config_general.tmpl
++++ b/interfaces/Config/templates/config_general.tmpl
+@@ -179,15 +179,6 @@
+ <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if int($auto_browser) > 0 then 'checked="checked"' else ""#--> />
+ <span class="desc">$T('explain-auto_browser')</span>
+ </div>
+- <div class="field-pair">
+- <label class="config" for="check_new_rel">$T('opt-check_new_rel')</label>
+- <select name="check_new_rel" id="check_new_rel">
+- <option value="0" <!--#if $check_new_rel == 0 then 'selected="selected"' else ""#--> >$T('off')</option>
+- <option value="1" <!--#if $check_new_rel == 1 then 'selected="selected"' else ""#--> >$T('on')</option>
+- <option value="2" <!--#if $check_new_rel == 2 then 'selected="selected"' else ""#--> >$T('also-test')</option>
+- </select>
+- <span class="desc">$T('explain-check_new_rel')</span>
+- </div>
+ <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#-->">
+ <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
+ <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> <!--#if int($have_ssl_context) == 0 then "disabled=\"disabled\"" else ""#--> />
Modified: packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff 2017-01-13 18:32:21 UTC (rev 13870)
+++ packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff 2017-01-14 17:10:22 UTC (rev 13871)
@@ -5,21 +5,21 @@
--- a/interfaces/wizard/one.html
+++ b/interfaces/wizard/one.html
@@ -79,7 +79,11 @@
- </div>
- <div class="col-md-5">
- <div class="clearfix"></div>
-- <iframe style="float: right; width: 315px; height: 315px;" frameborder="0" src="https://resources.sabnzbd.org/wizard/ad/$language"></iframe>
-+ <div style="float: right; width: 300px; padding: 5px; border: 1px dotted #000; background-color: #F5F5F5; font-size: 14px; font-family: sans-serif;">
-+ <b>Help</b>
-+ <br/>In order to download from Usenet you will require access to a provider. Your ISP may provide you with access, however a premium provider is recommended.<br/>
-+ <br/>Don't have a Usenet provider? A recommendation (and affiliate link) from the developers of SABnzbd may be found at <a href="https://resources.sabnzbd.org/wizard/ad/$language" target="_blank">sabnzbd.org</a>.<br/>
-+ </div>
- </div>
- </div>
- <input type="hidden" name="session" value="$session" />
+ </div>
+ <div class="col-md-5">
+ <div class="clearfix"></div>
+- <iframe style="float: right; width: 315px; height: 315px;" frameborder="0" src="https://resources.sabnzbd.org/wizard/ad/$language"></iframe>
++ <div style="float: right; width: 300px; padding: 5px; border: 1px dotted #000; background-color: #F5F5F5; font-size: 14px; font-family: sans-serif;">
++ <b>Help</b>
++ <br/>In order to download from Usenet you will require access to a provider. Your ISP may provide you with access, however a premium provider is recommended.<br/>
++ <br/>Don't have a Usenet provider? A recommendation (and affiliate link) from the developers of SABnzbd may be found at <a href="https://resources.sabnzbd.org/wizard/ad/$language" target="_blank">sabnzbd.org</a>.<br/>
++ </div>
+ </div>
+ </div>
+ <input type="hidden" name="session" value="$session" />
--- a/sabnzbd/__init__.py
+++ b/sabnzbd/__init__.py
-@@ -1144,6 +1144,8 @@
+@@ -1192,6 +1192,8 @@
logging.debug("Test IPv6: Disabling IPv6, because it looks like it's not available. Reason: %s", sys.exc_info()[0] )
return False
@@ -30,7 +30,7 @@
sock = socket.socket(af, socktype, proto)
--- a/sabnzbd/getipaddress.py
+++ b/sabnzbd/getipaddress.py
-@@ -35,6 +35,9 @@
+@@ -67,6 +67,9 @@
return ipv4
def publicipv4():
Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.links
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.links 2017-01-13 18:32:21 UTC (rev 13870)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.links 2017-01-14 17:10:22 UTC (rev 13871)
@@ -4,7 +4,7 @@
/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.eot /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.eot
/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.svg /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.svg
/usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.ttf /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.ttf
-/usr/share/javascript/jquery/jquery.min.js /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/js/jquery-1.11.2.min.js
+/usr/share/javascript/jquery/jquery.min.js /usr/share/sabnzbdplus/interfaces/Config/templates/staticcfg/js/jquery-3.1.1.min.js
# glitter
/usr/share/javascript/bootstrap/css/bootstrap.min.css /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/css/bootstrap.min.css
/usr/share/javascript/bootstrap/js/bootstrap.min.js /usr/share/sabnzbdplus/interfaces/Glitter/templates/static/bootstrap/js/bootstrap.min.js
Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.lintian-overrides
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.lintian-overrides 2017-01-13 18:32:21 UTC (rev 13870)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.lintian-overrides 2017-01-14 17:10:22 UTC (rev 13871)
@@ -1,8 +1,2 @@
-# Lintian hits on the filename 'jquery.js', and while there is indeed
-# a copy of jquery inside, this file also contains a significant
-# amount of other javascript code. As a result, libjs-jquery cannot
-# be used.
-sabnzbdplus binary: embedded-javascript-library usr/share/sabnzbdplus/interfaces/wizard/static/javascript/jquery.js *
-
# Sourced file actually is tested for read access, false positive.
sabnzbdplus binary: init.d-script-sourcing-without-test etc/init.d/sabnzbdplus:* /etc/default/locale
More information about the Python-apps-commits
mailing list