--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus-theme-plush.install
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus-theme-plush.install
@@ -0,0 +1 @@
+interfaces/Plush/templates /usr/share/sabnzbdplus/interfaces/Plush/
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus.lintian-overrides
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus.lintian-overrides
@@ -0,0 +1,6 @@
+# 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
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus.1
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus.1
@@ -0,0 +1,96 @@
+.\" Copyright (C) 2007-2010 by JCF Ploemen <linux@jp.pp.ru>.
+.\" 
+.\" This program is free software; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License
+.\" as published by the Free Software Foundation; either version 2
+.\" of the License, or (at your option) any later version.
+.\" 
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\" 
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+.TH SABNZBDPLUS 1 "June 2011" "Version 0.6.3"
+
+.SH NAME
+sabnzbdplus \- a web\-based binary newsgrabber with nzb support.
+
+.SH SYNOPSIS
+.B
+sabnzbdplus [\-f <configfile>] [[...other options]]
+
+.SH DESCRIPTION
+SABnzbd+ is a web\-based binary newsgrabber written in Python, with support for the popular nzb file format. It takes one or more nzb files as input and from there on does all the work, including fetching files, checking file integrity, and unpacking. Configuration can be done via the web interface or in the configuration file.
+
+Multiple servers are supported, as well as secure (ssl) connections, ipv6, scheduling, pausing and resuming downloads, queue manipulation, rss feeds, newzbin and nzbmatrix integration, automatic sorting, a download history, email notifications, and custom post\-processing scripts. An extensive API allows third party applications to interact with the program.
+
+.SH USAGE
+To run the program execute \fBsabnzbdplus\fR, then point your favorite web browser to \fBhttp://<host>:<port>\fR. The host and port settings default to localhost and 8080, respectively; the default port for https connections is 9090.
+
+New nzb files may be queued for download by putting them in the watched directory, adding them via the web interface, or from rss feeds.
+
+.SH OPTIONS
+.IP "\-h  \-\-help"
+Show a list of options
+.IP "\-f  \-\-config\-file <filename>"
+Location of the configuration file
+.IP "\-s  \-\-server <host:port>"
+Hostname or ip address and port to listen on
+.IP "\-t  \-\-templates <template>"
+Primary interface templates
+.IP "\-2  \-\-template2 <template>"
+Secondary templates, available at http://<host>:<port>/sabnzbd/m
+.IP "\-l  \-\-logging <0..2>"
+Log level (0 for least, 2 for most)
+.IP "\-w  \-\-weblogging <0..2>"
+Cherrypy (built\-in web\-server) logging (0 for off, 1 for on, 2 for file\-only)
+.IP "\-b  \-\-browser <0..1>"
+Automatically launch browser (0 for off, 1 for on)
+.IP "\-d  \-\-daemon"
+Fork daemon process (run the program in the background)
+.IP "\-\-pid <path>"
+Create a pid file in the listed folder (full path)
+.IP "\-\-force"
+Discard web\-port timeout
+.IP "\-v  \-\-version"
+Show version
+.IP "\-c  \-\-clean"
+Remove queue, cache and logs
+.IP "\-p  \-\-pause"
+Start paused
+.IP "\-\-https <port>"
+Port to listen on for https connections
+.IP "\-\-repair"
+Add orphaned jobs from the incomplete folder to the queue
+.IP "\-\-repair\-all"
+Try to reconstruct the queue from the incomplete folder with full data reconstruction
+.IP "\-\-log\-all"
+Log all article handling (for developers)
+.IP "\-\-new"
+Run a new instance of SABnzbd, instead of starting the UI of the existing instance
+
+.SH FILES
+.I ~/.sabnzbd/
+.RS
+Default location for the program's configuration file and internal administration
+.RE
+.I ~/Downloads/
+.RS
+Default location for downloaded files
+.RE
+.I /etc/default/sabnzbdplus
+.RS
+Configuration file for the init.d script
+.RE
+
+.SH AUTHOR
+This man page was written by JCF Ploemen <linux@jp.pp.ru> and is licensed under the GNU GPL, version 2 or later.
+
+.SH "SEE ALSO"
+.P
+Project wiki with extensive user documentation: http://wiki.sabnzbd.org
+.P
+SABnzbd+ homepage and support forums: http://sabnzbd.org
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus-theme-mobile.install
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus-theme-mobile.install
@@ -0,0 +1 @@
+interfaces/Mobile/templates /usr/share/sabnzbdplus/interfaces/Mobile/
--- sabnzbdplus-0.6.15.orig/debian/control
+++ sabnzbdplus-0.6.15/debian/control
@@ -0,0 +1,118 @@
+Source: sabnzbdplus
+Homepage: http://sabnzbd.org
+Section: net
+Priority: optional
+Maintainer: JCF Ploemen (jcfp) <linux@jp.pp.ru>
+Build-Depends: debhelper (>= 6.0.7), dpatch, python, imagemagick
+Build-Depends-Indep: python-support (>= 0.5.3)
+Standards-Version: 3.9.2
+
+Package: sabnzbdplus
+Architecture: all
+Depends:
+ ${python:Depends},
+ ${misc:Depends},
+ python-cheetah (>= 2.0.1),
+ python-configobj,
+ python-feedparser,
+ sabnzbdplus-theme-plush (= ${source:Version})
+Recommends:
+ python-yenc (>= 0.3),
+ python-openssl (>= 0.6),
+ unzip,
+ par2 (>= 0.4),
+ unrar (>= 3.8.0) | rar (>= 3.8.0),
+ sabnzbdplus-theme-classic,
+ sabnzbdplus-theme-smpl
+Suggests:
+ sabnzbdplus-theme-mobile,
+ python-dbus
+XB-Python-Version: ${python:Versions}
+Description: web-based binary newsgrabber with nzb support
+ SABnzbd+ is a web-based binary newsgrabber written in Python, with support for
+ the popular nzb file format. It greatly simplifies the process of downloading
+ from usenet, thanks to a friendly web-based, fully customizable user interface
+ and advanced built-in post-processing options including the ability to
+ automatically verify, repair, extract and clean up downloaded posts. 
+ .
+ Multiple servers are supported, as well as secure (ssl) connections, ipv6, 
+ scheduling, pausing and resuming downloads, queue manipulation, rss feeds,
+ newzbin and nzbmatrix integration, automatic sorting, a download history,
+ email notifications, and custom post-processing scripts. An extensive API
+ allows third party applications to interact with the program.
+ .
+ The program is a fork of the original SABnzbd code, which is no longer actively
+ developed.
+
+Package: sabnzbdplus-theme-plush
+Architecture: all
+Depends:
+ ${misc:Depends}
+Recommends: sabnzbdplus
+Description: plush interface templates for the SABnzbd+ binary newsgrabber
+ Plush is a set of interface templates for the SABnzbd+ binary newsgrabber,
+ providing access to a full set of features, even including a built-in IRC
+ client. To this end, extensive use is made of ajax technology, with various
+ graphical enhancements and artwork providing the finishing touch.
+ .
+ This package contains the Plush interface templates, as distributed with
+ the SABnzbd+ program releases.
+
+Package: sabnzbdplus-theme-smpl
+Architecture: all
+Depends:
+ ${misc:Depends},
+ libjs-mochikit (>= 1.4),
+ libjs-excanvas,
+ sabnzbdplus (= ${source:Version})
+Enhances: sabnzbdplus
+Description: smpl interface templates for the SABnzbd+ binary newsgrabber
+ Smpl is a set of interface templates for the SABnzbd+ binary newsgrabber,
+ featuring a simple, clean design, automatic updating of queue, history, and
+ download speed at the refresh rate of your choice, a download graph,
+ re-designed config look, AJAX form submitting, and dual Queue and history
+ views.
+ .
+ This package contains the smpl interface templates, as distributed with
+ the SABnzbd+ program releases.
+
+Package: sabnzbdplus-theme-iphone
+# to be removed after the latest supported upgrade path from 0.4.x is gone
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends:
+ ${misc:Depends},
+ sabnzbdplus-theme-mobile
+Description: transitional package for migration to sabnzbdplus-theme-mobile
+ Transitional package for users of the former iphone interface templates for
+ the 0.4.x series of the SABnzbd+ binary newsgrabber to its successor, Mobile.
+ .
+ This dummy package may be safely removed after upgrading.
+
+Package: sabnzbdplus-theme-mobile
+Architecture: all
+Depends:
+ ${misc:Depends},
+ sabnzbdplus (= ${source:Version})
+Enhances: sabnzbdplus
+Description: mobile interface templates for the SABnzbd+ binary newsgrabber
+ Mobile is a set of interface templates for the SABnzbd+ binary newsgrabber,
+ specifically designed for use with mobile devices.
+ .
+ This package contains the Mobile interface templates, as distributed with
+ the SABnzbd+ program releases.
+
+Package: sabnzbdplus-theme-classic
+Architecture: all
+Depends:
+ ${misc:Depends},
+ sabnzbdplus (= ${source:Version})
+Enhances: sabnzbdplus
+Description: classic interface templates for the SABnzbd+ binary newsgrabber
+ Classic is a set of interface templates for the SABnzbd+ binary newsgrabber,
+ formerly known as the "Default" templates. While fully functional, its
+ design is basic and focused on compatibility.
+ .
+ This package contains the Classic interface templates, as distributed with
+ the SABnzbd+ program releases.
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus-theme-classic.install
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus-theme-classic.install
@@ -0,0 +1 @@
+interfaces/Classic/templates /usr/share/sabnzbdplus/interfaces/Classic/
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus.install
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus.install
@@ -0,0 +1,25 @@
+# configuration wizard
+interfaces/wizard /usr/share/sabnzbdplus/interfaces/
+
+# python stuff (as private pure-python module)
+sabnzbd /usr/share/sabnzbdplus/
+
+# executable
+SABnzbd.py /usr/bin/
+
+# translations
+locale /usr/share/sabnzbdplus/
+
+# email templates
+email /usr/share/sabnzbdplus/
+
+# tmp: patched cherrypy svn included by upstream
+cherrypy /usr/share/sabnzbdplus/
+
+# desktop file, menu icons
+debian/sabnzbdplus.desktop /usr/share/applications/
+sabnzbdplus.xpm /usr/share/pixmaps/
+sabnzbdplus.png /usr/share/pixmaps/
+
+# gntp (as a private module)
+gntp /usr/share/sabnzbdplus/
--- sabnzbdplus-0.6.15.orig/debian/copyright
+++ sabnzbdplus-0.6.15/debian/copyright
@@ -0,0 +1,38 @@
+This package was debianized by JCF Ploemen <linux@jp.pp.ru>
+Thu, 17 Jan 2008
+
+It was downloaded from: http://www.sabnzbd.org/download
+
+
+Upstream Authors:
+	The SABnzbd-Team <team@sabnzbd.org>
+
+
+*********************************************************************
+This copyright file is incomplete, please refer to the source package
+for the copyrights of the upstream release.
+*********************************************************************
+
+
+debian/*
+
+	Copyright (C) 2007-2011 by JCF Ploemen <linux@jp.pp.ru>
+
+The packaging is licensed under the GNU GPL as follows:
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- sabnzbdplus-0.6.15.orig/debian/manpages
+++ sabnzbdplus-0.6.15/debian/manpages
@@ -0,0 +1 @@
+debian/sabnzbdplus.1
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus.examples
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus.examples
@@ -0,0 +1 @@
+Sample-PostProc.sh
--- sabnzbdplus-0.6.15.orig/debian/README.source
+++ sabnzbdplus-0.6.15/debian/README.source
@@ -0,0 +1,33 @@
+== Patch system ==
+
+This package is using dpatch patch system. 
+
+To patch the source:
+ * debian/rules patch
+To add a new patch:
+ * put it under debian/patches
+ * add it to debian/patches/00list
+
+See /usr/share/doc/dpatch/README.source.gz for more information.
+
+
+== Init script ==
+
+Properly handling shutdown of the program from the init script
+is complicated by the program's new builtin option of restarting
+from its web interface. This causes it to forget python options
+(like -OO), as well as change its command line, pid, and stuff
+in /proc/$pid/ that start-stop-daemon relies on for identifying
+which pid to act on. As a result, we cannot rely on any of those,
+and instead use pgrep and a makeshift pidfile to make sure
+start-stop-daemon gets it right after all.
+
+
+== Suggested vs. Recommended -theme packages ==
+
+The mobile interface is suggested rather than recommended
+because it cannot be selected in the configuration wizard
+(like smpl and Plush). Upstream's choice here makes sense,
+since mobile only implements a limited subset of the
+functionality and configuration options available in the
+program.
--- sabnzbdplus-0.6.15.orig/debian/pyversions
+++ sabnzbdplus-0.6.15/debian/pyversions
@@ -0,0 +1 @@
+2.5-
--- sabnzbdplus-0.6.15.orig/debian/rules
+++ sabnzbdplus-0.6.15/debian/rules
@@ -0,0 +1,84 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# Include dpatch targets
+include /usr/share/dpatch/dpatch.make
+
+# Install directory
+DESTDIR   = $(CURDIR)/debian/sabnzbdplus
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: patch
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -rf build/ locale/ sabnzbdplus.png sabnzbdplus.xpm
+	find . -wholename "./email/*.tmpl" ! -name "*-en.tmpl" -delete
+	find . -name "*.pyc" -delete
+	dh_clean 
+
+install: build install-prereq install-main install-finish
+
+install-prereq: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+install-main: install-prereq
+	# Generate translations
+	python tools/make_mo.py
+	find locale -type d -empty -delete
+	# Create icons, 32x32 xpm for Debian menu, 48x48 png for XDG menu
+	convert -resize 32x32 interfaces/wizard/static/images/icon_sab.png sabnzbdplus.xpm
+	convert -resize 48x48 interfaces/wizard/static/images/icon_sab.png sabnzbdplus.png
+	dh_install \
+		--exclude=static/MochiKit/ \
+		--exclude=wizard/README.TXT \
+		--exclude=utils/feedparser.py \
+		--exclude=utils/configobj.py \
+		--exclude=excanvas/excanvas.js \
+		--exclude=images-split.tar.gz \
+		--exclude=cherrypy/LICENSE.txt \
+		--exclude=cherrypy/cherryd \
+		--exclude=cherrypy/scaffold
+
+install-finish: install-main
+	# Strip caps and script extension from the executable
+	mv $(DESTDIR)/usr/bin/SABnzbd.py $(DESTDIR)/usr/bin/sabnzbdplus
+
+binary-indep: install
+	dh_testdir -i
+	dh_testroot -i
+	# Account for changelogs using non-standard names or being included in readme files
+	dh_installchangelogs
+	dh_installchangelogs -p sabnzbdplus CHANGELOG.txt
+	dh_installchangelogs -p sabnzbdplus-theme-plush -k interfaces/Plush/README.txt
+	dh_installchangelogs -p sabnzbdplus-theme-smpl -k interfaces/smpl/README.txt
+	dh_installchangelogs -p sabnzbdplus-theme-mobile -k interfaces/Mobile/README.txt
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installman -i
+	dh_link -i
+	dh_icons -i
+	dh_installmenu -i
+	dh_lintian -i
+	dh_pysupport -i
+	dh_installinit -i -- defaults 98 02
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: install
+
+binary: binary-indep binary-arch
+
+.PHONY: clean binary-indep binary-arch binary install
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus.init
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus.init
@@ -0,0 +1,136 @@
+#!/bin/sh
+#
+# Copyright (C) 2008-2011 by JCF Ploemen <linux@jp.pp.ru>
+# released under GPL, version 2 or later
+
+################################################
+#                                              #
+#  TO CONFIGURE EDIT /etc/default/sabnzbdplus  #
+#                                              #
+################################################
+
+### BEGIN INIT INFO
+# Provides:          sabnzbdplus
+# Required-Start:    $local_fs $network $remote_fs
+# Required-Stop:     $local_fs $network $remote_fs
+# Should-Start:      NetworkManager
+# Should-Stop:       NetworkManager
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: SABnzbd+ binary newsgrabber
+# Description:       SABnzbd+ is a web-based binary newsgrabber with nzb
+#                    support, designed to download files from Usenet.
+#                    This script provides that functionality as a system
+#                    service, starting the program on boot.
+### END INIT INFO
+
+DAEMON=/usr/bin/sabnzbdplus
+SETTINGS=/etc/default/sabnzbdplus
+
+([ -x $DAEMON ] && [ -r $SETTINGS ]) || exit 0
+
+DESC="SABnzbd+ binary newsgrabber"
+DEFOPTS="--daemon"
+PYTHONEXEC="^$(sed -n '1s/^#\!\([a-z0-9\.\/]\+\)\(.*\)/\1(\2)?/p' $DAEMON)"
+PIDFILE=/var/run/sabnzbdplus.pid
+SETTINGS_LOADED=FALSE
+
+# these are only accepted from the settings file
+unset USER CONFIG HOST PORT EXTRAOPTS
+
+. /lib/lsb/init-functions
+
+check_retval() {
+	if [ $? -eq 0 ]; then
+		log_end_msg 0
+		return 0
+	else
+		log_end_msg 1
+		exit 1
+	fi
+}
+
+is_running() {
+	# returns 0 when running, 1 otherwise
+	PID="$(pgrep -f -x -u ${USER%:*} "$PYTHONEXEC $DAEMON $DEFOPTS.*")"
+	RET=$?
+	[ $RET -gt 1 ] && exit 1 || return $RET
+}
+
+load_settings() {
+	if [ $SETTINGS_LOADED != "TRUE" ]; then
+		. $SETTINGS
+
+		[ -z "$USER" ] && {
+			log_warning_msg "$DESC: not configured, aborting. See $SETTINGS";
+			return 1; }
+		[ -z "${USER%:*}" ] && exit 1
+
+		OPTIONS="$DEFOPTS"
+		[ -n "$CONFIG" ] && OPTIONS="$OPTIONS --config-file $CONFIG"
+		[ -n "$HOST" ] && SERVER="$HOST" || SERVER=
+		[ -n "$PORT" ] && SERVER="$SERVER:$PORT"
+		[ -n "$SERVER" ] && OPTIONS="$OPTIONS --server $SERVER"
+		[ -n "$EXTRAOPTS" ] && OPTIONS="$OPTIONS $EXTRAOPTS"
+		SETTINGS_LOADED=TRUE
+	fi
+	return 0
+}
+
+start_sab() {
+	load_settings || exit 0
+	if ! is_running; then
+		log_daemon_msg "Starting $DESC"
+		start-stop-daemon --quiet --chuid $USER --start --exec $DAEMON -- $OPTIONS
+		check_retval
+		# create a pidfile; we don't use it but some monitoring app likes to have one
+		[ -w $(dirname $PIDFILE) ] && \
+			pgrep -f -x -n -u ${USER%:*} "$PYTHONEXEC $DAEMON $OPTIONS" > $PIDFILE
+	else
+		log_success_msg "$DESC: already running (pid $PID)"
+	fi
+}
+
+stop_sab() {
+	load_settings || exit 0
+	if is_running; then
+		TMPFILE="$(mktemp --tmpdir sabnzbdplus.XXXXXXXXXX)"
+		[ $? -eq 0 ] || exit 1
+		trap '[ -f "$TMPFILE" ] && rm -f "$TMPFILE"' EXIT
+		echo "$PID" > "$TMPFILE"
+		log_daemon_msg "Stopping $DESC"
+		start-stop-daemon --stop --user ${USER%:*} --pidfile "$TMPFILE" --retry 30
+		check_retval
+	else
+		log_success_msg "$DESC: not running"
+	fi
+	[ -f $PIDFILE ] && rm -f $PIDFILE
+}
+
+case "$1" in
+	start)
+		start_sab
+	;;
+	stop)
+		stop_sab
+	;;
+	force-reload|restart)
+		stop_sab
+		start_sab
+	;;
+	status)
+		load_settings || exit 4
+		if is_running; then
+			log_success_msg "$DESC: running (pid $PID)"
+		else
+			log_success_msg "$DESC: not running"
+			[ -f $PIDFILE ] && exit 1 || exit 3
+		fi
+	;;
+	*)
+		log_failure_msg "Usage: $0 {start|stop|restart|force-reload|status}"
+		exit 3
+	;;
+esac
+
+exit 0
--- sabnzbdplus-0.6.15.orig/debian/README.Debian
+++ sabnzbdplus-0.6.15/debian/README.Debian
@@ -0,0 +1,49 @@
+== Cherrypy ==
+Upstream releases include a specific version of cherrypy,
+known to work with the program. Currently, regular cherrypy
+releases suffer from crippling issues in the https
+implementation, see http://www.cherrypy.org/ticket/1068.
+Therefore, the package installs the version supplied by
+upstream as a private module in /usr/share/sabnzbdplus/.
+
+
+== Init script ==
+
+On the upstream forums, a very common question is how to set
+up the program so it starts automatically on boot. For this
+reason an init script is included in the package.
+
+By design nothing is started until/unless the user account
+to use is set in /etc/default/sabnzbdplus. Having the package
+create a user for this very purpose has been considered, but
+was decided against due to the disadvantages of such an
+approach with regard to:
+
+* permissions issues on downloaded files: this program is
+  designed to be an automatic downloader, above all else,
+  and does not provide any interface to manage or access
+  downloaded files.
+* setting things up that way is probably is overly
+  complicated for a typical user's needs, and likely to
+  significantly increase the demand for support from packager
+  and/or upstream developers.
+
+The current init script is therefore geared towards ease of
+use for a simple setup, while still fully allowing for the
+more advanced options, for example with a dedicated user
+account and access to downloaded files regulated through
+group membership.
+
+
+== Interface templates ==
+
+Adding any interface templates that are not available in the
+repositories, can be done by putting those templates in their
+own directory under /usr/share/sabnzbdplus/interfaces/. 
+Make sure they follow the standard subdirectory layout (like
+the Default template):
+
+/usr/share/sabnzbdplus/interfaces/<NAME>/templates/*.tmpl
+
+Templates organised in this way automatically show up as an 
+option in the web-based config dropdown menu.
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus.desktop
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=SABnzbd+
+GenericName=Binary newsgrabber
+Comment=Download from usenet
+Exec=sabnzbdplus --browser 1
+Icon=sabnzbdplus
+Terminal=false
+Type=Application
+Categories=Network;FileTransfer;
--- sabnzbdplus-0.6.15.orig/debian/changelog
+++ sabnzbdplus-0.6.15/debian/changelog
@@ -0,0 +1,6 @@
+sabnzbdplus (0.6.15-0ubuntu1~lucid1~ppa1) lucid; urgency=low
+
+  * New upstream release.
+
+ -- X3-01 <x3webworx@gmail.com>  Thu, 23 Feb 2012 13:12:33 -0000
+
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus.menu
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus.menu
@@ -0,0 +1,5 @@
+?package(sabnzbdplus):needs="X11" \
+  section="Applications/Network/File Transfer" \
+  title="SABnzbd+" \
+  command="/usr/bin/sabnzbdplus --browser 1" \
+  icon="/usr/share/pixmaps/sabnzbdplus.xpm"
--- sabnzbdplus-0.6.15.orig/debian/compat
+++ sabnzbdplus-0.6.15/debian/compat
@@ -0,0 +1 @@
+6
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus-theme-smpl.install
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus-theme-smpl.install
@@ -0,0 +1 @@
+interfaces/smpl/templates /usr/share/sabnzbdplus/interfaces/smpl/
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus.docs
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus.docs
@@ -0,0 +1,2 @@
+ISSUES.txt
+README.txt
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus.default
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus.default
@@ -0,0 +1,24 @@
+# This file is sourced by /etc/init.d/sabnzbdplus
+#
+# When SABnzbd+ is started using the init script, the
+# --daemon option is always used, and the program is
+# started under the account of $USER, as set below.
+#
+# Each setting is marked either "required" or "optional";
+# leaving any required setting unconfigured will cause
+# the service to not start.
+
+# [required] user or uid of account to run the program as:
+USER=
+
+# [optional] full path to the configuration file of your choice;
+#            otherwise, the default location (in $USER's home
+#            directory) is used:
+CONFIG=
+
+# [optional] hostname/ip and port number to listen on:
+HOST=
+PORT=
+
+# [optional] extra command line options, if any:
+EXTRAOPTS=
--- sabnzbdplus-0.6.15.orig/debian/sabnzbdplus-theme-smpl.links
+++ sabnzbdplus-0.6.15/debian/sabnzbdplus-theme-smpl.links
@@ -0,0 +1,2 @@
+/usr/share/javascript/mochikit/MochiKit.js /usr/share/sabnzbdplus/interfaces/smpl/templates/static/MochiKit/MochiKit.js
+/usr/share/javascript/excanvas/excanvas.js /usr/share/sabnzbdplus/interfaces/smpl/templates/static/excanvas/excanvas.js
--- sabnzbdplus-0.6.15.orig/debian/watch
+++ sabnzbdplus-0.6.15/debian/watch
@@ -0,0 +1,3 @@
+# works only for full versions, not for betas or candidate releases
+version=3
+http://sf.net/sabnzbdplus/SABnzbd-([\d\.]*)-src\.tar\.gz
--- sabnzbdplus-0.6.15.orig/debian/source/format
+++ sabnzbdplus-0.6.15/debian/source/format
@@ -0,0 +1 @@
+1.0
--- sabnzbdplus-0.6.15.orig/debian/patches/08_disable_new_version_check.dpatch
+++ sabnzbdplus-0.6.15/debian/patches/08_disable_new_version_check.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_disable_new_version_check.dpatch by JCF Ploemen (jcfp) <linux@jp.pp.ru>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable the builtin check for newer versions.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sabnzbdplus-0.6.0~alpha2~/sabnzbd/misc.py sabnzbdplus-0.6.0~alpha2/sabnzbd/misc.py
+--- sabnzbdplus-0.6.0~alpha2~/sabnzbd/misc.py	2010-09-24 20:27:45.000000000 +0200
++++ sabnzbdplus-0.6.0~alpha2/sabnzbd/misc.py	2010-09-25 21:09:16.894460002 +0200
+@@ -708,6 +708,9 @@
+ 
+ def check_latest_version():
+     """ Do an online check for the latest version """
++    logging.debug("Version check disabled by Ubuntu/Debian packaging")
++    return
++
+     if not cfg.version_check():
+         return
+ 
--- sabnzbdplus-0.6.15.orig/debian/patches/02_find_parts_in_usr_share.dpatch
+++ sabnzbdplus-0.6.15/debian/patches/02_find_parts_in_usr_share.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_find_parts_in_usr_share.dpatch by JCF Ploemen <linux@jp.pp.ru>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: make the program find the interface templates, private python modules under /usr/share
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sabnzbdplus-0.6.0~alpha9~/SABnzbd.py sabnzbdplus-0.6.0~alpha9/SABnzbd.py
+--- sabnzbdplus-0.6.0~alpha9~/SABnzbd.py	2010-12-27 23:03:29.000000000 +0100
++++ sabnzbdplus-0.6.0~alpha9/SABnzbd.py	2010-12-28 19:15:13.295229001 +0100
+@@ -16,6 +16,7 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+ import sys
++sys.path.insert(0,'/usr/share/sabnzbdplus')
+ if sys.version_info < (2,5):
+     print "Sorry, requires Python 2.5 or higher."
+     sys.exit(1)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sabnzbdplus-0.6.0~alpha9~/sabnzbd/constants.py sabnzbdplus-0.6.0~alpha9/sabnzbd/constants.py
+--- sabnzbdplus-0.6.0~alpha9~/sabnzbd/constants.py	2010-12-27 23:03:29.000000000 +0100
++++ sabnzbdplus-0.6.0~alpha9/sabnzbd/constants.py	2010-12-28 19:14:22.685229002 +0100
+@@ -75,10 +75,10 @@
+ DEF_ADMIN_DIR    = 'admin'
+ DEF_LOG_DIR      = 'logs'
+ DEF_NZBBACK_DIR  = ''
+-DEF_LANGUAGE     = 'locale'
+-DEF_INTERFACES   = 'interfaces'
++DEF_LANGUAGE     = '../share/sabnzbdplus/locale'
++DEF_INTERFACES   = '../share/sabnzbdplus/interfaces'
+ DEF_INT_LANGUAGE = 'locale'
+-DEF_EMAIL_TMPL   = 'email'
++DEF_EMAIL_TMPL   = '../share/sabnzbdplus/email'
+ DEF_STDINTF      = 'Plush'
+ DEF_SKIN_COLORS  = {'smpl':'white', 'classic':'darkblue', 'mobile':'light', 'plush' : 'gold'}
+ DEF_MAIN_TMPL    = 'templates/main.tmpl'
--- sabnzbdplus-0.6.15.orig/debian/patches/06_use_packaged_modules.dpatch
+++ sabnzbdplus-0.6.15/debian/patches/06_use_packaged_modules.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_use_packaged_modules.dpatch by JCF Ploemen (jcfp) <linux@jp.pp.ru>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use system python modules rather than included copies.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sabnzbdplus-0.6.0~alpha2~/sabnzbd/config.py sabnzbdplus-0.6.0~alpha2/sabnzbd/config.py
+--- sabnzbdplus-0.6.0~alpha2~/sabnzbd/config.py	2010-09-24 20:27:45.000000000 +0200
++++ sabnzbdplus-0.6.0~alpha2/sabnzbd/config.py	2010-09-25 10:31:29.404460001 +0200
+@@ -25,7 +25,7 @@
+ import sabnzbd.misc
+ import sabnzbd.constants as constants
+ from sabnzbd.utils import listquote
+-from sabnzbd.utils import configobj
++import configobj
+ from sabnzbd.decorators import synchronized
+ 
+ CONFIG_LOCK = threading.Lock()
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sabnzbdplus-0.6.0~alpha2~/sabnzbd/rss.py sabnzbdplus-0.6.0~alpha2/sabnzbd/rss.py
+--- sabnzbdplus-0.6.0~alpha2~/sabnzbd/rss.py	2010-09-24 20:27:45.000000000 +0200
++++ sabnzbdplus-0.6.0~alpha2/sabnzbd/rss.py	2010-09-25 10:33:19.844460002 +0200
+@@ -33,7 +33,7 @@
+ import sabnzbd.emailer as emailer
+ from sabnzbd.encoding import latin1, unicoder
+ 
+-import sabnzbd.utils.feedparser as feedparser
++import feedparser
+ 
+ __RSS = None  # Global pointer to RSS-scanner instance
+ 
--- sabnzbdplus-0.6.15.orig/debian/patches/00list
+++ sabnzbdplus-0.6.15/debian/patches/00list
@@ -0,0 +1,4 @@
+02_find_parts_in_usr_share.dpatch
+04_use_config_when_daemon.dpatch
+06_use_packaged_modules.dpatch
+08_disable_new_version_check.dpatch
--- sabnzbdplus-0.6.15.orig/debian/patches/04_use_config_when_daemon.dpatch
+++ sabnzbdplus-0.6.15/debian/patches/04_use_config_when_daemon.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_use_config_when_daemon.dpatch by JCF Ploemen (jcfp) <linux@jp.pp.ru>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use the normal configuration when run as a daemon
+
+@DPATCH@
+diff -urNad sabnzbdplus-0.5.0~alpha3~/SABnzbd.py sabnzbdplus-0.5.0~alpha3/SABnzbd.py
+--- sabnzbdplus-0.5.0~alpha3~/SABnzbd.py	2009-06-03 20:59:44.000000000 +0200
++++ sabnzbdplus-0.5.0~alpha3/SABnzbd.py	2009-06-03 21:01:09.000000000 +0200
+@@ -284,20 +284,7 @@
+     """ Get the default data locations
+     """
+     ok = False
+-    if sabnzbd.DAEMON:
+-        # In daemon mode, do not try to access the user profile
+-        # just assume that everything defaults to the program dir
+-        sabnzbd.DIR_APPDATA = sabnzbd.DIR_PROG
+-        sabnzbd.DIR_LCLDATA = sabnzbd.DIR_PROG
+-        sabnzbd.DIR_HOME = sabnzbd.DIR_PROG
+-        if sabnzbd.WIN32:
+-            # Ignore Win32 "logoff" signal
+-            # This should work, but it doesn't
+-            # Instead the signal_handler will ignore the "logoff" signal
+-            #signal.signal(5, signal.SIG_IGN)
+-            pass
+-        ok = True
+-    elif sabnzbd.WIN32:
++    if sabnzbd.WIN32:
+         specials = get_user_shellfolders()
+         try:
+             sabnzbd.DIR_APPDATA = '%s\\%s' % (specials['AppData'], DEF_WORKDIR)