Hi,
I updated the packaging for the new upstream version (0.7.0).
The attached patches re-add the manpages, which for some reason are no longer
shipped upstream and change the source format to 3.0 (quilt).
They also change the package to use debhelper 9 sequences and dh_python2
instead of the deprecated python-support.
You can also find those patches on https://github.com/schaal/pyzor
--
Daniel
>From 5daa223985a885a7e1e9801e548e286ac057a0dd Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farb...@web.de>
Date: Mon, 26 May 2014 18:51:22 +0200
Subject: [PATCH 1/5] Add manpages from previous version, no longer shipped
upstream
---
debian/manpages | 2 +
debian/pyzor.1 | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/pyzord.1 | 44 +++++++++++++++++++
3 files changed, 174 insertions(+)
create mode 100644 debian/manpages
create mode 100644 debian/pyzor.1
create mode 100644 debian/pyzord.1
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..a8939fe
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,2 @@
+debian/pyzor.1
+debian/pyzord.1
diff --git a/debian/pyzor.1 b/debian/pyzor.1
new file mode 100644
index 0000000..c13019d
--- /dev/null
+++ b/debian/pyzor.1
@@ -0,0 +1,128 @@
+.TH PYZOR 1 "10 Oct 2002"
+.SH NAME
+pyzor \- spam\-catcher using a collaborative filtering network
+.SH SYNOPSIS
+\fBpyzor\fP [\fB\-d\fP] [\fB\-\-homedir\fP \fIdir\fP] \fIcommand\fP [\fIcommand\_options\fP]
+.SH OPTIONS
+.TP
+\fB\-d\fP
+turn on debugging
+.TP
+\fB\-\-homedir\fI dir\fP
+use dir as the home directory for Pyzor instead of the default ~/.pyzor.
+See the files section for more information on what files are inside of the
+homedir.
+.SH COMMANDS
+.TP
+\fBcheck\fP[\fB\-\-mbox\fP]
+Reads on standard input an RFC 822 (email) message. Exit code is zero (0)
+if and only if a match is found and the global whitelist count is zero.
+.BR
+If \-\-mbox is provided, then the input is assumed to be a unix mailbox, and
+all messages in it will be checked.
+.BR
+If multiple servers are listed in the configuration file, the exit code will
+be zero (0) if and only if there is a match found on at least one server
+(without it being whitelisted anyplace).
+.TP
+\fBreport \fP[\fB\-\-mbox\fP]
+Reads on standard input an RFC 822 (email) message. Reports to the server a
+digest of each message in the mailbox as spam. Writes to standard output a
+tuple of (error\-code, message) from the server.
+.BR
+If \-\-mbox is provided, then the input is assumed to be a unix mailbox, and
+all messages in it will be sent to the server.
+.TP
+\fBwhitelist \fP[\fB\-\-mbox\fP]
+Reads on standard input an RFC 822 (email) message. Sends to the server a
+digest of each message in the mailbox for whitelisting. Writes to standard
+output a tuple of (error\-code, message) from the server.
+.BR
+If \-\-mbox is provided, then the input is assumed to be a unix mailbox, and
+all messages in it will be sent to the server.
+.TP
+\fBdiscover\fP
+Finds Pyzor servers, and writes them to ~/.pyzor/servers. This may
+accomplished through querying already-known servers or an HTTP call to a
+hard-coded address.
+.TP
+\fBping\fP
+Merely requests a response from the servers.
+.TP
+\fBgenkey\fP
+Based upon a secret passphrase gathered from the user and salt gathered from
+/dev/random, prints to standard output a tuple of "salt,key".
+Used to put account information into the accounts file.
+See the section Using Accounts for more information.
+.TP
+\fBdigest \fP[\fB\-\-mbox\fP]
+Reads on standard input an RFC 822 (email) message. Writes the
+digest of the message to standard output.
+.BR
+If \-\-mbox is provided, then the input is assumed to be a unix
+mailbox, each message's digest is written to standard output, separated
+by newlines.
+.TP
+\fBpredigest\fP
+Reads on standard input an RFC 822 (email) message. Writes to
+standard output the normalized lines of data that are digested, with the
+exception that the lines printed have newlines (all whitespace is
+removed before digesting).
+
+.SH USING PYZOR WITH READYEXEC
+\fBReadyExec\fP is a system to eliminate the high startup-cost of executing
+scripts repeatedly. If you execute pyzor a lot, you might be interested
+in installing ReadyExec and using it with pyzor.
+
+To use pyzor with ReadyExec, the readyexecd.py server needs to be
+started as:
+
+ readyexecd.py socket_file pyzor
+
+socket_file can be any (non\-existing) filename you wish ReadyExec to
+use, such as /tmp/pyzor:
+
+ readyexecd.py /tmp/pyzor pyzor
+
+Individual clients are then executed as:
+
+ readyexec socket_file options command cmd_options
+
+For example:
+
+ readyexec /tmp/pyzor check
+ readyexec /tmp/pyzor report
+ readyexec /tmp/pyzor whitelist \-\-mbox
+ readyexec /tmp/pyzor \-d ping
+
+ReadyExec can be found at: http://readyexec.sourceforge.net/
+.SH INTEGRATION WITH MUTT
+Add the following line to mutt.conf:
+
+ macro index S "|/usr/bin/pyzor report"
+
+Then press S on the spam message in mutt to report it with pyzor.
+.SH FILES
+\fI~/.pyzor/config\fP
+
+The format of this file is INI-style (name=value, divided into [sections]).
+Names are case insensitive. All values which are filenames can have
+shell\-style tildes (~) in them. All values which are relative filenames are
+interpreted to be relative to the Pyzor homedir.
+
+\fBDefaults\fP
+ [client]
+ ServersFile = servers
+ AccountsFile = accounts
+ DiscoverServersURL = http://pyzor.sourceforge.net/cgi-bin/inform\-servers\-0\-3\-x
+ Timeout = 5
+.SH SEE ALSO
+pyzord(1)
+.SH AUTHOR
+This manpage was originally written by Bastian Kleineidam
+<cal...@debian.org> for the Debian distribution of pyzor but may be used
+by others.
+.BR
+The main author of pyzor is Frank J. Tobin <fto...@neverending.org>. The
+main project page for pyzor can be found at
+http://sourceforge.net/projects/pyzor
diff --git a/debian/pyzord.1 b/debian/pyzord.1
new file mode 100644
index 0000000..81353e0
--- /dev/null
+++ b/debian/pyzord.1
@@ -0,0 +1,44 @@
+.TH PYZORD 1 "10 Oct 2002"
+.SH NAME
+pyzord \- spam\-catching server
+.SH SYNOPSIS
+\fBpyzord\fP [\fB\-d\fP] [\fB\-\-homedir\fP \fIdir\fP]
+
+Note: pyzord does not daemonize itself.
+
+Note: logging information is written to standard output.
+
+.SH OPTIONS
+.TP
+\fB\-d\fP
+Turn on debugging
+.TP
+\fB\-\-homedir\fP \fIdir\fP
+use dir as the home directory for Pyzor instead of the default ~/.pyzor.
+See the files section for more information on what files are inside of the
+homedir.
+.SH FILES
+\fI~/.pyzor/config\fP
+
+The format of this file is INI-style (name=value, divided into [sections]).
+Names are case insensitive. All values which are filenames can have
+shell\-style tildes (~) in them. All values which are relative filenames are
+interpreted to be relative to the Pyzor homedir.
+
+\fBDefaults\fP
+ [server]
+ Port = 24441
+ ListenAddress = 0.0.0.0
+ DigestDB = pyzord.db
+ PasswdFile = pyzord.passwd
+ AccessFile = pyzord.access
+.SH SEE ALSO
+pyzor(1)
+.SH AUTHOR
+This manpage was originally written by Bastian Kleineidam
+<cal...@debian.org> for the Debian distribution of pyzor but may be used
+by others.
+.BR
+The main author of pyzor is Frank J. Tobin <fto...@neverending.org>. The
+main project page for pyzor can be found at
+http://sourceforge.net/projects/pyzor
--
2.0.0
>From 1005a4e6b613e6b4404a0e7ed17328e9856a3548 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farb...@web.de>
Date: Mon, 26 May 2014 18:52:16 +0200
Subject: [PATCH 2/5] Use 3.0 (quilt) format
---
debian/source/format | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
2.0.0
>From 73737c2f5c73047e57fb3beadf9404e53b88d7aa Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farb...@web.de>
Date: Mon, 26 May 2014 18:52:58 +0200
Subject: [PATCH 3/5] Move to dh9, use dh_python2
---
debian/compat | 2 +-
debian/control | 2 +-
debian/pycompat | 1 -
debian/rules | 19 ++-----------------
4 files changed, 4 insertions(+), 20 deletions(-)
delete mode 100644 debian/pycompat
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 0ade180..0d9c8fb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Carl Chenet <cha...@ohmytux.com>
Uploaders: Python Applications Packaging Team <python-apps-t...@lists.alioth.debian.org>
Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.43), python-dev (>= 2.3.5-11), python-support (>= 0.5.3)
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), dh-python, python-setuptools
Homepage: http://pyzor.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pyzor/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/pyzor/trunk/
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/rules b/debian/rules
index b1c25a2..4647c9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,4 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
-
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-BASE := $(CURDIR)/debian/pyzor
-DEB_INSTALL_MANPAGES_pyzor := docs/pyzor.1 docs/pyzord.1
-
-binary-indep-post-install/pyzor::
- install -m755 scripts/pyzor $(BASE)/usr/bin/pyzor
- install -m755 scripts/pyzord $(BASE)/usr/bin/pyzord
-
-clean::
- rm -f lib/pyzor/*.pyc lib/pyzor/*.pyo
-
-binary-install/pyzor::
- dh_pysupport -p$(cdbs_curpkg)
+%:
+ dh $@ --with python2
--
2.0.0
>From 560162513521fce51a287dd3bb7edea08b03deac Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farb...@web.de>
Date: Mon, 26 May 2014 18:57:21 +0200
Subject: [PATCH 4/5] Use standards version 3.9.5, no changes needed.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 0d9c8fb..8d225c4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: mail
Priority: optional
Maintainer: Carl Chenet <cha...@ohmytux.com>
Uploaders: Python Applications Packaging Team <python-apps-t...@lists.alioth.debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.9.5
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), dh-python, python-setuptools
Homepage: http://pyzor.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pyzor/trunk/
--
2.0.0
>From 7b2bce1a3a564d6dc557b08a396f398b621c6f22 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farb...@web.de>
Date: Sat, 31 May 2014 10:32:21 +0200
Subject: [PATCH 5/5] Install NEWS as upstream changelog
---
debian/rules | 3 +++
1 file changed, 3 insertions(+)
diff --git a/debian/rules b/debian/rules
index 4647c9c..83739e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,6 @@
%:
dh $@ --with python2
+
+override_dh_installchangelogs:
+ dh_installchangelogs NEWS
--
2.0.0
