[Python-apps-commits] r7680 - in packages/spambayes/spambayes/trunk (21 files)

afayolle at users.alioth.debian.org afayolle at users.alioth.debian.org
Wed Oct 19 07:49:45 UTC 2011


    Date: Wednesday, October 19, 2011 @ 07:49:44
  Author: afayolle
Revision: 7680

[svn-inject] Application des modifications Debian (1.1a6-1) pour le tronc

Added:
  packages/spambayes/spambayes/trunk/debian/
  packages/spambayes/spambayes/trunk/debian/NEWS.Debian
  packages/spambayes/spambayes/trunk/debian/TODO
  packages/spambayes/spambayes/trunk/debian/changelog
  packages/spambayes/spambayes/trunk/debian/compat
  packages/spambayes/spambayes/trunk/debian/control
  packages/spambayes/spambayes/trunk/debian/copyright
  packages/spambayes/spambayes/trunk/debian/patches/
  packages/spambayes/spambayes/trunk/debian/patches/gnus_fix.patch
  packages/spambayes/spambayes/trunk/debian/patches/handle_ValueError_in_decode_headers.patch
  packages/spambayes/spambayes/trunk/debian/patches/paths_fix.patch
  packages/spambayes/spambayes/trunk/debian/patches/series
  packages/spambayes/spambayes/trunk/debian/pydist-overrides
  packages/spambayes/spambayes/trunk/debian/rules
  packages/spambayes/spambayes/trunk/debian/source/
  packages/spambayes/spambayes/trunk/debian/source/format
  packages/spambayes/spambayes/trunk/debian/spambayes.README.Debian
  packages/spambayes/spambayes/trunk/debian/spambayes.docs
  packages/spambayes/spambayes/trunk/debian/spambayes.postinst
  packages/spambayes/spambayes/trunk/debian/spambayes.prerm
  packages/spambayes/spambayes/trunk/debian/watch


Property changes on: packages/spambayes/spambayes/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: packages/spambayes/spambayes/trunk/debian/NEWS.Debian
===================================================================
--- packages/spambayes/spambayes/trunk/debian/NEWS.Debian	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/NEWS.Debian	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,14 @@
+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

Added: packages/spambayes/spambayes/trunk/debian/TODO
===================================================================
--- packages/spambayes/spambayes/trunk/debian/TODO	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/TODO	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,2 @@
+Write man pages for the various scripts
+Fix lintinan warning about script not executable

Added: packages/spambayes/spambayes/trunk/debian/changelog
===================================================================
--- packages/spambayes/spambayes/trunk/debian/changelog	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/changelog	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,89 @@
+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)
+
+ -- 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


Property changes on: packages/spambayes/spambayes/trunk/debian/changelog
___________________________________________________________________
Added: svn:keywords
   + "Id", svn:eol-style=native

Added: packages/spambayes/spambayes/trunk/debian/compat
===================================================================
--- packages/spambayes/spambayes/trunk/debian/compat	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/compat	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1 @@
+5

Added: packages/spambayes/spambayes/trunk/debian/control
===================================================================
--- packages/spambayes/spambayes/trunk/debian/control	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/control	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,27 @@
+Source: spambayes
+Section: mail
+Priority: optional
+Maintainer:Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Uploaders: Alexandre Fayolle <afayolle at debian.org>
+Build-Depends: debhelper (>= 7.0.50), python (>=2.6.6-3~), python-setuptools
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.7
+Homepage: http://spambayes.sourceforge.net
+Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/spambayes/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/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.
+
+
+
+

Added: packages/spambayes/spambayes/trunk/debian/copyright
===================================================================
--- packages/spambayes/spambayes/trunk/debian/copyright	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/copyright	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,57 @@
+This package was debianized by Alexandre Fayolle <alexandre.fayolle at logilab.fr>
+on Thu,  5 Feb 2004 19:03:49 +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.

