Package: hellanzb
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if it is ok to upload the upgraded version in a NMU in
case you are working on other issues needing attention.
Thanks,
Jari
>From 382280e817b0dbe9a8a3155b55a330141e44fa5b Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 25 Feb 2012 08:42:21 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 26 -------------
debian/changelog | 10 +++++
debian/compat | 2 +-
debian/control | 4 +-
...ch_path => 000-Fix_conf_file_search_path.patch} | 8 +---
...nd_on => 001-Choose_interface_to_bind_on.patch} | 38 +++++++++----------
...ize_conf_file => 002-Debianize_conf_file.patch} | 22 ++++++------
...ltiples_hosts => 003-Fix_multiples_hosts.patch} | 11 ++----
debian/patches/004-Fix_group_with_extra_whitespace | 20 ----------
.../004-Fix_group_with_extra_whitespace.patch | 20 ++++++++++
..._unrar => 005-Fix_crash_on_missing_unrar.patch} | 16 +++-----
...g => 006-Fix_embedded_nzb_postprocessing.patch} | 18 ++++-----
....0.0_compat => 007-Twisted_10.0.0_compat.patch} | 29 ++++++++-------
debian/patches/00list | 9 -----
...0-python_26_fixes => 100-python_26_fixes.patch} | 11 ++----
debian/patches/series | 9 +++++
debian/rules | 5 +--
debian/source/format | 1 +
18 files changed, 113 insertions(+), 146 deletions(-)
delete mode 100644 debian/README.source
rename debian/patches/{000-Fix_conf_file_search_path => 000-Fix_conf_file_search_path.patch} (83%)
rename debian/patches/{001-Choose_interface_to_bind_on => 001-Choose_interface_to_bind_on.patch} (59%)
rename debian/patches/{002-Debianize_conf_file => 002-Debianize_conf_file.patch} (70%)
rename debian/patches/{003-Fix_multiples_hosts => 003-Fix_multiples_hosts.patch} (94%)
delete mode 100644 debian/patches/004-Fix_group_with_extra_whitespace
create mode 100644 debian/patches/004-Fix_group_with_extra_whitespace.patch
rename debian/patches/{005-Fix_crash_on_missing_unrar => 005-Fix_crash_on_missing_unrar.patch} (76%)
rename debian/patches/{006-Fix_embedded_nzb_postprocessing => 006-Fix_embedded_nzb_postprocessing.patch} (55%)
rename debian/patches/{007-Twisted_10.0.0_compat => 007-Twisted_10.0.0_compat.patch} (55%)
delete mode 100644 debian/patches/00list
rename debian/patches/{100-python_26_fixes => 100-python_26_fixes.patch} (92%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index b59f078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,26 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
diff --git a/debian/changelog b/debian/changelog
index 935be61..af70def 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+hellanzb (0.13-6.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove dpatch and upgrade to packaging format "3.0 quilt".
+ Note: some patches were updated with "quilt refresh" to make
+ patches apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 25 Feb 2012 08:41:03 -0500
+
hellanzb (0.13-6.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 8611866..4c067df 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: hellanzb
Section: net
Priority: extra
Maintainer: Adam Cécile (Le_Vert) <gand...@le-vert.net>
-Build-Depends: debhelper (>= 5.0.37.2), dpatch
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: python-all (>= 2.5.4), python-all, python-support (>= 0.5.3)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Homepage: http://www.hellanzb.com/
Package: hellanzb
diff --git a/debian/patches/000-Fix_conf_file_search_path b/debian/patches/000-Fix_conf_file_search_path.patch
similarity index 83%
rename from debian/patches/000-Fix_conf_file_search_path
rename to debian/patches/000-Fix_conf_file_search_path.patch
index ee22dd2..6e80aa8 100644
--- a/debian/patches/000-Fix_conf_file_search_path
+++ b/debian/patches/000-Fix_conf_file_search_path.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 000-Fix_conf_file_search_path by
-## Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: Search for configuration file in $HOME/.hellanzb/ or /etc/
+From: Unkown
+Subject: Search for configuration file in $HOME/.hellanzb/ or /etc/
-@DPATCH@
diff -u hellanzb-0.11/Hellanzb/Core.py hellanzb-0.11/Hellanzb/Core.py.new
--- hellanzb-0.11/Hellanzb/Core.py 2007-02-10 15:01:50.000000000 +0100
diff --git a/debian/patches/001-Choose_interface_to_bind_on b/debian/patches/001-Choose_interface_to_bind_on.patch
similarity index 59%
rename from debian/patches/001-Choose_interface_to_bind_on
rename to debian/patches/001-Choose_interface_to_bind_on.patch
index a254a9d..6840494 100644
--- a/debian/patches/001-Choose_interface_to_bind_on
+++ b/debian/patches/001-Choose_interface_to_bind_on.patch
@@ -1,15 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001-Choose_interface_to_bind_on
-## by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: Add a Hellanzb.XMLRPC_SERVER option which allowusers to set on which
-## DP: IP address XMLRPC server will be binded.
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Add a Hellanzb.XMLRPC_SERVER option which allowusers to set on which
+ IP address XMLRPC server will be binded.
-@DPATCH@
-diff -u hellanzb-0.11/Hellanzb/HellaXMLRPC/__init__.py hellanzb-0.11/Hellanzb/HellaXMLRPC/__init__.py.new
---- hellanzb-0.11/Hellanzb/HellaXMLRPC/__init__.py 2007-01-30 03:51:05.000000000 +0100
-+++ hellanzb-0.11/Hellanzb/HellaXMLRPC/__init__.py.new 2007-02-10 15:19:14.000000000 +0100
-@@ -597,9 +597,9 @@
+---
+ Hellanzb/Core.py | 4 +++-
+ Hellanzb/HellaXMLRPC/__init__.py | 4 ++--
+ etc/hellanzb.conf.sample | 4 ++++
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+--- a/Hellanzb/HellaXMLRPC/__init__.py
++++ b/Hellanzb/HellaXMLRPC/__init__.py
+@@ -590,9 +590,9 @@
try:
if SECURE:
secure = HtPasswdWrapper(hxmlrpcs, 'hellanzb', Hellanzb.XMLRPC_PASSWORD, 'hellanzb XML RPC')
@@ -21,11 +22,9 @@ diff -u hellanzb-0.11/Hellanzb/HellaXMLRPC/__init__.py hellanzb-0.11/Hellanzb/He
except CannotListenError, cle:
error(str(cle))
raise FatalError('Cannot bind to XML RPC port, is another hellanzb queue daemon already running?')
-
-diff -u hellanzb-0.11/etc/hellanzb.conf.sample hellanzb-0.11/etc/hellanzb.conf.sample.new
---- hellanzb-0.11/etc/hellanzb.conf.sample 2007-01-30 03:51:05.000000000 +0100
-+++ hellanzb-0.11/etc/hellanzb.conf.sample.new 2007-02-10 15:18:10.000000000 +0100
-@@ -151,6 +151,10 @@
+--- a/etc/hellanzb.conf.sample
++++ b/etc/hellanzb.conf.sample
+@@ -175,6 +175,10 @@
# Hostname for the XMLRPC client to connect to. By default, localhost
Hellanzb.XMLRPC_SERVER = 'localhost'
@@ -36,10 +35,9 @@ diff -u hellanzb-0.11/etc/hellanzb.conf.sample hellanzb-0.11/etc/hellanzb.conf.s
# Port number the XML RPC server will listen on, and the client will connect to.
# Set to 'None' (without the quotes!) for no XML RPC server
Hellanzb.XMLRPC_PORT = 8760
-diff -u hellanzb-0.11/Hellanzb/Core.py hellanzb-0.11/Hellanzb/Core.py.new
---- hellanzb-0.11/Hellanzb/Core.py 2007-01-30 03:51:05.000000000 +0100
-+++ hellanzb-0.11/Hellanzb/Core.py.new 2007-02-10 15:18:10.000000000 +0100
-@@ -113,7 +106,9 @@
+--- a/Hellanzb/Core.py
++++ b/Hellanzb/Core.py
+@@ -106,7 +106,9 @@
if not hasattr(Hellanzb, 'SKIP_UNRAR') or Hellanzb.SKIP_UNRAR is None:
Hellanzb.SKIP_UNRAR = False
diff --git a/debian/patches/002-Debianize_conf_file b/debian/patches/002-Debianize_conf_file.patch
similarity index 70%
rename from debian/patches/002-Debianize_conf_file
rename to debian/patches/002-Debianize_conf_file.patch
index 4f26f78..e084f8d 100644
--- a/debian/patches/002-Debianize_conf_file
+++ b/debian/patches/002-Debianize_conf_file.patch
@@ -1,15 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 002-Debianize_conf_file by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: Set various options to fit a Debian system.
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Set various options to fit a Debian system.
-@DPATCH@
-diff -u hellanzb-0.11/etc/hellanzb.conf.sample hellanzb-0.11/etc/hellanzb.conf.sample.new
---- hellanzb-0.11/etc/hellanzb.conf.sample 2007-02-10 15:21:34.000000000 +0100
-+++ hellanzb-0.11/etc/hellanzb.conf.sample.new 2007-02-10 15:30:39.000000000 +0100
+---
+ etc/hellanzb.conf.sample | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/etc/hellanzb.conf.sample
++++ b/etc/hellanzb.conf.sample
@@ -10,10 +10,10 @@
- # $Id: hellanzb.conf.sample 978 2007-01-29 03:00:30Z pjenvey $
+ # $Id: hellanzb.conf.sample 1057 2007-03-27 04:13:53Z pjenvey $
# Log output to this file, set to None (no single quotes) for no logging
-Hellanzb.LOG_FILE = '/var/tmp/hellanzb.log'
@@ -21,7 +21,7 @@ diff -u hellanzb-0.11/etc/hellanzb.conf.sample hellanzb-0.11/etc/hellanzb.conf.s
# Automatically roll over both log files when they reach LOG_FILE_MAX_BYTES
# size
-@@ -55,13 +55,13 @@
+@@ -56,13 +56,13 @@
# Important locations
@@ -37,7 +37,7 @@ diff -u hellanzb-0.11/etc/hellanzb.conf.sample hellanzb-0.11/etc/hellanzb.conf.s
# The .nzb currently being downloaded is stored here
Hellanzb.CURRENT_DIR = Hellanzb.PREFIX_DIR + 'nzb/daemon.current/'
-@@ -105,10 +105,10 @@
+@@ -117,10 +117,10 @@
#Hellanzb.UNRAR_CMD = None
# Supply a path to the par2 command
diff --git a/debian/patches/003-Fix_multiples_hosts b/debian/patches/003-Fix_multiples_hosts.patch
similarity index 94%
rename from debian/patches/003-Fix_multiples_hosts
rename to debian/patches/003-Fix_multiples_hosts.patch
index 7de1905..930244b 100644
--- a/debian/patches/003-Fix_multiples_hosts
+++ b/debian/patches/003-Fix_multiples_hosts.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 003-Fix_multiples_hosts
-## by Benoit Boissinot <bbois...@ens-lyon.fr>
-##
-## DP: If you have a defineServer stance with multiple hosts, some variables
-## DP: are incorrectly incremented and the screen isnt properly redraw.
-
-@DPATCH@
+From: Benoit Boissinot <bbois...@ens-lyon.fr>
+Subject: If you have a defineServer stance with multiple hosts, some variables
+ are incorrectly incremented and the screen isnt properly redraw.
diff -r 4cc23a5163b4 Hellanzb/NZBLeecher/Protocol.py
--- a/Hellanzb/NZBLeecher/Protocol.py Sun Dec 02 20:24:29 2007 +0100
diff --git a/debian/patches/004-Fix_group_with_extra_whitespace b/debian/patches/004-Fix_group_with_extra_whitespace
deleted file mode 100644
index 2f86608..0000000
--- a/debian/patches/004-Fix_group_with_extra_whitespace
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 004-Fix_group_with_extra_whitespace
-## by HellaNZB upstream
-##
-## DP: Fix mishandling of group values with extra whitespace (goes into
-## DP: infinite loop)
-## DP: See http://www.hellanzb.com/trac/hellanzb/ticket/393
-## DP: And upstream fix: http://www.hellanzb.com/trac/hellanzb/changeset/1089
-
-@DPATCH@
-
---- trunk/Hellanzb/NZBLeecher/Protocol.py (revision 1080)
-+++ trunk/Hellanzb/NZBLeecher/Protocol.py (revision 1089)
-@@ -660,5 +660,5 @@
-
- def gotGroup(self, group):
-- group = group[3]
-+ group = self.gettingGroup
- self.activeGroups.append(group)
- self.gettingGroup = None
diff --git a/debian/patches/004-Fix_group_with_extra_whitespace.patch b/debian/patches/004-Fix_group_with_extra_whitespace.patch
new file mode 100644
index 0000000..2e29255
--- /dev/null
+++ b/debian/patches/004-Fix_group_with_extra_whitespace.patch
@@ -0,0 +1,20 @@
+From: HellaNZB upstream
+Subject: Fix mishandling of group values with extra whitespace.
+ This causes infinite loop.
+ And upstream fix: http://www.hellanzb.com/trac/hellanzb/changeset/1089
+
+---
+ Hellanzb/NZBLeecher/Protocol.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Hellanzb/NZBLeecher/Protocol.py
++++ b/Hellanzb/NZBLeecher/Protocol.py
+@@ -652,7 +652,7 @@
+ reactor.callInThread(decode, segment)
+
+ def gotGroup(self, group):
+- group = group[3]
++ group = self.gettingGroup
+ self.activeGroups.append(group)
+ self.gettingGroup = None
+ debug(str(self) + ' got GROUP: ' + group)
diff --git a/debian/patches/005-Fix_crash_on_missing_unrar b/debian/patches/005-Fix_crash_on_missing_unrar.patch
similarity index 76%
rename from debian/patches/005-Fix_crash_on_missing_unrar
rename to debian/patches/005-Fix_crash_on_missing_unrar.patch
index 32809ae..9de6df8 100644
--- a/debian/patches/005-Fix_crash_on_missing_unrar
+++ b/debian/patches/005-Fix_crash_on_missing_unrar.patch
@@ -1,14 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 005-Fix_crash_on_missing_unrar by
-## Severin Heiniger <severinheini...@gmail.com>
-##
-## DP: This package doesn't depend on unrar and SKIP_UNRAR is set to True by the
-## DP: 002-Debianize_conf_file patch.
-## DP: However, if unrar isn't installed, HellaNZB crashes on startup no matter
-## DP: what SKIP_UNRAR is set to. This patch causes HellaNZB not to look for the
-## DP: unrar executable if SKIP_UNRAR is set to True.
+From: Severin Heiniger <severinheini...@gmail.com>
+Subject: This package doesn't depend on unrar.
+ SKIP_UNRAR is set to True by the 002-Debianize_conf_file patch.
+ However, if unrar isn't installed, HellaNZB crashes on startup no matter
+ what SKIP_UNRAR is set to. This patch causes HellaNZB not to look for the
+ unrar executable if SKIP_UNRAR is set to True.
-@DPATCH@
diff -urNad hellanzb-0.13~/Hellanzb/Core.py hellanzb-0.13/Hellanzb/Core.py
--- hellanzb-0.13~/Hellanzb/Core.py 2009-11-04 19:30:49.115313617 +0100
+++ hellanzb-0.13/Hellanzb/Core.py 2009-11-04 19:31:16.375292395 +0100
diff --git a/debian/patches/006-Fix_embedded_nzb_postprocessing b/debian/patches/006-Fix_embedded_nzb_postprocessing.patch
similarity index 55%
rename from debian/patches/006-Fix_embedded_nzb_postprocessing
rename to debian/patches/006-Fix_embedded_nzb_postprocessing.patch
index d59b069..d0ac6e1 100644
--- a/debian/patches/006-Fix_embedded_nzb_postprocessing
+++ b/debian/patches/006-Fix_embedded_nzb_postprocessing.patch
@@ -1,14 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 006-Fix_embedded_nzb_postprocessing by Severin Heiniger <severinheini...@gmail.com>
-##
-## DP: This bug has originally been triaged and patched by
-## DP: Marcel de Vries <marceldevr...@phannet.cc>. Thanks alot!
-## DP: Post-processing of a download is stalled if a download includes an NZB
-## DP: file with the same name as the download because the `move` operation
-## DP: fails due to the already existing file. Additionally, `nzb.nzbFileName`
-## DP: is set to the wrong path. This patch fixes both issues.
+From: Severin Heiniger <severinheini...@gmail.com>
+Subject: Fix move NZB file related issues.
+ This bug has originally been triaged and patched by
+ Marcel de Vries <marceldevr...@phannet.cc>. Thanks alot!
+ Post-processing of a download is stalled if a download includes an NZB
+ file with the same name as the download because the `move` operation
+ fails due to the already existing file. Additionally, `nzb.nzbFileName`
+ is set to the wrong path. This patch fixes both issues.
-@DPATCH@
diff -urNad hellanzb-0.13~/Hellanzb/Daemon.py hellanzb-0.13/Hellanzb/Daemon.py
--- hellanzb-0.13~/Hellanzb/Daemon.py 2007-03-27 06:20:43.000000000 +0200
+++ hellanzb-0.13/Hellanzb/Daemon.py 2009-11-17 19:56:51.252730688 +0100
diff --git a/debian/patches/007-Twisted_10.0.0_compat b/debian/patches/007-Twisted_10.0.0_compat.patch
similarity index 55%
rename from debian/patches/007-Twisted_10.0.0_compat
rename to debian/patches/007-Twisted_10.0.0_compat.patch
index aa66486..9c88c57 100644
--- a/debian/patches/007-Twisted_10.0.0_compat
+++ b/debian/patches/007-Twisted_10.0.0_compat.patch
@@ -1,12 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 007-Twisted_10.0.0_compat.dpatch by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## Fix compatibility with Twisted 10.0.0. See #573221
-## DP: Eric Evans <eev...@debian.org>
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Fix compatibility with Twisted 10.0.0. See #573221
+ Patch thanks to Eric Evans <eev...@debian.org>
-@DPATCH@
---- hellanzb-0.13~/Hellanzb/HellaXMLRPC/xmlrpc.py 2010-03-10 18:29:19.000000000 -0600
-+++ hellanzb-0.13/Hellanzb/HellaXMLRPC/xmlrpc.py 2010-03-10 18:30:03.000000000 -0600
+---
+ Hellanzb/HellaReactor.py | 2 +-
+ Hellanzb/HellaXMLRPC/HtPasswdAuth.py | 2 +-
+ Hellanzb/HellaXMLRPC/xmlrpc.py | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/Hellanzb/HellaXMLRPC/xmlrpc.py
++++ b/Hellanzb/HellaXMLRPC/xmlrpc.py
@@ -31,7 +31,7 @@
from twisted.python import log, reflect
@@ -16,9 +19,9 @@
from twisted.web import http
else:
from twisted.protocols import http
---- hellanzb-0.13~/Hellanzb/HellaXMLRPC/HtPasswdAuth.py 2010-03-10 18:30:29.000000000 -0600
-+++ hellanzb-0.13/Hellanzb/HellaXMLRPC/HtPasswdAuth.py 2010-03-10 18:30:49.000000000 -0600
-@@ -19,7 +19,7 @@
+--- a/Hellanzb/HellaXMLRPC/HtPasswdAuth.py
++++ b/Hellanzb/HellaXMLRPC/HtPasswdAuth.py
+@@ -13,7 +13,7 @@
from twisted.web.resource import Resource
import twisted.copyright
@@ -27,8 +30,8 @@
from twisted.web import http
else:
from twisted.protocols import http
---- hellanzb-0.13~/Hellanzb/HellaReactor.py 2010-03-10 18:22:34.000000000 -0600
-+++ hellanzb-0.13/Hellanzb/HellaReactor.py 2010-03-10 18:30:07.000000000 -0600
+--- a/Hellanzb/HellaReactor.py
++++ b/Hellanzb/HellaReactor.py
@@ -9,7 +9,7 @@
import Hellanzb, sys, time
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c2c6856..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,9 +0,0 @@
-000-Fix_conf_file_search_path
-001-Choose_interface_to_bind_on
-002-Debianize_conf_file
-003-Fix_multiples_hosts
-004-Fix_group_with_extra_whitespace
-005-Fix_crash_on_missing_unrar
-006-Fix_embedded_nzb_postprocessing
-007-Twisted_10.0.0_compat
-100-python_26_fixes
diff --git a/debian/patches/100-python_26_fixes b/debian/patches/100-python_26_fixes.patch
similarity index 92%
rename from debian/patches/100-python_26_fixes
rename to debian/patches/100-python_26_fixes.patch
index 558dd70..64061dd 100644
--- a/debian/patches/100-python_26_fixes
+++ b/debian/patches/100-python_26_fixes.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## python_26_fixes.dpatch by Alessio Treglia <quadris...@ubuntu.com>
-##
-## DP: Fixes Python 2.6 deprecation warnings.
-## DP: Original patch is available at:
-## DP: http://www.hellanzb.com/trac/hellanzb/ticket/419
+From: Alessio Treglia <quadris...@ubuntu.com>
+Subject: Fixes Python 2.6 deprecation warnings.
+ Original patch is available at:
+ http://www.hellanzb.com/trac/hellanzb/ticket/419
-@DPATCH@
diff -urNad hellanzb-0.13~/Hellanzb/Growl.py hellanzb-0.13/Hellanzb/Growl.py
--- hellanzb-0.13~/Hellanzb/Growl.py 2007-03-27 06:20:43.000000000 +0200
+++ hellanzb-0.13/Hellanzb/Growl.py 2009-04-21 11:20:38.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6a1f6fc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+000-Fix_conf_file_search_path.patch
+001-Choose_interface_to_bind_on.patch
+002-Debianize_conf_file.patch
+003-Fix_multiples_hosts.patch
+004-Fix_group_with_extra_whitespace.patch
+005-Fix_crash_on_missing_unrar.patch
+006-Fix_embedded_nzb_postprocessing.patch
+007-Twisted_10.0.0_compat.patch
+100-python_26_fixes.patch
diff --git a/debian/rules b/debian/rules
index 5e9c779..7a580bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@
#export DH_VERBOSE=1
# Include dpatch targets
-include /usr/share/dpatch/dpatch.make
# Install directory
DESTDIR = $(CURDIR)/debian/hellanzb
@@ -16,9 +15,9 @@ PYDEF = $(shell pyversions -d)
include /usr/share/python/python.mk
SITEDIR = $(call py_sitename, $(PYDEF))
-build: patch
+build:
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -rf build/
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.9
