[Python-apps-commits] r3187 - in packages/pyzor/trunk/debian (8 files)

Thu Jun 25 20:46:27 UTC 2009

Date: Thursday, June 25, 2009 @ 20:46:23
  Author: tklauser-guest
Revision: 3187

Prepare pyzor 0.5.0-1

Modified:
  packages/pyzor/trunk/debian/changelog
  packages/pyzor/trunk/debian/compat
  packages/pyzor/trunk/debian/control
  packages/pyzor/trunk/debian/rules
Deleted:
  packages/pyzor/trunk/debian/patches/
  packages/pyzor/trunk/debian/pyzor.1
  packages/pyzor/trunk/debian/pyzor.manpages
  packages/pyzor/trunk/debian/pyzord.1

Modified: packages/pyzor/trunk/debian/changelog
===================================================================

--- packages/pyzor/trunk/debian/changelog	2009-06-25 17:41:02 UTC (rev 3186)
+++ packages/pyzor/trunk/debian/changelog	2009-06-25 20:46:23 UTC (rev 3187)
@@ -1,19 +1,22 @@
-pyzor (1:0.4.0+cvs20030201-9) UNRELEASED; urgency=low
+pyzor (0.5.0-1) UNRELEASED; urgency=low
 
   [Tobias Klauser]
-  * New maintainer (Closes: #416278).
-  * Check received server list for validity and print an error message when no
-    servers were discovered (Closes: #494047).
+  * New upstream release
+    - All debian patches have been merged upstream, drop them.
+    - Manpages have been merged upstream, drop them from debian directory.
+    - Check received server list for validity and print an error message when no
+      servers were discovered (Closes: #494047).
   * Rephrased package description (Closes: #439583).
   * Updated Standards-Version to 3.8.0.
   * Removed Homepage tag in control in favour of the new control field.
   * Added Vcs-Svn and Vcs-Browser control fields.
+  * New maintainer (Closes: #416278).
 
   [Sandro Tosi]
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Tobias Klauser <tklauser at distanz.ch>  Mon, 22 Dec 2008 14:13:34 +0100
+ -- Tobias Klauser <tklauser at distanz.ch>  Thu, 25 Jun 2009 22:43:00 +0200
 
 pyzor (1:0.4.0+cvs20030201-8) unstable; urgency=low
 

Modified: packages/pyzor/trunk/debian/compat
===================================================================
--- packages/pyzor/trunk/debian/compat	2009-06-25 17:41:02 UTC (rev 3186)
+++ packages/pyzor/trunk/debian/compat	2009-06-25 20:46:23 UTC (rev 3187)
@@ -1 +1 @@
-5
+7

Modified: packages/pyzor/trunk/debian/control
===================================================================
--- packages/pyzor/trunk/debian/control	2009-06-25 17:41:02 UTC (rev 3186)
+++ packages/pyzor/trunk/debian/control	2009-06-25 20:46:23 UTC (rev 3187)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Tobias Klauser <tklauser at distanz.ch>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python-dev (>= 2.3.5-11), dpatch, python-support (>= 0.5.3)
+Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.43), python-dev (>= 2.3.5-11), dpatch, python-support (>= 0.5.3)
 Homepage: http://pyzor.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/pyzor/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pyzor/trunk/

Deleted: packages/pyzor/trunk/debian/pyzor.1
===================================================================
--- packages/pyzor/trunk/debian/pyzor.1	2009-06-25 17:41:02 UTC (rev 3186)
+++ packages/pyzor/trunk/debian/pyzor.1	2009-06-25 20:46:23 UTC (rev 3187)
@@ -1,126 +0,0 @@
-.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
-<calvin at debian.org> for the Debian distribution of pyzor but may be used
-by others.
-.BR
-The main author of pyzor is Frank J. Tobin <ftobin at neverending.org>.

Deleted: packages/pyzor/trunk/debian/pyzor.manpages
===================================================================
--- packages/pyzor/trunk/debian/pyzor.manpages	2009-06-25 17:41:02 UTC (rev 3186)
+++ packages/pyzor/trunk/debian/pyzor.manpages	2009-06-25 20:46:23 UTC (rev 3187)
@@ -1,2 +0,0 @@
-debian/pyzor.1
-debian/pyzord.1

Deleted: packages/pyzor/trunk/debian/pyzord.1
===================================================================
--- packages/pyzor/trunk/debian/pyzord.1	2009-06-25 17:41:02 UTC (rev 3186)
+++ packages/pyzor/trunk/debian/pyzord.1	2009-06-25 20:46:23 UTC (rev 3187)
@@ -1,42 +0,0 @@
-.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
-<calvin at debian.org> for the Debian distribution of pyzor but may be used
-by others.
-.BR
-The main author of pyzor is Frank J. Tobin <ftobin at neverending.org>.

Modified: packages/pyzor/trunk/debian/rules
===================================================================
--- packages/pyzor/trunk/debian/rules	2009-06-25 17:41:02 UTC (rev 3186)
+++ packages/pyzor/trunk/debian/rules	2009-06-25 20:46:23 UTC (rev 3187)
@@ -3,25 +3,18 @@
 
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 
 BASE := $(CURDIR)/debian/pyzor
 DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0
+DEB_INSTALL_MANPAGES := docs/pyzor.1 docs/pyzord.1
 
 binary-indep-post-install/pyzor::
-	# fix python interpreter
-	cat scripts/pyzor | sed 's@#!/usr/bin/python2@#!/usr/bin/python@' > $(BASE)/usr/bin/pyzor
-	cat scripts/pyzord | sed 's@#!/usr/bin/python2@#!/usr/bin/python@' > $(BASE)/usr/bin/pyzord
-	rm -f lib/pyzor/*.pyc lib/pyzor/*.pyo
+	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
 
-# workaround for a dpatch bug calling "debian/rules unpatch"
-# instead of "dpatch deapply-all"
-unpatch:
-	dpatch deapply-all
-
 binary-install/pyzor::
 	dh_pysupport -p$(cdbs_curpkg)
 


