diff -Nru spambayes-1.1b1/debian/changelog spambayes-1.1b1/debian/changelog --- spambayes-1.1b1/debian/changelog 2017-10-07 07:56:27.000000000 +0000 +++ spambayes-1.1b1/debian/changelog 2018-07-29 03:55:34.000000000 +0000 @@ -1,10 +1,32 @@ +spambayes (1.1b1-5) unstable; urgency=medium + + [ Ondřej Nový ] + * d/changelog: Remove trailing whitespaces + * d/control: Remove trailing whitespaces + * d/rules: Remove trailing whitespaces + * d/control: Remove ancient X-Python-Version field + + [ Hugo Lefeuvre ] + * Bump debian/compat to 11. + * debian/control: + - Update debhelper dependency to match compat. + - Bump Standards-Version to 4.1.5. + - Switch Homepage to the GitHub one since it contains more up-to-date + information. + * Bump copyright years. + * Bump debian/watch version to 4. + * Remove patch handle_ValueError_in_decode_headers.patch (looks like it was + applied upstream at some point, removed from series but never deleted). + + -- Hugo Lefeuvre Sun, 29 Jul 2018 11:55:34 +0800 + 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. + * Bump Standards-Version to 4.1.1. -- Hugo Lefeuvre Sat, 07 Oct 2017 09:56:27 +0200 @@ -27,7 +49,7 @@ * debian/control: - Update Hugo Lefeuvre's e-mail address. - Depend on debhelper 10 instead of 5. - - Bump Standards-Version to 3.9.8. + - 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. @@ -70,7 +92,7 @@ adding set -e. * debian/spambayes.docs: - Listed the CHANGELOG.txt file. - * debian/rules: + * debian/rules: - Added build-arch and build-indep directives. - Added dh_installman -i directive. * debian/patches/series and debian/patches/asyncore.patch @@ -101,11 +123,11 @@ * 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 + - 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 Fri, 05 Nov 2010 17:48:58 +0100 spambayes (1.0.4-5.1) unstable; urgency=low diff -Nru spambayes-1.1b1/debian/compat spambayes-1.1b1/debian/compat --- spambayes-1.1b1/debian/compat 2017-05-24 13:29:36.000000000 +0000 +++ spambayes-1.1b1/debian/compat 2018-07-29 03:55:34.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru spambayes-1.1b1/debian/control spambayes-1.1b1/debian/control --- spambayes-1.1b1/debian/control 2017-10-07 07:56:27.000000000 +0000 +++ spambayes-1.1b1/debian/control 2018-07-29 03:55:34.000000000 +0000 @@ -3,17 +3,16 @@ Priority: optional Maintainer: Python Applications Packaging Team Uploaders: Hugo Lefeuvre -Build-Depends: debhelper (>= 10), - python, - python-setuptools, +Build-Depends: debhelper (>= 11), + 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/ +Standards-Version: 4.1.5 +Homepage: https://github.com/smontanaro/spambayes +Vcs-Git: https://salsa.debian.org/python-team/applications/spambayes.git +Vcs-Browser: https://salsa.debian.org/python-team/applications/spambayes Package: spambayes Architecture: all diff -Nru spambayes-1.1b1/debian/copyright spambayes-1.1b1/debian/copyright --- spambayes-1.1b1/debian/copyright 2017-05-24 13:29:36.000000000 +0000 +++ spambayes-1.1b1/debian/copyright 2018-07-29 03:55:34.000000000 +0000 @@ -3,7 +3,7 @@ Source: http://spambayes.sf.net/ Files: * -Copyright: 2002-2003 Python Software Foundation +Copyright: 2002-2013 Python Software Foundation License: PSF 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and @@ -52,7 +52,7 @@ Files: debian/* Copyright: 2004-2014 Alexandre Fayolle - 2014-2017 Hugo Lefeuvre + 2014-2018 Hugo Lefeuvre 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 diff -Nru spambayes-1.1b1/debian/gbp.conf spambayes-1.1b1/debian/gbp.conf --- spambayes-1.1b1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ spambayes-1.1b1/debian/gbp.conf 2018-07-29 03:55:34.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +debian-branch=debian/master diff -Nru spambayes-1.1b1/debian/patches/handle_ValueError_in_decode_headers.patch spambayes-1.1b1/debian/patches/handle_ValueError_in_decode_headers.patch --- spambayes-1.1b1/debian/patches/handle_ValueError_in_decode_headers.patch 2011-10-19 07:49:44.000000000 +0000 +++ spambayes-1.1b1/debian/patches/handle_ValueError_in_decode_headers.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -# 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()) diff -Nru spambayes-1.1b1/debian/rules spambayes-1.1b1/debian/rules --- spambayes-1.1b1/debian/rules 2017-06-10 11:11:49.000000000 +0000 +++ spambayes-1.1b1/debian/rules 2018-07-29 03:55:34.000000000 +0000 @@ -9,5 +9,5 @@ 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_pop3dnd rm -f $(SB)/usr/bin/sb_notesfilter diff -Nru spambayes-1.1b1/debian/watch spambayes-1.1b1/debian/watch --- spambayes-1.1b1/debian/watch 2011-10-19 07:49:44.000000000 +0000 +++ spambayes-1.1b1/debian/watch 2018-07-29 03:55:34.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 +version=4 http://sf.net/spambayes/spambayes-(.*)\.tar\.gz