[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.10.1+dfsg-3-17-g8a5cf40

[Julien Valroff]

The following commit has been merged in the master branch:
commit 8a5cf4044d326d0d7075249aa374eeb3ffd1adc9
Merge: 542a255e3c86571f345f0efa1f1d5097b72d3ad3 199fd3c150739d8585bd61449eaba7abcaa7aefd
Author: Julien Valroff <julien at kirya.net>
Date:   Fri Feb 10 22:13:41 2012 +0100

    Merge branch 'sid'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index aa42767,8579fa7..bcad623
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,20 @@@
 +dspam (3.10.2+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Add gbp.conf to allow filtering out non DFSG-clean files when using
 +    git-import-orig to merge new upstream releases 
 +  * Use versioned DEP-5 copyright format uri
 +  * Add dspam_alias_retraining script to dspam package as example 
 +  * Refresh and update patches 
 +
-  -- Julien Valroff <julien at debian.org>  Tue, 31 Jan 2012 20:16:33 +0100
++ -- Julien Valroff <julien at debian.org>  Fri, 10 Feb 2012 22:12:44 +0100
++
+ dspam (3.10.1+dfsg-4) unstable; urgency=low
+ 
+   * Apply patch from upstream to use POSIX::ctime() instead of deprecated
+     ctime.pl (Closes: #658950)
+ 
+  -- Julien Valroff <julien at debian.org>  Fri, 10 Feb 2012 21:55:13 +0100
  
  dspam (3.10.1+dfsg-3) unstable; urgency=low
  
diff --combined debian/patches/series
index eafd58e,fb522ff..5e9ad60
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,7 +1,6 @@@
  001_dspam-webfrontend-config-debian.diff
  002_update-dspam.conf.diff
  003_dspam-default.prefs-in_etc.diff
 -004_where-to-find-txt-files.diff
  005_dspam-notify.diff
  006_default-daemon-port.diff
+ 007_ctime.pl.diff

-- 
Debian packages for the DSPAM anti-spam filter