Added: packages/spambayes/spambayes/trunk/debian/patches/gnus_fix.patch
===================================================================
--- packages/spambayes/spambayes/trunk/debian/patches/gnus_fix.patch	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/patches/gnus_fix.patch	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Alexandre Fayolle <alexandre.fayolle at logilab.fr>
+# Date 1288525584 -3600
+# Node ID a19cf104dffb212068638409836cef5795b2ada1
+# Parent  3db27c3f13ce1710a5badcad4d60bba0ab41826e
+gnus interface change
+
+diff --git a/contrib/spambayes.el b/contrib/spambayes.el
+--- a/contrib/spambayes.el
++++ b/contrib/spambayes.el
+@@ -25,7 +25,7 @@
+ ;; To install, just drop this file in your load path, and insert the
+ ;; following lines in ~/.gnus:
+ ;;
+-;; (setq gnus-sum-load-hook
++;; (setq gnus-summary-mode-hook
+ ;;   (lambda ()
+ ;;     (require 'spambayes)
+ ;;     (define-key gnus-summary-mode-map [(B) (s)] 'spambayes-gnus-refile-as-spam)

Added: packages/spambayes/spambayes/trunk/debian/patches/handle_ValueError_in_decode_headers.patch
===================================================================
--- packages/spambayes/spambayes/trunk/debian/patches/handle_ValueError_in_decode_headers.patch	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/patches/handle_ValueError_in_decode_headers.patch	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,37 @@
+# HG changeset patch
+# Parent 418dc414cd7e4d4098e3ddfa49c0e759d46c2554
+handle ValueErrors which can be raised by decode_header in email module (closes #491278)
+
+diff --git a/spambayes/UserInterface.py b/spambayes/UserInterface.py
+--- a/spambayes/UserInterface.py
++++ b/spambayes/UserInterface.py
+@@ -214,7 +214,7 @@ class BaseUserInterface(Dibbler.HTTPPlug
+ 
+         try:
+             sections = email.Header.decode_header(field)
+-        except (binascii.Error, email.Errors.HeaderParseError):
++        except (binascii.Error, email.Errors.HeaderParseError, ValueError):
+             sections = [(field, None)]
+         field = ' '.join([text for text, unused in sections])
+         if len(field) > limit:
+diff --git a/spambayes/tokenizer.py b/spambayes/tokenizer.py
+--- a/spambayes/tokenizer.py
++++ b/spambayes/tokenizer.py
+@@ -1314,7 +1314,7 @@ class Tokenizer:
+         x = msg.get('subject', '')
+         try:
+             subjcharsetlist = email.Header.decode_header(x)
+-        except (binascii.Error, email.Errors.HeaderParseError):
++        except (binascii.Error, email.Errors.HeaderParseError, ValueError):
+             subjcharsetlist = [(x, 'invalid')]
+         for x, subjcharset in subjcharsetlist:
+             if subjcharset is not None:
+@@ -1346,7 +1346,7 @@ class Tokenizer:
+                 if name:
+                     try:
+                         subjcharsetlist = email.Header.decode_header(name)
+-                    except (binascii.Error, email.Errors.HeaderParseError):
++                    except (binascii.Error, email.Errors.HeaderParseError, ValueError):
+                         subjcharsetlist = [(name, 'invalid')]
+                     for name, charset in subjcharsetlist:
+                         yield "%s:name:%s" % (field, name.lower())

Added: packages/spambayes/spambayes/trunk/debian/patches/paths_fix.patch
===================================================================
--- packages/spambayes/spambayes/trunk/debian/patches/paths_fix.patch	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/patches/paths_fix.patch	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Alexandre Fayolle <alexandre.fayolle at logilab.fr>
+# Date 1288525605 -3600
+# Node ID 04f5d2ecfd53f14ab35d9ca1f1f8fc3186a39f8b
+# Parent  a19cf104dffb212068638409836cef5795b2ada1
+fix paths in contrib emacs script
+
+diff --git a/contrib/spambayes.el b/contrib/spambayes.el
+--- a/contrib/spambayes.el
++++ b/contrib/spambayes.el
+@@ -84,7 +84,7 @@
+ ;;      "X-Spambayes-Classification:"))
+ 
+ 
+-(defvar spambayes-filter-program "/usr/local/bin/sb_filter.py"
++(defvar spambayes-filter-program "/usr/bin/sb_filter.py"
+   "Path to the sb_filter program.")
+ 
+ 

Added: packages/spambayes/spambayes/trunk/debian/patches/series
===================================================================
--- packages/spambayes/spambayes/trunk/debian/patches/series	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/patches/series	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,2 @@
+gnus_fix.patch
+paths_fix.patch

Added: packages/spambayes/spambayes/trunk/debian/pydist-overrides
===================================================================
--- packages/spambayes/spambayes/trunk/debian/pydist-overrides	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/pydist-overrides	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1 @@
+lockfile python-lockfile

Added: packages/spambayes/spambayes/trunk/debian/rules
===================================================================
--- packages/spambayes/spambayes/trunk/debian/rules	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/rules	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,61 @@
+#!/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: 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}
+	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_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
+


Property changes on: packages/spambayes/spambayes/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/spambayes/spambayes/trunk/debian/source/format
===================================================================
--- packages/spambayes/spambayes/trunk/debian/source/format	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/source/format	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: packages/spambayes/spambayes/trunk/debian/spambayes.README.Debian
===================================================================
--- packages/spambayes/spambayes/trunk/debian/spambayes.README.Debian	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/spambayes.README.Debian	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,8 @@
+Please read WHAT_IS_NEW.txt if you upgrade from an earlier version of
+SpamBayes.
+
+This package does not include the windows specific tools available in
+SpamBayes (the Outlook Plugin, the taskbar applet...). But they are
+available in the source package.
+
+ -- Alexandre Fayolle <afayolle at debian.org>, Tue Feb 15 17:36:51 2005

Added: packages/spambayes/spambayes/trunk/debian/spambayes.docs
===================================================================
--- packages/spambayes/spambayes/trunk/debian/spambayes.docs	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/spambayes.docs	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,9 @@
+NEWTRICKS.txt
+POP3PROXY.txt
+README-DEVEL.txt
+README.txt
+TESTING.txt
+WHAT_IS_NEW.txt
+contrib/
+pspam/
+utilities/

Added: packages/spambayes/spambayes/trunk/debian/spambayes.postinst
===================================================================
--- packages/spambayes/spambayes/trunk/debian/spambayes.postinst	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/spambayes.postinst	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,17 @@
+#!/bin/sh -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#

Added: packages/spambayes/spambayes/trunk/debian/spambayes.prerm
===================================================================
--- packages/spambayes/spambayes/trunk/debian/spambayes.prerm	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/spambayes.prerm	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,15 @@
+#!/bin/sh -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#

Added: packages/spambayes/spambayes/trunk/debian/watch
===================================================================
--- packages/spambayes/spambayes/trunk/debian/watch	                        (rev 0)
+++ packages/spambayes/spambayes/trunk/debian/watch	2011-10-19 07:49:44 UTC (rev 7680)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/spambayes/spambayes-(.*)\.tar\.gz 




More information about the Python-apps-commits mailing list