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

[Julien Valroff]

The following commit has been merged in the master branch:
commit d72f53a38290c20bb87bdfa66e44c98da8cd8221
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Feb 11 09:13:28 2012 +0100

    Remove patch merged upstream

diff --git a/debian/patches/007_ctime.pl.diff b/debian/patches/007_ctime.pl.diff
deleted file mode 100644
index d0ce983..0000000
--- a/debian/patches/007_ctime.pl.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: use POSIX::ctime() in steadof deprecated ctime.pl 
-Author: Tom Hendrikx <tom at whyscream.net>
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3389943&group_id=250683&atid=1126467
-Bug-Debian: http://bugs.debian.org/658950
-
---- a/webui/cgi-bin/admin.cgi
-+++ b/webui/cgi-bin/admin.cgi
-@@ -20,7 +20,6 @@
- use strict;
- use Time::Local;
- use vars qw { %CONFIG %DATA %FORM %LANG $LANGUAGE };
--require "ctime.pl";
- 
- #
- # Read configuration parameters common to all CGI scripts
---- a/webui/cgi-bin/dspam.cgi
-+++ b/webui/cgi-bin/dspam.cgi
-@@ -18,12 +18,11 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- use strict;
-+use POSIX qw(strftime ctime);
- use Time::Local;
- use vars qw { %CONFIG %DATA %FORM %LANG $MAILBOX $CURRENT_USER $USER $TMPFILE $USERSELECT };
- use vars qw { $CURRENT_STORE $LANGUAGE };
- 
--require "ctime.pl";
--
- #
- # Read configuration parameters common to all CGI scripts
- #
-@@ -36,10 +35,6 @@
- }
- require "/etc/dspam/webfrontend.conf";
- 
--if($CONFIG{"DATE_FORMAT"}) {
--  use POSIX qw(strftime);
--}
--
- #
- # The current CGI script
- #
diff --git a/debian/patches/series b/debian/patches/series
index 5e9ad60..eafd58e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
 003_dspam-default.prefs-in_etc.diff
 005_dspam-notify.diff
 006_default-daemon-port.diff
-007_ctime.pl.diff

-- 
Debian packages for the DSPAM anti-spam filter