[Python-apps-commits] r14410 - in packages/spambayes/tags (22 files)
hle at users.alioth.debian.org
hle at users.alioth.debian.org
Sat Oct 7 12:36:56 UTC 2017
Date: Saturday, October 7, 2017 @ 12:36:54
Author: hle
Revision: 14410
[svn-buildpackage] Tagging spambayes 1.1b1-4
Added:
packages/spambayes/tags/1.1b1-4/
packages/spambayes/tags/1.1b1-4/debian/changelog
(from rev 14409, packages/spambayes/trunk/debian/changelog)
packages/spambayes/tags/1.1b1-4/debian/compat
(from rev 14040, packages/spambayes/trunk/debian/compat)
packages/spambayes/tags/1.1b1-4/debian/control
(from rev 14409, packages/spambayes/trunk/debian/control)
packages/spambayes/tags/1.1b1-4/debian/copyright
(from rev 14040, packages/spambayes/trunk/debian/copyright)
packages/spambayes/tags/1.1b1-4/debian/patches/asyncore.patch
(from rev 14409, packages/spambayes/trunk/debian/patches/asyncore.patch)
packages/spambayes/tags/1.1b1-4/debian/patches/lockfile.patch
(from rev 14042, packages/spambayes/trunk/debian/patches/lockfile.patch)
packages/spambayes/tags/1.1b1-4/debian/patches/series
(from rev 14409, packages/spambayes/trunk/debian/patches/series)
packages/spambayes/tags/1.1b1-4/debian/rules
(from rev 14099, packages/spambayes/trunk/debian/rules)
packages/spambayes/tags/1.1b1-4/debian/spambayes.docs
(from rev 14042, packages/spambayes/trunk/debian/spambayes.docs)
Deleted:
packages/spambayes/tags/1.1b1-4/debian/NEWS.Debian
packages/spambayes/tags/1.1b1-4/debian/TODO
packages/spambayes/tags/1.1b1-4/debian/changelog
packages/spambayes/tags/1.1b1-4/debian/compat
packages/spambayes/tags/1.1b1-4/debian/control
packages/spambayes/tags/1.1b1-4/debian/copyright
packages/spambayes/tags/1.1b1-4/debian/patches/asyncore.patch
packages/spambayes/tags/1.1b1-4/debian/patches/series
packages/spambayes/tags/1.1b1-4/debian/rules
packages/spambayes/tags/1.1b1-4/debian/spambayes.docs
packages/spambayes/tags/1.1b1-4/debian/spambayes.postinst
packages/spambayes/tags/1.1b1-4/debian/spambayes.prerm
Deleted: packages/spambayes/tags/1.1b1-4/debian/NEWS.Debian
===================================================================
--- packages/spambayes/trunk/debian/NEWS.Debian 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/NEWS.Debian 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,14 +0,0 @@
-spambayes (1.0.4-6) unstable; urgency=low
-
- * Important change in the script names
-
- Until 1.0.4-6, the spambayes package provided scripts installed in
- /usr/bin and porting the ".py" extension. This has been strongly
- discouraged for some time in Debian, and I'm about to change
- this. This version of the package renames the scripts (by removing the
- .py extension) and will install backward compatibility symbolic links
- in /usr/bin with the old names. You are strongly encouraged to update
- your scripts (procmail...) to use the proper names, as the old names
- will stop working in the future.
-
- -- Alexandre Fayolle <afayolle at debian.org> Sun, 31 Oct 2010 16:54:41 +0100
Deleted: packages/spambayes/tags/1.1b1-4/debian/TODO
===================================================================
--- packages/spambayes/trunk/debian/TODO 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/TODO 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,2 +0,0 @@
-Write man pages for the various scripts
-Fix lintinan warning about script not executable
Deleted: packages/spambayes/tags/1.1b1-4/debian/changelog
===================================================================
--- packages/spambayes/trunk/debian/changelog 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/changelog 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,128 +0,0 @@
-spambayes (1.1b1-2) unstable; urgency=low
-
- * 'from sets import Set' warning fixed by Upstream. (closes: #600628)
- * 'From ' escaping bug fixed by Upstream. (closes: #559977)
-
-
- -- Hugo Lefeuvre <hugo6390 at orange.fr> Sun, 29 Jun 2014 21:12:29 +0200
-
-spambayes (1.1b1-1) unstable; urgency=low
-
- [ Jakub Wilk ]
- * Use canonical URIs for Vcs-* fields.
-
- [ Hugo Lefeuvre ]
- * New upstream release.
- * debian/copyright:
- - Added a line to signal the adoption.
- * debian/control:
- - Deleted Alexandre from the Uploaders field at his request.
- - Added myself in the Uploaders field.
- - Use the last version of Debian Policy, 3.9.5 instead of 3.9.2.
- * debian/spambayes.prerm and debian/spambayes.postinst:
- - Fixed a lintian pedantic warning by deleting -e from shebang and
- adding set -e.
- * debian/spambayes.docs:
- - Listed the CHANGELOG.txt file.
- * debian/rules:
- - Added build-arch and build-indep directives.
- - Added dh_installman -i directive.
- * debian/patches/series and debian/patches/asyncore.patch
- - Written and added asyncore.patch to fix the 'from spambayes import
- asyncore' error.
- * debian/docs/* and debian/manpages
- - Written manpages for core_server (closes: #457197), and sb_*
- (closes: #286550).
-
- -- Hugo Lefeuvre <hugo6390 at orange.fr> Fri, 13 Jun 2014 11:07:33 +0200
-
-spambayes (1.1a6-1) unstable; urgency=low
-
- * new upstream release (closes: #586802)
- * update to modern packaging style, with dh_python2
- - rebuild with python2.7 (closes: #427126)
- * remove sb_notesfilter which only runs on Windows (closes: #593977)
-
- -- Alexandre Fayolle <afayolle at debian.org> Wed, 19 Oct 2011 08:32:06 +0200
-
-spambayes (1.0.4-6) unstable; urgency=low
-
- * acknowledge NMU (closes: #484442)
- * updated to 3.0 (quilt) format
- * switched to python-support
- * split diff.gz in several quilt patches (closes: #485701)
- * fix remaining erroneous from __future__ imports (closes: #582001)
- * handle exception which can be generated by some ill-formed emails
- (closes: #491278)
- * updated standards to 3.9.1:
- - renamed scripts in order not to have .py files in /usr/bin
- (but create bw compat symlinks in postinst)
- * removed sb_pop3dnd (not working with current version of twisted in Debian,
- and nobody seems to use it since no bug report was filed)
-
- -- Alexandre Fayolle <afayolle at debian.org> Fri, 05 Nov 2010 17:48:58 +0100
-
-spambayes (1.0.4-5.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Fixed bashism in debian/rules (closes: #484442)
-
- -- Peter Eisentraut <petere at debian.org> Fri, 11 Jul 2008 11:11:27 +0200
-
-spambayes (1.0.4-5) unstable; urgency=low
-
- * fixed future imports (closes: #476622)
-
- -- Alexandre Fayolle <afayolle at debian.org> Tue, 13 May 2008 18:38:12 +0200
-
-spambayes (1.0.4-4) unstable; urgency=low
-
- * Rebuild with new default python (closes: #476274)
- * updated to new standards
-
- -- Alexandre Fayolle <afayolle at debian.org> Thu, 17 Apr 2008 15:42:37 +0200
-
-spambayes (1.0.4-3) unstable; urgency=low
-
- * Complie with Policy §7.6
-
- -- Alexandre Fayolle <afayolle at debian.org> Fri, 16 Jun 2006 09:49:47 +0200
-
-spambayes (1.0.4-2) unstable; urgency=low
-
- * updated to 3.7.2 standards
- * new Python policy
- * Fixed Gnus instructions (closes: #340872)
- * Applied patch by Kim Minh Kaplan <qdsmgbm02 at sneakemail.com> allowing
- sb_imapfilter to use CRAM MD5 authentication (closes: #301221)
-
- -- Alexandre Fayolle <afayolle at debian.org> Thu, 15 Jun 2006 11:11:34 +0200
-
-spambayes (1.0.4-1) unstable; urgency=low
-
- * New upstream release
- * Use 3.6.2 standards
- * Use debhelper 5.0
- * Added watch file for DEHS
-
- -- Alexandre Fayolle <afayolle at debian.org> Mon, 20 Mar 2006 11:36:54 +0100
-
-spambayes (1.0.3-1) unstable; urgency=low
-
- * New upstream release
- * Removed the python2.3-spambayes package, and leave only spambayes (Closes: #286590)
-
- -- Alexandre Fayolle <afayolle at debian.org> Tue, 15 Feb 2005 17:25:15 +0100
-
-spambayes (1.0.1-1) unstable; urgency=low
-
- * New upstream release (Closes: #286551)
- * Fixed path in example spambayes.el file (Closes: #285636)
-
- -- Alexandre Fayolle <afayolle at debian.org> Tue, 21 Dec 2004 15:18:43 +0100
-
-spambayes (1.0-1) unstable; urgency=low
-
- * Initial upload to Debian (Closes: #267946)
-
- -- Alexandre Fayolle <afayolle at debian.org> Sun, 24 Oct 2004 11:06:51 +0200
Copied: packages/spambayes/tags/1.1b1-4/debian/changelog (from rev 14409, packages/spambayes/trunk/debian/changelog)
===================================================================
--- packages/spambayes/tags/1.1b1-4/debian/changelog (rev 0)
+++ packages/spambayes/tags/1.1b1-4/debian/changelog 2017-10-07 12:36:54 UTC (rev 14410)
@@ -0,0 +1,174 @@
+spambayes (1.1b1-4) unstable; urgency=medium
+
+ * Upload to unstable (Closes: #876622).
+ * Modify debian/patches/asyncore.patch:
+ Instead of importing incompatible asyncore and asynchat modules from
+ Python, remove affected functionalities (Closes: #785503).
+ * Bump Standards-Version to 4.1.1.
+
+ -- Hugo Lefeuvre <hle at debian.org> Sat, 07 Oct 2017 09:56:27 +0200
+
+spambayes (1.1b1-3) experimental; urgency=medium
+
+ * Fix things broken by the pybuild port:
+ - fix script names ending with .py again (Closes: #863677).
+ - stop installing broken sb_notesfilter
+ * Remove debian/NEWS.Debian, debian/spambayes.postinst and spambayes.prerm:
+ - Stop providing .py symlinks in /usr/bin (this was a transition measure
+ since 1.0.4-6).
+ * Add rename to the Build-Dependencies, stop using deprecated prename
+ program.
+
+ -- Hugo Lefeuvre <hle at debian.org> Sat, 10 Jun 2017 12:02:12 +0200
+
+spambayes (1.1b1-2) experimental; urgency=low
+
+ * Acknowledge NMU (Closes: #857531). Thanks Marcio !
+ * debian/control:
+ - Update Hugo Lefeuvre's e-mail address.
+ - Depend on debhelper 10 instead of 5.
+ - Bump Standards-Version to 3.9.8.
+ - Remove useless version indication in the python dependency.
+ * Bump debian/compat to 10.
+ * Port debian/rules to pybuild.
+ * debian/copyright:
+ - Make debian/copyright DEP5 compliant.
+ - Re-license debian/* to GPL-3+ (Approved by Alexandre Fayolle).
+ - Update Hugo Lefeuvre's e-mail address.
+ * Upstream changelog is automatically installed, stop mentionning
+ it in debian/spambayes.docs
+ * Remove debian/TODO, not up-to-date anymore.
+ * debian/patches/lockfile.patch:
+ - Compatibility with newer python-lockfile (>> 0.10) (Closes: #789564)
+
+ -- Hugo Lefeuvre <hle at debian.org> Wed, 24 May 2017 15:09:12 +0200
+
+spambayes (1.1b1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/spambayes.postinst:
+ - Removed the sb_notesfilter to avoid create broken symlink.
+ (closes: #857531)
+
+ -- Marcio de Souza Oliveira <m.desouza20 at gmail.com> Sat, 18 Mar 2017 16:59:15 +0000
+
+spambayes (1.1b1-1) unstable; urgency=low
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ [ Hugo Lefeuvre ]
+ * New upstream release.
+ * debian/copyright:
+ - Added a line to signal the adoption.
+ * debian/control:
+ - Deleted Alexandre from the Uploaders field at his request.
+ - Added myself in the Uploaders field.
+ - Use the last version of Debian Policy, 3.9.5 instead of 3.9.2.
+ * debian/spambayes.prerm and debian/spambayes.postinst:
+ - Fixed a lintian pedantic warning by deleting -e from shebang and
+ adding set -e.
+ * debian/spambayes.docs:
+ - Listed the CHANGELOG.txt file.
+ * debian/rules:
+ - Added build-arch and build-indep directives.
+ - Added dh_installman -i directive.
+ * debian/patches/series and debian/patches/asyncore.patch
+ - Written and added asyncore.patch to fix the 'from spambayes import
+ asyncore' error.
+ * debian/docs/* and debian/manpages
+ - Written manpages for core_server (closes: #457197), and sb_*
+ (closes: #286550).
+
+ -- Hugo Lefeuvre <hugo6390 at orange.fr> Fri, 13 Jun 2014 11:07:33 +0200
+
+spambayes (1.1a6-1) unstable; urgency=low
+
+ * new upstream release (closes: #586802)
+ * update to modern packaging style, with dh_python2
+ - rebuild with python2.7 (closes: #427126)
+ * remove sb_notesfilter which only runs on Windows (closes: #593977)
+
+ -- Alexandre Fayolle <afayolle at debian.org> Wed, 19 Oct 2011 08:32:06 +0200
+
+spambayes (1.0.4-6) unstable; urgency=low
+
+ * acknowledge NMU (closes: #484442)
+ * updated to 3.0 (quilt) format
+ * switched to python-support
+ * split diff.gz in several quilt patches (closes: #485701)
+ * fix remaining erroneous from __future__ imports (closes: #582001)
+ * handle exception which can be generated by some ill-formed emails
+ (closes: #491278)
+ * updated standards to 3.9.1:
+ - renamed scripts in order not to have .py files in /usr/bin
+ (but create bw compat symlinks in postinst)
+ * removed sb_pop3dnd (not working with current version of twisted in Debian,
+ and nobody seems to use it since no bug report was filed)
+
+ -- Alexandre Fayolle <afayolle at debian.org> Fri, 05 Nov 2010 17:48:58 +0100
+
+spambayes (1.0.4-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fixed bashism in debian/rules (closes: #484442)
+
+ -- Peter Eisentraut <petere at debian.org> Fri, 11 Jul 2008 11:11:27 +0200
+
+spambayes (1.0.4-5) unstable; urgency=low
+
+ * fixed future imports (closes: #476622)
+
+ -- Alexandre Fayolle <afayolle at debian.org> Tue, 13 May 2008 18:38:12 +0200
+
+spambayes (1.0.4-4) unstable; urgency=low
+
+ * Rebuild with new default python (closes: #476274)
+ * updated to new standards
+
+ -- Alexandre Fayolle <afayolle at debian.org> Thu, 17 Apr 2008 15:42:37 +0200
+
+spambayes (1.0.4-3) unstable; urgency=low
+
+ * Complie with Policy §7.6
+
+ -- Alexandre Fayolle <afayolle at debian.org> Fri, 16 Jun 2006 09:49:47 +0200
+
+spambayes (1.0.4-2) unstable; urgency=low
+
+ * updated to 3.7.2 standards
+ * new Python policy
+ * Fixed Gnus instructions (closes: #340872)
+ * Applied patch by Kim Minh Kaplan <qdsmgbm02 at sneakemail.com> allowing
+ sb_imapfilter to use CRAM MD5 authentication (closes: #301221)
+
+ -- Alexandre Fayolle <afayolle at debian.org> Thu, 15 Jun 2006 11:11:34 +0200
+
+spambayes (1.0.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Use 3.6.2 standards
+ * Use debhelper 5.0
+ * Added watch file for DEHS
+
+ -- Alexandre Fayolle <afayolle at debian.org> Mon, 20 Mar 2006 11:36:54 +0100
+
+spambayes (1.0.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed the python2.3-spambayes package, and leave only spambayes (Closes: #286590)
+
+ -- Alexandre Fayolle <afayolle at debian.org> Tue, 15 Feb 2005 17:25:15 +0100
+
+spambayes (1.0.1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #286551)
+ * Fixed path in example spambayes.el file (Closes: #285636)
+
+ -- Alexandre Fayolle <afayolle at debian.org> Tue, 21 Dec 2004 15:18:43 +0100
+
+spambayes (1.0-1) unstable; urgency=low
+
+ * Initial upload to Debian (Closes: #267946)
+
+ -- Alexandre Fayolle <afayolle at debian.org> Sun, 24 Oct 2004 11:06:51 +0200
Deleted: packages/spambayes/tags/1.1b1-4/debian/compat
===================================================================
--- packages/spambayes/trunk/debian/compat 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/compat 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1 +0,0 @@
-5
Copied: packages/spambayes/tags/1.1b1-4/debian/compat (from rev 14040, packages/spambayes/trunk/debian/compat)
===================================================================
--- packages/spambayes/tags/1.1b1-4/debian/compat (rev 0)
+++ packages/spambayes/tags/1.1b1-4/debian/compat 2017-10-07 12:36:54 UTC (rev 14410)
@@ -0,0 +1 @@
+10
Deleted: packages/spambayes/tags/1.1b1-4/debian/control
===================================================================
--- packages/spambayes/trunk/debian/control 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/control 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,30 +0,0 @@
-Source: spambayes
-Section: mail
-Priority: optional
-Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Uploaders: Hugo Lefeuvre <hugo6390 at orange.fr>
-Build-Depends: debhelper (>= 7.0.50),
- python (>=2.6.6-3~),
- python-setuptools,
- python-lockfile
-Standards-Version: 3.9.5
-X-Python-Version: >= 2.6
-Homepage: http://spambayes.sourceforge.net
-Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/spambayes/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/spambayes/trunk/
-
-Package: spambayes
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Description: Python-based spam filter using statistical analysis
- SpamBayes uses a different set of algorithm to most statistical spam
- filters, which enables to dramatically lower the number of legitimate
- mail classified as spam, through the introduction of an 'unsure'
- category.
- .
- SpamBayes can be used as a POP3 or an IMAP proxy, as well as a simple
- mail filter for use with procmail.
-
-
-
-
Copied: packages/spambayes/tags/1.1b1-4/debian/control (from rev 14409, packages/spambayes/trunk/debian/control)
===================================================================
--- packages/spambayes/tags/1.1b1-4/debian/control (rev 0)
+++ packages/spambayes/tags/1.1b1-4/debian/control 2017-10-07 12:36:54 UTC (rev 14410)
@@ -0,0 +1,28 @@
+Source: spambayes
+Section: mail
+Priority: optional
+Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Uploaders: Hugo Lefeuvre <hle at debian.org>
+Build-Depends: debhelper (>= 10),
+ python,
+ python-setuptools,
+ python-lockfile (>= 1:0.10),
+ dh-python,
+ rename
+Standards-Version: 4.1.1
+X-Python-Version: >= 2.6
+Homepage: http://spambayes.sourceforge.net
+Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/spambayes/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/spambayes/trunk/
+
+Package: spambayes
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Description: Python-based spam filter using statistical analysis
+ SpamBayes uses a different set of algorithm to most statistical spam
+ filters, which enables to dramatically lower the number of legitimate
+ mail classified as spam, through the introduction of an 'unsure'
+ category.
+ .
+ SpamBayes can be used as a POP3 or an IMAP proxy, as well as a simple
+ mail filter for use with procmail.
Deleted: packages/spambayes/tags/1.1b1-4/debian/copyright
===================================================================
--- packages/spambayes/trunk/debian/copyright 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/copyright 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,59 +0,0 @@
-This package was debianized by Alexandre Fayolle <alexandre.fayolle at logilab.fr>
-on Thu, 5 Feb 2004 19:03:49 +0100.
-
-It was adopted by Hugo Lefeuvre <hugo6390 at orange.fr> on Fri, 13 Jun 2014 11:06:32 +0100.
-
-The original source is available at http://spambayes.sf.net/
-
-Copyright (C) 2002-2003 Python Software Foundation; All Rights Reserved
-
-The Python Software Foundation (PSF) holds copyright on all material
-in this project. You may use it under the terms of the PSF license:
-
-PSF LICENSE AGREEMENT FOR THE SPAMBAYES PROJECT
------------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using the spambayes software ("Software") in source or binary
-form and its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use the Software
-alone or in any derivative version, provided, however, that PSF's
-License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-2002-2003 Python Software Foundation; All Rights Reserved" are retained
-the Software alone or in any derivative version prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates the Software or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to the Software.
-
-4. PSF is making the Software available to Licensee on an "AS IS"
-basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
-SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING THE SOFTWARE,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee. This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using the Software, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
Copied: packages/spambayes/tags/1.1b1-4/debian/copyright (from rev 14040, packages/spambayes/trunk/debian/copyright)
===================================================================
--- packages/spambayes/tags/1.1b1-4/debian/copyright (rev 0)
+++ packages/spambayes/tags/1.1b1-4/debian/copyright 2017-10-07 12:36:54 UTC (rev 14410)
@@ -0,0 +1,71 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Spambayes
+Source: http://spambayes.sf.net/
+
+Files: *
+Copyright: 2002-2003 Python Software Foundation
+License: PSF
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using the spambayes software ("Software") in source or binary
+ form and its associated documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display publicly,
+ prepare derivative works, distribute, and otherwise use the Software
+ alone or in any derivative version, provided, however, that PSF's
+ License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+ 2002-2003 Python Software Foundation; All Rights Reserved" are retained
+ the Software alone or in any derivative version prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates the Software or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to the Software.
+ .
+ 4. PSF is making the Software available to Licensee on an "AS IS"
+ basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+ SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING THE SOFTWARE,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee. This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+ .
+ 8. By copying, installing or otherwise using the Software, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
+
+Files: debian/*
+Copyright: 2004-2014 Alexandre Fayolle <alexandre.fayolle at logilab.fr>
+ 2014-2017 Hugo Lefeuvre <hle at debian.org>
+License: GPL-3+
+ 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 3 of the License, or 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, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License version 3
+ can be found in the file `/usr/share/common-licenses/GPL-3'.
Deleted: packages/spambayes/tags/1.1b1-4/debian/patches/asyncore.patch
===================================================================
--- packages/spambayes/trunk/debian/patches/asyncore.patch 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/patches/asyncore.patch 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,14 +0,0 @@
-Fixes an error when importing asyncore and asynchat.
-Index: spambayes-1.1b1/spambayes/Dibbler.py
-===================================================================
---- spambayes-1.1b1.orig/spambayes/Dibbler.py 2011-01-22 16:15:06.000000000 +0100
-+++ spambayes-1.1b1/spambayes/Dibbler.py 2014-06-13 13:17:48.798261574 +0200
-@@ -183,7 +183,7 @@
- RSTRIP_CHARS_AVAILABLE = True
-
- from spambayes.port import md5
--from spambayes import asyncore, asynchat
-+import asyncore, asynchat
-
- class BrighterAsyncChat(asynchat.async_chat):
- """An asynchat.async_chat that doesn't give spurious warnings on
Copied: packages/spambayes/tags/1.1b1-4/debian/patches/asyncore.patch (from rev 14409, packages/spambayes/trunk/debian/patches/asyncore.patch)
===================================================================
--- packages/spambayes/tags/1.1b1-4/debian/patches/asyncore.patch (rev 0)
+++ packages/spambayes/tags/1.1b1-4/debian/patches/asyncore.patch 2017-10-07 12:36:54 UTC (rev 14410)
@@ -0,0 +1,68 @@
+--- a/spambayes/Dibbler.py 2011-01-22 16:15:06.000000000 +0100
++++ b/spambayes/Dibbler.py 2017-10-07 10:05:26.280110961 +0200
+@@ -185,46 +185,6 @@
+ from spambayes.port import md5
+ from spambayes import asyncore, asynchat
+
+-class BrighterAsyncChat(asynchat.async_chat):
+- """An asynchat.async_chat that doesn't give spurious warnings on
+- receiving an incoming connection, lets SystemExit cause an exit, can
+- flush its output, and will correctly remove itself from a non-default
+- socket map on `close()`."""
+-
+- def __init__(self, conn=None, map=None):
+- """See `asynchat.async_chat`."""
+- asynchat.async_chat.__init__(self, conn)
+- self.__map = map
+- self._closed = False
+-
+- def handle_connect(self):
+- """Suppresses the asyncore "unhandled connect event" warning."""
+- pass
+-
+- def handle_error(self):
+- """Let SystemExit cause an exit."""
+- type, v, t = sys.exc_info()
+- if type == SystemExit:
+- raise
+- else:
+- asynchat.async_chat.handle_error(self)
+-
+- def flush(self):
+- """Flush everything in the output buffer."""
+- # We check self._closed here because of the case where
+- # self.initiate_send() raises an exception, causing self.close()
+- # to be called. If we didn't check, we could end up in an infinite
+- # loop.
+- while (self.producer_fifo or self.ac_out_buffer) and not self._closed:
+- self.initiate_send()
+-
+- def close(self):
+- """Remove this object from the correct socket map."""
+- self._closed = True
+- self.del_channel(self.__map)
+- self.socket.close()
+-
+-
+ class Context:
+ """See the main documentation for details of `Dibbler.Context`."""
+ def __init__(self, asyncMap=asyncore.socket_map):
+@@ -355,7 +315,7 @@
+ return "You must log in."
+
+
+-class _HTTPHandler(BrighterAsyncChat):
++class _HTTPHandler(asynchat.async_chat):
+ """This is a helper for the HTTP server class - one of these is created
+ for each incoming request, and does the job of decoding the HTTP traffic
+ and driving the plugins."""
+@@ -367,8 +327,7 @@
+ def __init__(self, clientSocket, server, context):
+ # Grumble: asynchat.__init__ doesn't take a 'map' argument,
+ # hence the two-stage construction.
+- BrighterAsyncChat.__init__(self, map=context._map)
+- BrighterAsyncChat.set_socket(self, clientSocket, context._map)
++ asynchat.async_chat.__init__(self, clientSocket, context._map)
+ self._context = context
+ self._server = server
+ self._request = ''
Copied: packages/spambayes/tags/1.1b1-4/debian/patches/lockfile.patch (from rev 14042, packages/spambayes/trunk/debian/patches/lockfile.patch)
===================================================================
--- packages/spambayes/tags/1.1b1-4/debian/patches/lockfile.patch (rev 0)
+++ packages/spambayes/tags/1.1b1-4/debian/patches/lockfile.patch 2017-10-07 12:36:54 UTC (rev 14410)
@@ -0,0 +1,26 @@
+Description: Compatibility with newer python-lockfile
+ Follow the gratuitous renaming of the main python-lockfile API.
+Author: <jepler at unpythonic.net>
+Bug-Debian: https://bugs.debian.org/789564
+Forwarded: no
+Last-Update: 2017-05-24
+--- a/spambayes/safepickle.py 2008-11-25 02:33:24.000000000 +0100
++++ b/spambayes/safepickle.py 2017-05-24 16:23:21.063862689 +0200
+@@ -10,7 +10,7 @@
+
+ def pickle_read(filename):
+ """Read pickle file contents with a lock."""
+- lock = lockfile.FileLock(filename)
++ lock = lockfile.LockFile(filename)
+ lock.acquire(timeout=20)
+ try:
+ return pickle.load(open(filename, 'rb'))
+@@ -20,7 +20,7 @@
+ def pickle_write(filename, value, protocol=0):
+ '''Store value as a pickle without creating corruption'''
+
+- lock = lockfile.FileLock(filename)
++ lock = lockfile.LockFile(filename)
+ lock.acquire(timeout=20)
+
+ try:
Deleted: packages/spambayes/tags/1.1b1-4/debian/patches/series
===================================================================
--- packages/spambayes/trunk/debian/patches/series 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/patches/series 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,3 +0,0 @@
-gnus_fix.patch
-paths_fix.patch
-asyncore.patch
Copied: packages/spambayes/tags/1.1b1-4/debian/patches/series (from rev 14409, packages/spambayes/trunk/debian/patches/series)
===================================================================
--- packages/spambayes/tags/1.1b1-4/debian/patches/series (rev 0)
+++ packages/spambayes/tags/1.1b1-4/debian/patches/series 2017-10-07 12:36:54 UTC (rev 14410)
@@ -0,0 +1,4 @@
+asyncore.patch
+lockfile.patch
+gnus_fix.patch
+paths_fix.patch
Deleted: packages/spambayes/tags/1.1b1-4/debian/rules
===================================================================
--- packages/spambayes/trunk/debian/rules 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/rules 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,66 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-include /usr/share/python/python.mk
-
-SB=debian/spambayes
-
-build-arch: build
-build-indep: build
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- ## Build for all python versions
- python setup.py build
- cp CHANGELOG.txt changelog
- touch build-stamp
-
-clean:
- dh_testdir
- rm -f build-stamp install-stamp
- rm -rf build $(SB)
- python setup.py clean
- rm -f *.pyc */*.pyc */*/*.pyc
- rm -f changelog
- rm -rf spambayes.egg-info
- dh_clean
-
-install: install-stamp
-install-stamp: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs -A
-
- # Install Python modules
- python setup.py -q install --root=$(SB) --no-compile ${py_setup_install_args}
- rm $(SB)/usr/bin/sb_notesfilter.py
- prename "s/.py//" $(SB)/usr/bin/*.py
- rm -f $(SB)/usr/bin/sb_pop3dnd
- dh_install -A
- touch install-stamp
-
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installdocs -i
- dh_installman -i
- dh_installchangelogs -i
- dh_python2 -i
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch:
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary install binary-arch
-
Copied: packages/spambayes/tags/1.1b1-4/debian/rules (from rev 14099, packages/spambayes/trunk/debian/rules)
===================================================================
--- packages/spambayes/tags/1.1b1-4/debian/rules (rev 0)
+++ packages/spambayes/tags/1.1b1-4/debian/rules 2017-10-07 12:36:54 UTC (rev 14410)
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=spamassassin
+SB=debian/spambayes
+
+%:
+ dh $@ --with python2 --buildsystem=pybuild
+
+override_dh_auto_install:
+ dh_auto_install
+ rename "s/.py//" $(SB)/usr/bin/*.py
+ rm -f $(SB)/usr/bin/sb_pop3dnd
+ rm -f $(SB)/usr/bin/sb_notesfilter
Deleted: packages/spambayes/tags/1.1b1-4/debian/spambayes.docs
===================================================================
--- packages/spambayes/trunk/debian/spambayes.docs 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/spambayes.docs 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,10 +0,0 @@
-changelog
-NEWTRICKS.txt
-POP3PROXY.txt
-README-DEVEL.txt
-README.txt
-TESTING.txt
-WHAT_IS_NEW.txt
-contrib/
-pspam/
-utilities/
Copied: packages/spambayes/tags/1.1b1-4/debian/spambayes.docs (from rev 14042, packages/spambayes/trunk/debian/spambayes.docs)
===================================================================
--- packages/spambayes/tags/1.1b1-4/debian/spambayes.docs (rev 0)
+++ packages/spambayes/tags/1.1b1-4/debian/spambayes.docs 2017-10-07 12:36:54 UTC (rev 14410)
@@ -0,0 +1,9 @@
+NEWTRICKS.txt
+POP3PROXY.txt
+README-DEVEL.txt
+README.txt
+TESTING.txt
+WHAT_IS_NEW.txt
+contrib/
+pspam/
+utilities/
Deleted: packages/spambayes/tags/1.1b1-4/debian/spambayes.postinst
===================================================================
--- packages/spambayes/trunk/debian/spambayes.postinst 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/spambayes.postinst 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# transitional bw compatibility links (1.0.4-6)
-SCRIPTS="sb_xmlrpcserver sb_server sb_bnfilter sb_mailsort \
- sb_unheader sb_client sb_filter sb_mboxtrain sb_bnserver \
- sb_chkopts sb_upload sb_dbexpimp sb_imapfilter \
- sb_notesfilter sb_evoscore"
-
-
-if [ "$1" = configure ] ; then
- for f in ${SCRIPTS}
- do
- ln -fs /usr/bin/${f} /usr/bin/${f}.py
- done
-fi
-
-#DEBHELPER#
Deleted: packages/spambayes/tags/1.1b1-4/debian/spambayes.prerm
===================================================================
--- packages/spambayes/trunk/debian/spambayes.prerm 2016-12-20 22:01:42 UTC (rev 13813)
+++ packages/spambayes/tags/1.1b1-4/debian/spambayes.prerm 2017-10-07 12:36:54 UTC (rev 14410)
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# transitional bw compatibility links (1.0.4-6)
-SCRIPTS="sb_xmlrpcserver sb_server sb_bnfilter sb_mailsort \
- sb_unheader sb_client sb_filter sb_mboxtrain sb_bnserver \
- sb_chkopts sb_upload sb_dbexpimp sb_imapfilter \
- sb_notesfilter sb_evoscore"
-
-for f in ${SCRIPTS}
-do
- rm -f /usr/bin/${f}.py
-done
-
-
-#DEBHELPER#
More information about the Python-apps-commits
mailing list