[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110514.347379b+dfsg-1-60-g96133d4

[Julien Valroff]

The following commit has been merged in the master branch:
commit 96133d4af03ec8ca7cb7b5143df164e0317f0ed9
Author: Julien Valroff <julien at kirya.net>
Date:   Thu Aug 11 22:05:59 2011 +0200

    Updates for the new release

diff --git a/debian/README.source b/debian/README.source
index d67115e..006ca8d 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -6,15 +6,9 @@ Free Software Guidelines [0] and hence have been excluded from the Debian source
 
 Here are the files excluded:
 
-    contrib/dspam_alias_retraining/
-        No license stated
-
     contrib/lotus_notes/
         Non DFSG-free license
 
-    contrib/OutlookAddin/
-        No license stated
-
 [0] http://www.debian.org/social_contract#guidelines
 
 
diff --git a/debian/changelog b/debian/changelog
index 2556c54..399c90c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,10 @@
-dspam (3.10.0+dfsg-1) unstable; urgency=low
+dspam (3.10.1+dfsg-1) unstable; urgency=low
 
   [ Julien Valroff ]
   * New upstream release:
     + Update copyright information following to upstream license switch from
       GPL-2 to AGPL-3+
     + Drop patches merged upstream
-    + Add patch to ship cssclean.txt file, missing in the upstream tarball
   * Ensures system user is actually locked on purge, and unlocked in case
     the package is reinstalled
   * Demote various MDA's from Depends to Recommends
@@ -20,7 +19,7 @@ dspam (3.10.0+dfsg-1) unstable; urgency=low
   [ Thomas Preud'homme ]
   * Set build flags (CPPFLAGS, CFLAGS and LDFLAGS) using dpkg-buildflags.
 
- -- Julien Valroff <julien at debian.org>  Tue, 02 Aug 2011 20:03:59 +0200
+ -- Julien Valroff <julien at debian.org>  Thu, 11 Aug 2011 22:04:56 +0200
 
 dspam (3.9.1~rc1+git20110514.347379b+dfsg-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index cfc63bc..1a6fd97 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,7 @@ Upstream-Name: DSPAM
 Source: http://dspam.sourceforge.net
 Comment: Some parts of the DSPAM tarball shipped in contrib/ do not comply with the Debian 
  Free Software Guidelines and hence have been excluded from the Debian source package:
-   * contrib/dspam_alias_retraining/ - No license stated
    * contrib/lotus_notes/ - Non DFSG-free license
-   * contrib/OutlookAddin/ - No license stated
 
 Files: *
 Copyright: 2002-2011, DSPAM Project
diff --git a/debian/patches/007_cssclean-doc.diff b/debian/patches/007_cssclean-doc.diff
deleted file mode 100644
index 7547805..0000000
--- a/debian/patches/007_cssclean-doc.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Add missing cssclean.txt to the documentation
-Author: Julien Valroff <julien at debian.org>
-Last-Update: 2011-08-02
-
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -14,4 +14,5 @@
- 		sqlite_drv.txt	\
- 		relay.txt   	\
- 		markov.txt	\
--		tests.txt
-+		tests.txt  \
-+		cssclean.txt
---- /dev/null
-+++ b/doc/cssclean.txt
-@@ -0,0 +1,35 @@
-+$Id: cssclean.txt,v 1.01 2011/07/11 23:46:05 sbajic Exp $
-+
-+HASH_DRV NIGHTLY MAINTENANCE
-+
-+The tool for nightly maintenance - dspam_clean - does not work with hash_drv,
-+it does not do any cleaning.
-+
-+You have to clean it by yourself. There are the two steps to do:
-+
-+- first, you should remove old signature files. These files are located
-+in user.sig directory and have extension .sig. They are needed only
-+for dspam retraining, so you can remove them if they are older than two weeks.
-+- second, you should purge databases. They are located in user.css
-+files and contain a set of tokens with counters: SPAM and NONSPAM, which count
-+how many times the token appeared in spams and innocent mails.
-+
-+There is a special tool for cleaning it - cssclean:
-+
-+cssclean [file.css] {heavy}
-+
-+Cssclean implements its own counter for each token. It increments every
-+cleaning - so if you run cssclean every night, it works like timestamp.
-+If DSPAM uses a token, it resets this counter. So cssclean knows which tokens
-+were not used for counted time.
-+
-+Cssclean removes tokens, which are:
-+- not used for 15 cleans and ( NONSPAM + SPAM <= 1 ), or
-+- not used for 15 cleans and NONSPAM is equal or almost equal SPAM, or
-+- not used for 60 cleans and ( NONSPAM*2 + SPAM < 5 ), or
-+- not used for 120 cleans.
-+
-+With special options - heavy - cssclean is more strict and removes
-+tokens for which:
-+- NONSPAM + SPAM <= 1
-+- NONSPAM is equal or almost equal SPAM
diff --git a/debian/patches/series b/debian/patches/series
index 7866fd2..58799d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 004_where-to-find-txt-files.diff
 005_dspam-notify.diff
 006_default-daemon-port.diff
-007_cssclean-doc.diff

-- 
Debian packages for the DSPAM anti-spam filter