[Python-apps-commits] r13383 - in packages/pyzor/trunk/debian (15 files)
hle at users.alioth.debian.org
hle at users.alioth.debian.org
Mon Jul 4 08:19:29 UTC 2016
Date: Monday, July 4, 2016 @ 08:19:24
Author: hle
Revision: 13383
* New Maintainer.
* New upstream release (Closes: #747069) (Closes: #586375), (Closes: #609646).
* debian/control:
- Add Hugo Lefeuvre in the Uploaders field, replace Carl Chenet by the
PAPT in the Maintainer field.
- Depend on debhelper >= 9 instead of >= 7, python-all instead of
python (>= 2.3.5-11).
- Add a dependency again python-sphinx and python-docutils.
- Stop depending on cdbs (rewrite debian/rules to work with dh tools).
- Bump Standards-Version to 3.9.8.
- Execute wrap-and-sort -a.
- Update Homepage: project has moved to GitHub.
- Make package description more accurate (Closes: #606905).
- Add documentation package pyzor-doc (and make pyzor suggests pyzor-doc).
* Add debian/pyzor-doc.links so sphinx can access needed javascript
libraries.
* debian/rules:
- Rewite debian/rules to work with pybuild and dh tools.
* debian/compat: Set compatibility level to 9.
* debian/copyright:
- Make copyright file DEP5 compliant.
- Add a copyright entry for Hugo Lefeuvre.
* Fix debian/watch.
* New documentation structure: add debian/pyzor.1, pyzord.1, pyzor-migrate.1,
pyzor.manpages and pyzor-doc.docs.
* Add patches/remove-exernal-resources.patch and debian/series to remove
fetched external images from the documentation.
Added:
packages/pyzor/trunk/debian/patches/
packages/pyzor/trunk/debian/patches/remove-exernal-resources.patch
packages/pyzor/trunk/debian/patches/series
packages/pyzor/trunk/debian/pyzor-doc.docs
packages/pyzor/trunk/debian/pyzor-doc.links
packages/pyzor/trunk/debian/pyzor-migrate.1
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/compat
packages/pyzor/trunk/debian/control
packages/pyzor/trunk/debian/copyright
packages/pyzor/trunk/debian/rules
packages/pyzor/trunk/debian/watch
Modified: packages/pyzor/trunk/debian/changelog
===================================================================
--- packages/pyzor/trunk/debian/changelog 2016-07-03 20:14:49 UTC (rev 13382)
+++ packages/pyzor/trunk/debian/changelog 2016-07-04 08:19:24 UTC (rev 13383)
@@ -1,3 +1,35 @@
+pyzor (1:1.0.0-1) experimental; urgency=low
+
+ * New Maintainer.
+ * New upstream release (Closes: #747069) (Closes: #586375), (Closes: #609646).
+ * debian/control:
+ - Add Hugo Lefeuvre in the Uploaders field, replace Carl Chenet by the
+ PAPT in the Maintainer field.
+ - Depend on debhelper >= 9 instead of >= 7, python-all instead of
+ python (>= 2.3.5-11).
+ - Add a dependency again python-sphinx and python-docutils.
+ - Stop depending on cdbs (rewrite debian/rules to work with dh tools).
+ - Bump Standards-Version to 3.9.8.
+ - Execute wrap-and-sort -a.
+ - Update Homepage: project has moved to GitHub.
+ - Make package description more accurate (Closes: #606905).
+ - Add documentation package pyzor-doc (and make pyzor suggests pyzor-doc).
+ * Add debian/pyzor-doc.links so sphinx can access needed javascript
+ libraries.
+ * debian/rules:
+ - Rewite debian/rules to work with pybuild and dh tools.
+ * debian/compat: Set compatibility level to 9.
+ * debian/copyright:
+ - Make copyright file DEP5 compliant.
+ - Add a copyright entry for Hugo Lefeuvre.
+ * Fix debian/watch.
+ * New documentation structure: add debian/pyzor.1, pyzord.1, pyzor-migrate.1,
+ pyzor.manpages and pyzor-doc.docs.
+ * Add patches/remove-exernal-resources.patch and debian/series to remove
+ fetched external images from the documentation.
+
+ -- Hugo Lefeuvre <hle at debian.org> Sun, 03 Jul 2016 14:38:10 +0200
+
pyzor (1:0.5.0-4) unstable; urgency=medium
* Team upload.
Modified: packages/pyzor/trunk/debian/compat
===================================================================
--- packages/pyzor/trunk/debian/compat 2016-07-03 20:14:49 UTC (rev 13382)
+++ packages/pyzor/trunk/debian/compat 2016-07-04 08:19:24 UTC (rev 13383)
@@ -1 +1 @@
-7
+9
Modified: packages/pyzor/trunk/debian/control
===================================================================
--- packages/pyzor/trunk/debian/control 2016-07-03 20:14:49 UTC (rev 13382)
+++ packages/pyzor/trunk/debian/control 2016-07-04 08:19:24 UTC (rev 13383)
@@ -1,22 +1,56 @@
Source: pyzor
Section: mail
Priority: optional
-Maintainer: Carl Chenet <chaica at ohmytux.com>
-Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.43), python (>= 2.3.5-11), dh-python
-Homepage: http://pyzor.sourceforge.net/
+Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Uploaders: Hugo Lefeuvre <hle at debian.org>
+Standards-Version: 3.9.8
+Build-Depends: debhelper (>= 9),
+ dh-python,
+ python-all,
+ python-setuptools,
+ python-docutils,
+ python-sphinx,
+ python-gdbm
+Homepage: https://github.com/SpamExperts/pyzor
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pyzor/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/pyzor/trunk/
Package: pyzor
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-gdbm
+Depends: ${misc:Depends},
+ ${python:Depends}
+Suggests: pyzor-doc
Description: spam-catcher using a collaborative filtering network
- Pyzor is a collaborative, networked system to detect and block spam using
- identifying digests of messages.
+ Pyzor is a collaborative, networked system to detect and block spam
+ using identifying digests of messages.
.
- It establishes a distributed database of spam digests which can be used to
- filter out known spam.
+ Package contains both client and server.
.
+ The client can check if an email is a known spam against a pyzor server
+ or report new spam digests to that server.
+ .
+ The server holds the digests database, and handle the client requests.
+ .
Pyzor is a reimplementation of Razor in Python.
+
+Package: pyzor-doc
+Architecture: all
+Recommends: pyzor
+Section: doc
+Depends: ${sphinxdoc:Depends},
+ ${misc:Depends},
+ libjs-mathjax
+Description: spam-catcher using a collaborative filtering network (documentation)
+ Pyzor is a collaborative, networked system to detect and block spam
+ using identifying digests of messages.
+ .
+ Package contains both client and server.
+ .
+ The client can check if an email is a known spam against a pyzor server
+ or report new spam digests to that server.
+ .
+ The server holds the digests database, and handle the client requests.
+ .
+ Pyzor is a reimplementation of Razor in Python.
+ .
+ This is the documentation package.
Modified: packages/pyzor/trunk/debian/copyright
===================================================================
--- packages/pyzor/trunk/debian/copyright 2016-07-03 20:14:49 UTC (rev 13382)
+++ packages/pyzor/trunk/debian/copyright 2016-07-04 08:19:24 UTC (rev 13383)
@@ -1,25 +1,32 @@
-This is Pyzor, originally written by Frank Tobin <ftobin at neverending.org>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Pyzor
+Upstream-Contact: Frank Tobin <ftobin at neverending.org>
+Source: https://github.com/SpamExperts/pyzor
-The original source can always be found at: http://pyzor.sourceforge.net/
+Files: *
+Copyright: 2002-2016 Frank J. Tobin <ftobin at neverending.org>
+License: GPL-2
-Upstream Author: Frank J. Tobin <ftobin at neverending.org>
+Files: debian/*
+Copyright: 2002-2005 Bastian Kleineidam <calvin at debian.org>,
+ 2005-2006 Christopher Sacca <csacca at thecsl.org>,
+ 2009-2015 Carl Chenet <chaica at ohmytux.com>,
+ 2016 Hugo Lefeuvre <hle at debian.org>
+License: GPL-2
-Copyright: (C) 2002 Frank J. Tobin <ftobin at neverending.org>
-
-License:
-
+License: GPL-2
This package 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; version 2 dated June, 1991.
-
+ .
This package 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 package; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA.
-
-See /usr/share/common-licenses/GPL-2 for more information.
+ .
+ See /usr/share/common-licenses/GPL-2 for more information.
Added: packages/pyzor/trunk/debian/patches/remove-exernal-resources.patch
===================================================================
--- packages/pyzor/trunk/debian/patches/remove-exernal-resources.patch (rev 0)
+++ packages/pyzor/trunk/debian/patches/remove-exernal-resources.patch 2016-07-04 08:19:24 UTC (rev 13383)
@@ -0,0 +1,25 @@
+From: Hugo Lefeuvre <hle at debian.org>
+Subject: Remove fetched external images from the documentation.
+Last-Update: 2016-07-03
+Forwarded: not-needed
+--- a/docs/index.rst 2014-12-10 14:48:21.000000000 +0100
++++ b/docs/index.rst 2016-07-03 14:31:26.763544607 +0200
+@@ -6,18 +6,6 @@
+ Welcome to Pyzor's documentation!
+ =================================
+
+-.. image:: https://pypip.in/v/pyzor/badge.png
+- :target: https://pypi.python.org/pypi/pyzor/
+- :alt: Latest PyPI version
+-
+-.. image:: https://pypip.in/d/pyzor/badge.png
+- :target: https://pypi.python.org/pypi/pyzor/
+- :alt: Number of PyPI downloads
+-
+-.. image:: https://travis-ci.org/SpamExperts/pyzor.svg?branch=master
+- :target: https://travis-ci.org/SpamExperts/pyzor
+- :alt: Build status
+-
+ Contents:
+
+ .. toctree::
Added: packages/pyzor/trunk/debian/patches/series
===================================================================
--- packages/pyzor/trunk/debian/patches/series (rev 0)
+++ packages/pyzor/trunk/debian/patches/series 2016-07-04 08:19:24 UTC (rev 13383)
@@ -0,0 +1 @@
+remove-exernal-resources.patch
Added: packages/pyzor/trunk/debian/pyzor-doc.docs
===================================================================
--- packages/pyzor/trunk/debian/pyzor-doc.docs (rev 0)
+++ packages/pyzor/trunk/debian/pyzor-doc.docs 2016-07-04 08:19:24 UTC (rev 13383)
@@ -0,0 +1 @@
+build/html
Added: packages/pyzor/trunk/debian/pyzor-doc.links
===================================================================
--- packages/pyzor/trunk/debian/pyzor-doc.links (rev 0)
+++ packages/pyzor/trunk/debian/pyzor-doc.links 2016-07-04 08:19:24 UTC (rev 13383)
@@ -0,0 +1 @@
+usr/share/javascript/mathjax/MathJax.js usr/share/doc/pyzor-doc/html/_static/MathJax.js
Added: packages/pyzor/trunk/debian/pyzor-migrate.1
===================================================================
--- packages/pyzor/trunk/debian/pyzor-migrate.1 (rev 0)
+++ packages/pyzor/trunk/debian/pyzor-migrate.1 2016-07-04 08:19:24 UTC (rev 13383)
@@ -0,0 +1,30 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
+.TH USAGE: "1" "June 2016" "Usage: pyzor-migrate [options]" "User Commands"
+.SH NAME
+pyzor-migrate: \- spam-catcher using a collaborative filtering network
+.SH SYNOPSIS
+.B pyzor-migrate
+[\fI\,options\/\fR]
+.SH DESCRIPTION
+This scripts allows migrating pyzor records between different engine types.
+It's arguments are pyzor's DSN, which differ according to the engine type. See
+pyzor documentation for more details.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-\-se\fR=\fI\,SOURCE_ENGINE\/\fR, \fB\-\-source\-engine\fR=\fI\,SOURCE_ENGINE\/\fR
+select source database backend
+.TP
+\fB\-\-sd\fR=\fI\,SOURCE_DSN\/\fR, \fB\-\-source\-dsn\fR=\fI\,SOURCE_DSN\/\fR
+data source DSN
+.TP
+\fB\-\-de\fR=\fI\,DESTINATION_ENGINE\/\fR, \fB\-\-destination\-engine\fR=\fI\,DESTINATION_ENGINE\/\fR
+select destination database backend
+.TP
+\fB\-\-dd\fR=\fI\,DESTINATION_DSN\/\fR, \fB\-\-destination\-dsn\fR=\fI\,DESTINATION_DSN\/\fR
+destination DSN
+.TP
+\fB\-\-delete\fR
+delete old records
Added: packages/pyzor/trunk/debian/pyzor.1
===================================================================
--- packages/pyzor/trunk/debian/pyzor.1 (rev 0)
+++ packages/pyzor/trunk/debian/pyzor.1 2016-07-04 08:19:24 UTC (rev 13383)
@@ -0,0 +1,52 @@
+.TH PYZOR "1" "June 2016" "pyzor 1.0.0" "User Commands"
+.SH NAME
+pyzor \- spam-catcher using a collaborative filtering network
+.SH SYNOPSIS
+.B pyzor
+[\fI\,options\/\fR]
+.SH DESCRIPTION
+Read data from stdin and execute the requested command (one of 'check',
+\&'report', 'ping', 'pong', 'digest', 'predigest', 'genkey', 'local_whitelist',
+\&'local_unwhitelist').
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-n\fR NICE, \fB\-\-nice\fR=\fI\,NICE\/\fR
+\&'nice' level
+.TP
+\fB\-d\fR, \fB\-\-debug\fR
+enable debugging output
+.TP
+\fB\-\-homedir\fR=\fI\,HOMEDIR\/\fR
+configuration directory
+.TP
+\fB\-s\fR STYLE, \fB\-\-style\fR=\fI\,STYLE\/\fR
+input style: 'msg' (individual RFC5321 message),
+\&'mbox' (mbox file of messages), 'digests' (Pyzor
+digests, one per line).
+.TP
+\fB\-\-log\-file\fR=\fI\,LOGFILE\/\fR
+name of log file
+.TP
+\fB\-\-servers\-file\fR=\fI\,SERVERSFILE\/\fR
+name of servers file
+.TP
+\fB\-\-accounts\-file\fR=\fI\,ACCOUNTSFILE\/\fR
+name of accounts file
+.TP
+\fB\-\-local\-whitelist\fR=\fI\,LOCALWHITELIST\/\fR
+name of the local whitelist file
+.TP
+\fB\-t\fR TIMEOUT, \fB\-\-timeout\fR=\fI\,TIMEOUT\/\fR
+timeout (in seconds)
+.TP
+\fB\-r\fR REPORTTHRESHOLD, \fB\-\-report\-threshold\fR=\fI\,REPORTTHRESHOLD\/\fR
+threshold for number of reports
+.TP
+\fB\-w\fR WHITELISTTHRESHOLD, \fB\-\-whitelist\-threshold\fR=\fI\,WHITELISTTHRESHOLD\/\fR
+threshold for number of whitelist
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+print version and exit
Added: packages/pyzor/trunk/debian/pyzor.manpages
===================================================================
--- packages/pyzor/trunk/debian/pyzor.manpages (rev 0)
+++ packages/pyzor/trunk/debian/pyzor.manpages 2016-07-04 08:19:24 UTC (rev 13383)
@@ -0,0 +1,3 @@
+debian/pyzor.1
+debian/pyzord.1
+debian/pyzor-migrate.1
Added: packages/pyzor/trunk/debian/pyzord.1
===================================================================
--- packages/pyzor/trunk/debian/pyzord.1 (rev 0)
+++ packages/pyzor/trunk/debian/pyzord.1 2016-07-04 08:19:24 UTC (rev 13383)
@@ -0,0 +1,92 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
+.TH PYZORD "1" "June 2016" "pyzord 1.0.0" "User Commands"
+.SH NAME
+pyzord \- spam-catcher using a collaborative filtering network
+.SH SYNOPSIS
+.B pyzord
+[\fI\,options\/\fR]
+.SH DESCRIPTION
+Listen for and process incoming Pyzor connections.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-n\fR NICE, \fB\-\-nice\fR=\fI\,NICE\/\fR
+\&'nice' level
+.TP
+\fB\-d\fR, \fB\-\-debug\fR
+enable debugging output
+.TP
+\fB\-\-homedir\fR=\fI\,HOMEDIR\/\fR
+configuration directory
+.TP
+\fB\-a\fR LISTENADDRESS, \fB\-\-address\fR=\fI\,LISTENADDRESS\/\fR
+listen on this IP
+.TP
+\fB\-p\fR PORT, \fB\-\-port\fR=\fI\,PORT\/\fR
+listen on this port
+.TP
+\fB\-e\fR ENGINE, \fB\-\-database\-engine\fR=\fI\,ENGINE\/\fR
+select database backend
+.TP
+\fB\-\-dsn\fR=\fI\,DIGESTDB\/\fR
+data source name (filename for gdbm,
+host,user,password,database,table for MySQL)
+.TP
+\fB\-\-gevent\fR=\fI\,GEVENT\/\fR
+set to true to use the gevent library
+.TP
+\fB\-\-threads\fR=\fI\,THREADS\/\fR
+set to true if multi\-threading should be used (this
+may not apply to all engines)
+.TP
+\fB\-\-max\-threads\fR=\fI\,MAXTHREADS\/\fR
+the maximum number of concurrent threads (defaults to
+0 which is unlimited)
+.TP
+\fB\-\-processes\fR=\fI\,PROCESSES\/\fR
+set to true if multi\-processing should be used (this
+may not apply to all engines)
+.TP
+\fB\-\-max\-processes\fR=\fI\,MAXPROCESSES\/\fR
+the maximum number of concurrent processes (defaults
+to 40)
+.TP
+\fB\-\-db\-connections\fR=\fI\,DBCONNECTIONS\/\fR
+the number of db connections that will be kept by the
+server. This only applies if threads are used.
+Defaults to 0 which means a new connection is used for
+every thread. (this may not apply all engines)
+.HP
+\fB\-\-pre\-fork\fR=\fI\,PREFORK\/\fR
+.TP
+\fB\-\-password\-file\fR=\fI\,PASSWDFILE\/\fR
+name of password file
+.TP
+\fB\-\-access\-file\fR=\fI\,ACCESSFILE\/\fR
+name of ACL file
+.TP
+\fB\-\-cleanup\-age\fR=\fI\,CLEANUPAGE\/\fR
+time before digests expire (in seconds)
+.TP
+\fB\-\-log\-file\fR=\fI\,LOGFILE\/\fR
+name of the log file
+.TP
+\fB\-\-usage\-log\-file\fR=\fI\,USAGELOGFILE\/\fR
+name of the usage log file
+.TP
+\fB\-\-pid\-file\fR=\fI\,PIDFILE\/\fR
+save the pid in this file after the server is
+daemonized
+.TP
+\fB\-\-forward\-client\-homedir\fR=\fI\,FORWARDCLIENTHOMEDIR\/\fR
+Specify a pyzor client configuration directory to
+forward received digests to a remote pyzor server
+.TP
+\fB\-\-detach\fR=\fI\,DETACH\/\fR
+daemonizes the server and redirects any output to the
+specified file
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+print version and exit
Modified: packages/pyzor/trunk/debian/rules
===================================================================
--- packages/pyzor/trunk/debian/rules 2016-07-03 20:14:49 UTC (rev 13382)
+++ packages/pyzor/trunk/debian/rules 2016-07-04 08:19:24 UTC (rev 13383)
@@ -1,18 +1,16 @@
-#!/usr/bin/make -f
+#! /usr/bin/make -f
-DEB_PYTHON2_MODULE_PACKAGES=pyzor
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+export DH_VERBOSE = 1
+export PYBUILD_NAME = pyzor
+export PYBUILD_DISABLE=test
+export PYBUILD_DESTDIR_python2=debian/pyzor/
-BASE := $(CURDIR)/debian/pyzor
-DEB_INSTALL_MANPAGES_pyzor := docs/pyzor.1 docs/pyzord.1
+%:
+ dh $@ --with python2,sphinxdoc --buildsystem=pybuild
-binary-indep-post-install/pyzor::
- install -m755 scripts/pyzor $(BASE)/usr/bin/pyzor
- install -m755 scripts/pyzord $(BASE)/usr/bin/pyzord
+override_dh_auto_build:
+ dh_auto_build
+ PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml -D mathjax_path='MathJax.js' docs/ build/html # HTML generator
-clean::
- rm -f lib/pyzor/*.pyc lib/pyzor/*.pyo
-
-binary-install/pyzor::
- dh_python2 -p$(cdbs_curpkg)
+override_dh_sphinxdoc:
+ dh_sphinxdoc --exclude=MathJax.js
Modified: packages/pyzor/trunk/debian/watch
===================================================================
--- packages/pyzor/trunk/debian/watch 2016-07-03 20:14:49 UTC (rev 13382)
+++ packages/pyzor/trunk/debian/watch 2016-07-04 08:19:24 UTC (rev 13383)
@@ -1,3 +1,2 @@
-# watch control file for uscan
version=3
-http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/p/project/py/pyzor/pyzor/([\d]{1}.[\d]{1}.[\d]{1})/pyzor-(.*)\.tar.gz
+https://pypi.debian.net/pyzor/pyzor-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
More information about the Python-apps-commits
mailing list