[Pkg-dspam-commits] [pkg-dspam-commits] r207 - in branches/experimental/debian: . config manpages patches
Julien Valroff
julien-guest at alioth.debian.org
Sat Sep 19 06:32:06 UTC 2009
Author: julien-guest
Date: Sat Sep 19 06:32:05 2009
New Revision: 207
Log:
Sync with local repo
Added:
branches/experimental/debian/libdspam7.lintian-overrides
branches/experimental/debian/patches/10-fix-fr-templates.dpatch (contents, props changed)
Modified:
branches/experimental/debian/TODO.Debian
branches/experimental/debian/changelog
branches/experimental/debian/config/mysql.conf
branches/experimental/debian/dspam-doc.docs
branches/experimental/debian/dspam-webfrontend.lintian-overrides
branches/experimental/debian/dspam.logrotate
branches/experimental/debian/manpages/dspam_admin.1
branches/experimental/debian/patches/00list
branches/experimental/debian/patches/06_clean-manpages.dpatch
Modified: branches/experimental/debian/TODO.Debian
==============================================================================
--- branches/experimental/debian/TODO.Debian Mon Aug 24 11:34:45 2009 (r206)
+++ branches/experimental/debian/TODO.Debian Sat Sep 19 06:32:05 2009 (r207)
@@ -1,8 +1,15 @@
TODO list for DSPAM debian packages
====================================
-* Move the .cgi files out of /var/www/dspam/
+* Move the .cgi files out of /var/www/dspam/ which is currently not possible
+ as apache2-suexec default docroot is set to /var/www/.
+
See discussion at:
- http://lists.alioth.debian.org/pipermail/pkg-dspam-misc/2009-August/000649.html
+ http://lists.alioth.debian.org/pipermail/pkg-dspam-misc/2009-August/000649.html
+ Blocked by:
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491547
+ Debian Policy:
+ http://www.debian.org/doc/debian-policy/ch-customized-programs.html#s-web-appl
+
* Install some or all of the contribs (TB plugin as a separate package?)
Modified: branches/experimental/debian/changelog
==============================================================================
--- branches/experimental/debian/changelog Mon Aug 24 11:34:45 2009 (r206)
+++ branches/experimental/debian/changelog Sat Sep 19 06:32:05 2009 (r207)
@@ -1,4 +1,4 @@
-dspam (3.9.0~beta1+git20090818-1) experimental; urgency=low
+dspam (3.9.0~beta1+git20090917-1) stable; urgency=low
[ Kurt B. Kaiser ]
* debian/rules: don't use --build config option if host equals target.
@@ -24,7 +24,7 @@
[ Julien Valroff ]
* New upstream beta
- (Closes: #418736, #491387, #505010, #514498, #522645)
+ (Closes: #418736, #491387, #505010, #514498)
* Bump Standards to 3.8.3:
+ Add README.source, as per Debian Policy Manual 4.14
* Bump debhelper compatibility to 7
@@ -46,11 +46,9 @@
* Set default database name and user name to dspam for both MySQL and PgSQL
* Make dspam-webfrontend suggest apache2
* Remove Aurélien Labrosse from Uploaders (Closes: #503488)
- * Add Antonio Radici and myself as uploaders
+ * Add Antonio Radici to uploaders
* Add depends on other MDAs than procmail (Closes: #506312)
* Honour $USER in call to chmod (Closes: #505217)
- * Remove lintian overrides for files in /var/www/ - moving these files
- is on the task list
* Fix MySQL daily cronjob to work correctly when using storage profiles
* Make MySQL daily cronjob quiet
* Fix build-dependencies to use current automake version and use
@@ -68,8 +66,33 @@
* Fix verbose_bug build option
* Add logrotate entry for dspam.messages and sql.errors
* Add 'notifempty' option for logrotate
+ * Fix 'hyphen-used-as-minus-sign' lintian information: escape all -
+ in manpages
+ * Update dspam_admin manpage to list aggregate feature
- -- Julien Valroff <julien at kirya.net> Tue, 18 Aug 2009 13:18:00 +0200
+ -- Julien Valroff <julien at kirya.net> Sat, 12 Sep 2009 10:11:04 +0200
+
+dspam (3.6.8-10) unstable; urgency=low
+
+ * Add myself as uploader
+ * Add patch from upstream git to allow build against
+ newer sqlite versions (Closes: #522645)
+
+ -- Julien Valroff <julien at kirya.net> Mon, 24 Aug 2009 12:43:22 +0200
+
+dspam (3.6.8-9) unstable; urgency=low
+
+ [ Kurt B. Kaiser ]
+ * (This is a maintenance release for lenny from pkg-dspam/branches/lenny)
+ * Add apache2-suexec (>= 2.2.9-3) as webfrontend Suggests: (Closes: #488924).
+ * Acknowledge NMU. Thanks Peter Eisentraut (Closes: #473027, #480602).
+ * Fix a regression in #455052, #469668: force removal of the /usr/share/dspam
+ directory with dspam-webfrontend.preinst for versions prior to 3.6.8-9.
+ * Fix regression from #388140: remote mySQL server fails (Closes: #481755)
+ * /etc/init.d/dspam ignored $USER (LP: #232543)(Closes: #483868)
+ * cron shouldn't try to clean mysql db if dspam was removed (Closes: 484889)
+
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org> Thu, 11 Sep 2008 17:45:18 -0400
dspam (3.6.8-9) unstable; urgency=low
Modified: branches/experimental/debian/config/mysql.conf
==============================================================================
--- branches/experimental/debian/config/mysql.conf Mon Aug 24 11:34:45 2009 (r206)
+++ branches/experimental/debian/config/mysql.conf Sat Sep 19 06:32:05 2009 (r207)
@@ -5,21 +5,23 @@
# the configuration specific to your installation, if applicable.
#
MySQLServer /var/run/mysqld/mysqld.sock
-#MySQLPort 3306
+#MySQLPort 3306
MySQLUser _DBC_DBUSER_
MySQLPass _DBC_DBPASS_
MySQLDb _DBC_DBNAME_
-#MySQLCompress false
+#MySQLCompress false
+#MySQLReconnect true
# If you are using replication for clustering, you can also specify a separate
# server to perform all writes to.
#
#MySQLWriteServer /var/run/mysqld/mysqld.sock
-#MySQLWritePort
+#MySQLWritePort 3306
#MySQLWriteUser dspam
#MySQLWritePass changeme
-#MySQLWriteDb dspam_write
+#MySQLWriteDb dspam_write
#MySQLCompress true
+#MySQLReconnect true
# If your replication isn't close to real-time, your retraining might fail if
# the signature isn't found. One workaround for this is to use the write
Modified: branches/experimental/debian/dspam-doc.docs
==============================================================================
--- branches/experimental/debian/dspam-doc.docs Mon Aug 24 11:34:45 2009 (r206)
+++ branches/experimental/debian/dspam-doc.docs Sat Sep 19 06:32:05 2009 (r207)
@@ -1,11 +1,3 @@
-doc/markov.txt
-doc/pop3filter.txt
-doc/sendmail.txt
-doc/courier.txt
-doc/osx.txt
-doc/postfix.txt
-doc/exim.txt
-doc/qmail.txt
-doc/relay.txt
+doc/*.txt
debian/dspam-documents/exim4/
debian/dspam-documents/postfix/
Modified: branches/experimental/debian/dspam-webfrontend.lintian-overrides
==============================================================================
--- branches/experimental/debian/dspam-webfrontend.lintian-overrides Mon Aug 24 11:34:45 2009 (r206)
+++ branches/experimental/debian/dspam-webfrontend.lintian-overrides Sat Sep 19 06:32:05 2009 (r207)
@@ -1 +1,6 @@
+dspam-webfrontend: dir-or-file-in-var-www var/www/dspam/
+dspam-webfrontend: dir-or-file-in-var-www var/www/dspam/admin.cgi
+dspam-webfrontend: dir-or-file-in-var-www var/www/dspam/admingraph.cgi
+dspam-webfrontend: dir-or-file-in-var-www var/www/dspam/dspam.cgi
+dspam-webfrontend: dir-or-file-in-var-www var/www/dspam/graph.cgi
dspam-webfrontend: script-not-executable ./usr/share/dspam/configure.pl
Modified: branches/experimental/debian/dspam.logrotate
==============================================================================
--- branches/experimental/debian/dspam.logrotate Mon Aug 24 11:34:45 2009 (r206)
+++ branches/experimental/debian/dspam.logrotate Sat Sep 19 06:32:05 2009 (r207)
@@ -1,4 +1,6 @@
-/var/log/dspam/dspam.debug
+# dspam.debug file is only used if dspam is built with
+# verbose-debug which is not recommended for a production server
+#/var/log/dspam/dspam.debug
/var/log/dspam/dspam.messages
/var/log/dspam/sql.errors
{
Added: branches/experimental/debian/libdspam7.lintian-overrides
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/debian/libdspam7.lintian-overrides Sat Sep 19 06:32:05 2009 (r207)
@@ -0,0 +1 @@
+libdspam7: no-symbols-control-file usr/lib/libdspam.so.7.0.0
Modified: branches/experimental/debian/manpages/dspam_admin.1
==============================================================================
--- branches/experimental/debian/manpages/dspam_admin.1 Mon Aug 24 11:34:45 2009 (r206)
+++ branches/experimental/debian/manpages/dspam_admin.1 Sat Sep 19 06:32:05 2009 (r207)
@@ -25,7 +25,7 @@
.br
.SH "DESCRIPTION"
.B dspam_admin
-is used to change some user's preferences.
+is used to list and/or change some user's preferences.
.SH "OPTIONS"
Add a Preference:
@@ -39,6 +39,10 @@
List Preferences:
dspam_admin list preferences [user]
+
+Aggregate Preferences:
+dspam_admin aggregate preference [user]
+
.SH "SEE ALSO"
.BR dspam (1)
.SH "AUTHOR"
Modified: branches/experimental/debian/patches/00list
==============================================================================
--- branches/experimental/debian/patches/00list Mon Aug 24 11:34:45 2009 (r206)
+++ branches/experimental/debian/patches/00list Sat Sep 19 06:32:05 2009 (r207)
@@ -7,3 +7,4 @@
06_clean-manpages.dpatch
07_path-to-dspam_for-training-script.dpatch
09_where-to-find-txt-files.dpatch
+10_fix-fr-templates.dpatch
Modified: branches/experimental/debian/patches/06_clean-manpages.dpatch
==============================================================================
--- branches/experimental/debian/patches/06_clean-manpages.dpatch Mon Aug 24 11:34:45 2009 (r206)
+++ branches/experimental/debian/patches/06_clean-manpages.dpatch Sat Sep 19 06:32:05 2009 (r207)
@@ -5,9 +5,9 @@
## DP: Various fixes to manpages
@DPATCH@
-diff -urNad dspam-3.9.0~alpha2+git20090720~/man/dspam.1 dspam-3.9.0~alpha2+git20090720/man/dspam.1
---- dspam-3.9.0~alpha2+git20090720~/man/dspam.1 2009-07-20 18:25:15.000000000 +0200
-+++ dspam-3.9.0~alpha2+git20090720/man/dspam.1 2009-07-21 18:58:16.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090820~/man/dspam.1 dspam-3.9.0~beta1+git20090820/man/dspam.1
+--- dspam-3.9.0~beta1+git20090820~/man/dspam.1 2009-08-21 15:56:30.000000000 +0200
++++ dspam-3.9.0~beta1+git20090820/man/dspam.1 2009-08-22 15:44:19.265168756 +0200
@@ -102,7 +102,7 @@
delivered, the $u (or %u) parameters of the argument string will be interpolated
for the current user being processed.
@@ -17,9 +17,81 @@
.TP
.BI \--mode= [toe|tum|teft|notrain]\c
Configures the training mode to be used for this process, overriding any
-diff -urNad dspam-3.9.0~alpha2+git20090720~/man/dspam_clean.1 dspam-3.9.0~alpha2+git20090720/man/dspam_clean.1
---- dspam-3.9.0~alpha2+git20090720~/man/dspam_clean.1 2009-07-20 18:25:15.000000000 +0200
-+++ dspam-3.9.0~alpha2+git20090720/man/dspam_clean.1 2009-07-21 18:58:25.000000000 +0200
+@@ -121,7 +121,7 @@
+ : No training. Do not train the user's data, and do not keep totals. This should only be used in cases where you want to process mail for a particular user (based on a group, for example), but don't want the user to accumulate any learning data.
+
+ .B unlearn
+-: Unlearn original training. Use this if you wish to unlearn a previously learned message. Be sure to specify --source=error and --class to whatever the original classification the message was learned under. If not using TrainPristine, this will require the original signature from training.
++: Unlearn original training. Use this if you wish to unlearn a previously learned message. Be sure to specify \--source=error and \--class to whatever the original classification the message was learned under. If not using TrainPristine, this will require the original signature from training.
+
+ .ne 3
+ .TP
+@@ -150,7 +150,7 @@
+ should be used when a misclassification has occured, when the user is
+ corpus-feeding a message, or when an inoculation is being presented. This
+ flag should not be used for standard processing. This flag must be used in
+-conjunction with the --source flag. Omitting this flag causes DSPAM to
++conjunction with the \--source flag. Omitting this flag causes DSPAM to
+ determine the disposition of the message on its own (the standard operating
+ mode).
+
+@@ -186,7 +186,7 @@
+ .BI \--deliver= [innocent,spam]\c
+ Tells
+ .B DSPAM
+-to deliver the message if its result falls within the criteria specified. For example, --deliver=innocent will cause DSPAM to only deliver the message if its classification has been determined as innocent. Providing --deliver=innocent,spam will cause DSPAM to deliver the message regardless of its classification. This flag provides a significant amount of flexibility for nonstandard implementations.
++to deliver the message if its result falls within the criteria specified. For example, \--deliver=innocent will cause DSPAM to only deliver the message if its classification has been determined as innocent. Providing \--deliver=innocent,spam will cause DSPAM to deliver the message regardless of its classification. This flag provides a significant amount of flexibility for nonstandard implementations.
+
+ .ne 3
+ .TP
+@@ -228,7 +228,7 @@
+ .TP
+ .BI \--signature =[signature]
+ If only the signature is available for training, and not the entire message,
+-the --signature flag may be used to feed the signature into DSPAM and forego
++the \--signature flag may be used to feed the signature into DSPAM and forego
+ the reading of stdin. DSPAM will process the signature with whatever
+ commandline classification was specified. NOTE: This should only be used
+ with
+@@ -241,7 +241,7 @@
+ .B DSPAM
+ was compiled with
+ .B --enable-debug
+-then using --debug will turn on debugging messages to /tmp/dspam.debug.
++then using \--debug will turn on debugging messages to /tmp/dspam.debug.
+
+ .ne 3
+ .TP
+@@ -250,7 +250,7 @@
+ .B DSPAM
+ was compiled with
+ .B --enable-daemon
+-then using --daemon will cause DSPAM to enter daemon mode, where it will listen
++then using \--daemon will cause DSPAM to enter daemon mode, where it will listen
+ for DSPAM clients to connect and actively service requests.
+
+ .ne 3
+@@ -260,7 +260,7 @@
+ .B DSPAM
+ was compiled with
+ .B --enable-daemon
+-then using --client will cause DSPAM to act as a client and attempt to connect to the DSPAM server specified in the client's configuration within dspam.conf. If client behavior is desired, this option
++then using \--client will cause DSPAM to act as a client and attempt to connect to the DSPAM server specified in the client's configuration within dspam.conf. If client behavior is desired, this option
+ .B must
+ be specified, otherwise the agent simply operate as self-contained and processes the message on its own, eliminating any benefit of using the daemon.
+
+@@ -269,7 +269,7 @@
+ .BI \--rcpt-to\c
+ If
+ .B DSPAM
+-will be configured to deliver via LMTP or SMTP, this flag may be used to define the RCPT TOs which will be used for the delivery of each user specified with --user. If no recipients are provided, the RCPT TOs will match the username.
++will be configured to deliver via LMTP or SMTP, this flag may be used to define the RCPT TOs which will be used for the delivery of each user specified with \--user. If no recipients are provided, the RCPT TOs will match the username.
+ NOTE: The recipient list should always be balanced with the user list, or empty. Specifying an unbalanced number of recipients to users will result in undefined behavior.
+
+ .ne 3
+diff -urNad dspam-3.9.0~beta1+git20090820~/man/dspam_clean.1 dspam-3.9.0~beta1+git20090820/man/dspam_clean.1
+--- dspam-3.9.0~beta1+git20090820~/man/dspam_clean.1 2009-08-21 15:56:00.000000000 +0200
++++ dspam-3.9.0~beta1+git20090820/man/dspam_clean.1 2009-08-22 15:43:57.289669426 +0200
@@ -45,7 +45,7 @@
14 days will be overridden. Specifying an age of 0 will delete all signatures
from the user(s) processed.
@@ -38,7 +110,12 @@
.TP
.BI \-u\fR\c
Deletes all unused tokens from a user's dataset. Four different life values
-@@ -77,7 +77,7 @@
+@@ -73,11 +73,11 @@
+ .B ihl
+ Tokens with a single innocent hit
+
+-Ages may be overridden by specifying a format string, such as -u30,15,10,10
++Ages may be overridden by specifying a format string, such as \-u30,15,10,10
where each number represents the respective life. Specifying a life of zero
will delete all unused tokens in the category.
@@ -47,9 +124,9 @@
.TP
.BI \ user1\ user2\ ...\ userN\fR\c
Specify the username(s) to perform the selected maintenance operations on. If
-diff -urNad dspam-3.9.0~alpha2+git20090720~/man/dspam_dump.1 dspam-3.9.0~alpha2+git20090720/man/dspam_dump.1
---- dspam-3.9.0~alpha2+git20090720~/man/dspam_dump.1 2009-07-20 18:25:15.000000000 +0200
-+++ dspam-3.9.0~alpha2+git20090720/man/dspam_dump.1 2009-07-21 18:58:16.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090820~/man/dspam_dump.1 dspam-3.9.0~beta1+git20090820/man/dspam_dump.1
+--- dspam-3.9.0~beta1+git20090820~/man/dspam_dump.1 2009-08-21 15:56:00.000000000 +0200
++++ dspam-3.9.0~beta1+git20090820/man/dspam_dump.1 2009-08-22 15:43:57.289669426 +0200
@@ -39,7 +39,7 @@
The username of the user to dump. Only trusted users (or root) can use this
program for the usernames different from the current one.
@@ -59,9 +136,18 @@
.TP
.BI \ token \fR\c
.br
-diff -urNad dspam-3.9.0~alpha2+git20090720~/man/dspam_merge.1 dspam-3.9.0~alpha2+git20090720/man/dspam_merge.1
---- dspam-3.9.0~alpha2+git20090720~/man/dspam_merge.1 2009-07-20 18:25:15.000000000 +0200
-+++ dspam-3.9.0~alpha2+git20090720/man/dspam_merge.1 2009-07-21 18:58:16.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090820~/man/dspam_merge.1 dspam-3.9.0~beta1+git20090820/man/dspam_merge.1
+--- dspam-3.9.0~beta1+git20090820~/man/dspam_merge.1 2009-08-21 15:56:00.000000000 +0200
++++ dspam-3.9.0~beta1+git20090820/man/dspam_merge.1 2009-08-22 15:43:57.289669426 +0200
+@@ -32,7 +32,7 @@
+ token and per-user totals are added together to produce a single composite
+ dataset. After creating a composite user,
+ .B dspam_clean
+-should be run with the -p option to clean up extraneous data.
++should be run with the \-p option to clean up extraneous data.
+
+ .B NOTE
+ : Merges may take a considerable amount of time. This could potentially increase
@@ -46,7 +46,7 @@
.BI \ user1\ user2\ ...\ userN \fR\c
A list of users to merge together.
@@ -71,9 +157,9 @@
.TP
.BI \ -o \ username \fR\c
The target user which will be created (if necessary). This user will contain
-diff -urNad dspam-3.9.0~alpha2+git20090720~/man/dspam_stats.1 dspam-3.9.0~alpha2+git20090720/man/dspam_stats.1
---- dspam-3.9.0~alpha2+git20090720~/man/dspam_stats.1 2009-07-20 18:25:15.000000000 +0200
-+++ dspam-3.9.0~alpha2+git20090720/man/dspam_stats.1 2009-07-21 18:58:16.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090820~/man/dspam_stats.1 dspam-3.9.0~beta1+git20090820/man/dspam_stats.1
+--- dspam-3.9.0~beta1+git20090820~/man/dspam_stats.1 2009-08-21 15:56:30.000000000 +0200
++++ dspam-3.9.0~beta1+git20090820/man/dspam_stats.1 2009-08-22 15:43:57.289669426 +0200
@@ -62,7 +62,7 @@
.BI \-t\fR\c
Displays a total of all statistics displayed
@@ -83,9 +169,9 @@
.TP
.BI [username]\c
Specifies the username to query. If no username is provided, all users will be
-diff -urNad dspam-3.9.0~alpha2+git20090720~/man/dspam_train.1 dspam-3.9.0~alpha2+git20090720/man/dspam_train.1
---- dspam-3.9.0~alpha2+git20090720~/man/dspam_train.1 2009-07-20 18:25:15.000000000 +0200
-+++ dspam-3.9.0~alpha2+git20090720/man/dspam_train.1 2009-07-21 18:58:16.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090820~/man/dspam_train.1 dspam-3.9.0~beta1+git20090820/man/dspam_train.1
+--- dspam-3.9.0~beta1+git20090820~/man/dspam_train.1 2009-08-21 15:56:00.000000000 +0200
++++ dspam-3.9.0~beta1+git20090820/man/dspam_train.1 2009-08-22 15:43:57.289669426 +0200
@@ -43,24 +43,24 @@
.ne 3
.TP
@@ -115,9 +201,9 @@
.TP
.BI nonspam_corpus\c
Specifies either the pathname to the directory containing the corpus of
-diff -urNad dspam-3.9.0~alpha2+git20090720~/man/libdspam.3 dspam-3.9.0~alpha2+git20090720/man/libdspam.3
---- dspam-3.9.0~alpha2+git20090720~/man/libdspam.3 2009-07-20 18:25:15.000000000 +0200
-+++ dspam-3.9.0~alpha2+git20090720/man/libdspam.3 2009-07-21 18:58:16.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090820~/man/libdspam.3 dspam-3.9.0~beta1+git20090820/man/libdspam.3
+--- dspam-3.9.0~beta1+git20090820~/man/libdspam.3 2009-08-21 15:56:00.000000000 +0200
++++ dspam-3.9.0~beta1+git20090820/man/libdspam.3 2009-08-22 15:43:57.289669426 +0200
@@ -11,7 +11,7 @@
.TH libdspam 3 "Sep 29, 2004" "libdspam" "libdspam"
Added: branches/experimental/debian/patches/10-fix-fr-templates.dpatch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/debian/patches/10-fix-fr-templates.dpatch Sat Sep 19 06:32:05 2009 (r207)
@@ -0,0 +1,155 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_tmp.dpatch by Julien Valroff <julien at kirya.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes for French translation of WebGUI templates
+
+ at DPATCH@
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_admin_error.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_admin_error.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_admin_error.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_admin_error.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
++<HEAD><TITLE>DSPAM v3 - Administration</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_admin_preferences.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_admin_preferences.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_admin_preferences.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_admin_preferences.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
++<HEAD><TITLE>DSPAM v3 - Administration</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+@@ -46,7 +46,7 @@
+ <INPUT TYPE=HIDDEN NAME="template" VALUE="preferences">
+
+ <div class="content">
+- <h3><strong>Apprentissage</strong> - Configure la façdon dont le filtre apprend lors de l'analyse des messages</h3>
++ <h3><strong>Apprentissage</strong> - Configure la façon dont le filtre apprend lors de l'analyse des messages</h3>
+ <p>
+ <table class="hollow">
+ <tr><td>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_admin_status.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_admin_status.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_admin_status.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_admin_status.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
++<HEAD><TITLE>DSPAM v3 - Administration</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_admin_user.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_admin_user.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_admin_user.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_admin_user.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
++<HEAD><TITLE>DSPAM v3 - Administration</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_alerts.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_alerts.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_alerts.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_alerts.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contrôle</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_analysis.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_analysis.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_analysis.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_analysis.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contrôle</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_error.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_error.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_error.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_error.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contrôle</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_fragment.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_fragment.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_fragment.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_fragment.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+
+-<HEAD><TITLE>DSPAM v3 Control Center: $SUBJECT$</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contrôle: $SUBJECT$</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000 MARGINHEIGHT=0 MARGINWIDTH=0 TOPMARGIN=0 LEFTMARGIN=0 RIGHTMARGIN=0>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_history.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_history.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_history.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_history.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contrôle</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ <script type="text/javascript" src="$WEB_ROOT$/dspam.js"></script>
+ </HEAD>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_performance.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_performance.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_performance.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_performance.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contrôle</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_preferences.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_preferences.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_preferences.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_preferences.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contrôle</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+@@ -38,7 +38,7 @@
+ <INPUT TYPE=HIDDEN NAME="user" VALUE="$REMOTE_USER$">
+
+ <div class="content">
+- <h3><strong>Apprentissage</strong> - Configure la façdon dont le filtre apprend lors de l'analyse des messages</h3>
++ <h3><strong>Apprentissage</strong> - Configure la façon dont le filtre apprend lors de l'analyse des messages</h3>
+ <p>
+ <table class="hollow">
+ <tr><td>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_quarantine.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_quarantine.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_quarantine.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_quarantine.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contrôle</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ <script type="text/javascript" src="$WEB_ROOT$/dspam.js"></script>
+ </HEAD>
+diff -urNad dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_viewmessage.html dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_viewmessage.html
+--- dspam-3.9.0~beta1+git20090822~/webui/cgi-bin/templates/fr/nav_viewmessage.html 2009-08-23 09:18:37.000000000 +0200
++++ dspam-3.9.0~beta1+git20090822/webui/cgi-bin/templates/fr/nav_viewmessage.html 2009-08-24 09:15:55.848707319 +0200
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contrôle</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
More information about the Pkg-dspam-commits
mailing list