[Pkg-dspam-commits] [pkg-dspam-commits] r201 - in branches/experimental/debian: . patches

Julien Valroff julien-guest at alioth.debian.org
Mon Aug 17 08:48:10 UTC 2009 

Author: julien-guest
Date: Mon Aug 17 08:48:09 2009
New Revision: 201

Log:
Sync with local repo

Added:
   branches/experimental/debian/README.source
Deleted:
   branches/experimental/debian/dspam_notify.conf
Modified:
   branches/experimental/debian/README.Debian
   branches/experimental/debian/TODO.Debian
   branches/experimental/debian/changelog
   branches/experimental/debian/control
   branches/experimental/debian/dspam-webfrontend.dirs
   branches/experimental/debian/dspam.init
   branches/experimental/debian/dspam.install
   branches/experimental/debian/patches/complete_l10n.dpatch
   branches/experimental/debian/patches/templates_fr.dpatch
   branches/experimental/debian/rules

Modified: branches/experimental/debian/README.Debian
==============================================================================
--- branches/experimental/debian/README.Debian	Wed Aug 12 10:56:29 2009	(r200)
+++ branches/experimental/debian/README.Debian	Mon Aug 17 08:48:09 2009	(r201)
@@ -16,11 +16,10 @@
 Customising the dspam-webfrontend cgi interface 
 -----------------------------------------------
 
-Initially, the cgi interface uses the upstream html templates located in
-/usr/share/dspam/templates.  These are installed in /etc/dspam/templates/ as
-conffiles controlled by ucf(1).
+The cgi interface uses the upstream html templates located in
+/etc/dspam/templates/.
 
-In addition, the following files are handled in the same way:
+In addition, the following files are also installed in /etc/dspam:
 
    admins
    base.css

Added: branches/experimental/debian/README.source
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/README.source	Mon Aug 17 08:48:09 2009	(r201)
@@ -0,0 +1,23 @@
+To get the fully patched source after unpacking the source package, cd
+to the root level of the source package and run:
+
+    debian/rules patch
+
+Removing a patch is as simple as removing its entry from the
+debian/patches/00list file, and please also remove the patch file
+itself.
+
+Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
+where you should replace XX with a new number and patchname with a
+descriptive shortname of the patch. You can then simply edit all the
+files your patch wants to edit, and then simply "exit 0" from the shell
+to actually create the patch file.
+
+To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
+and replace XX_patchname with the actual filename from debian/patches
+you want to use.
+
+To clean up afterwards again, "debian/rules unpatch" will do the
+work for you - or you can of course choose to call
+"fakeroot debian/rules clean" all together.
+

Modified: branches/experimental/debian/TODO.Debian
==============================================================================
--- branches/experimental/debian/TODO.Debian	Wed Aug 12 10:56:29 2009	(r200)
+++ branches/experimental/debian/TODO.Debian	Mon Aug 17 08:48:09 2009	(r201)
@@ -1,4 +1,5 @@
 TODO list for DSPAM debian packages
+====================================
 
 * Move the .cgi files out of /var/www/dspam/
   See discussion at:

Modified: branches/experimental/debian/changelog
==============================================================================
--- branches/experimental/debian/changelog	Wed Aug 12 10:56:29 2009	(r200)
+++ branches/experimental/debian/changelog	Mon Aug 17 08:48:09 2009	(r201)
@@ -1,11 +1,11 @@
-dspam (3.9.0~beta2-1) experimental; urgency=low
+dspam (3.9.0~beta1+git20090815-1) experimental; urgency=low
 
   [ Kurt B. Kaiser ]
   * debian/rules: don't use --build config option if host equals target.
   * debian/rules: dpkg-dev now handles CFLAGS.
   * Use maintainer-clean in clean target and remove any Makefile.in left over.
   * Break a long line in debian/copyright to quiet lintian.
-  * Removed libapache2-mod-auth-shadow - no longer available in unstable
+  * Remove libapache2-mod-auth-shadow - no longer available in unstable
   * Suggest clamav-daemon instead of recommending it.
   * Suggest dspam-webfrontend.
   * Add amavis to trusted users (Closes: #477508)
@@ -25,7 +25,8 @@
   [ Julien Valroff ]
   * New upstream beta
     (Closes: #418736, #491387, #505010, #514498, #522645)
-  * Bump Standards to 3.8.2
+  * Bump Standards to 3.8.3:
+    + Add README.source, as per Debian Policy Manual 4.14
   * Bump debhelper compatibility to 7
   * Update/remove patches for new release
   * Add misc depends to all binary packages
@@ -60,8 +61,10 @@
   * Remove unused lintian overrides
   * Add patch to allow complete translation of the WebUI
   * Add description to all patches
+  * Fix provides and dependencies in init script - thanks to Petter
+    Reinholdtsen <pere at hungry.com> (Closes: #541982)
 
- -- Julien Valroff <julien at kirya.net>  Wed, 12 Aug 2009 10:05:46 +0200
+ -- Julien Valroff <julien at kirya.net>  Mon, 17 Aug 2009 10:45:21 +0200
 
 dspam (3.6.8-9) unstable; urgency=low
 

Modified: branches/experimental/debian/control
==============================================================================
--- branches/experimental/debian/control	Wed Aug 12 10:56:29 2009	(r200)
+++ branches/experimental/debian/control	Mon Aug 17 08:48:09 2009	(r201)
@@ -19,7 +19,7 @@
                libmysqlclient-dev,
                libsqlite3-dev,
                libldap2-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://dspam.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/pkg-dspam/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-dspam/

Modified: branches/experimental/debian/dspam-webfrontend.dirs
==============================================================================
--- branches/experimental/debian/dspam-webfrontend.dirs	Wed Aug 12 10:56:29 2009	(r200)
+++ branches/experimental/debian/dspam-webfrontend.dirs	Mon Aug 17 08:48:09 2009	(r201)
@@ -0,0 +1,6 @@
+etc/dspam/templates/
+etc/dspam/templates/fr/
+etc/dspam/templates/he/
+etc/dspam/templates/ro/
+usr/share/dspam/
+var/www/dspam/

Modified: branches/experimental/debian/dspam.init
==============================================================================
--- branches/experimental/debian/dspam.init	Wed Aug 12 10:56:29 2009	(r200)
+++ branches/experimental/debian/dspam.init	Mon Aug 17 08:48:09 2009	(r201)
@@ -1,8 +1,10 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:          skeleton
+# Provides:          dspam
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
+# Should-Start:      mysql postgresql-8.3 postgresql-8.4
+# Should-Stop:       mysql postgresql-8.3 postgresql-8.4
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: initscript for dspam

Modified: branches/experimental/debian/dspam.install
==============================================================================
--- branches/experimental/debian/dspam.install	Wed Aug 12 10:56:29 2009	(r200)
+++ branches/experimental/debian/dspam.install	Mon Aug 17 08:48:09 2009	(r201)
@@ -16,4 +16,3 @@
 debian/tmp/usr/bin/cssstat          usr/bin/
 debian/tmp/usr/bin/cssconvert       usr/bin/
 debian/tmp/usr/bin/csscompress      usr/bin/
-debian/dspam_notify.conf	    etc/dspam/

Modified: branches/experimental/debian/patches/complete_l10n.dpatch
==============================================================================
--- branches/experimental/debian/patches/complete_l10n.dpatch	Wed Aug 12 10:56:29 2009	(r200)
+++ branches/experimental/debian/patches/complete_l10n.dpatch	Mon Aug 17 08:48:09 2009	(r201)
@@ -5,9 +5,9 @@
 ## DP: Allows the webui to be completely translated
 
 @DPATCH@
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/admin.cgi dspam-3.9.0~beta2/webui/cgi-bin/admin.cgi
---- dspam-3.9.0~beta2~/webui/cgi-bin/admin.cgi	2009-08-12 10:08:27.308734348 +0200
-+++ dspam-3.9.0~beta2/webui/cgi-bin/admin.cgi	2009-08-12 10:08:27.492734815 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/admin.cgi dspam-3.9.0~beta1+git20090815/webui/cgi-bin/admin.cgi
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/admin.cgi	2009-08-15 22:14:56.450170222 +0200
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/admin.cgi	2009-08-15 22:14:56.578172571 +0200
 @@ -20,11 +20,16 @@
  
  use strict;
@@ -103,9 +103,9 @@
      }
                                                                                  
      open(FILE, "<$FILE");
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/admin.cgi.orig dspam-3.9.0~beta2/webui/cgi-bin/admin.cgi.orig
---- dspam-3.9.0~beta2~/webui/cgi-bin/admin.cgi.orig	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/admin.cgi.orig	2009-08-12 10:08:27.496733524 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/admin.cgi.orig dspam-3.9.0~beta1+git20090815/webui/cgi-bin/admin.cgi.orig
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/admin.cgi.orig	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/admin.cgi.orig	2009-08-15 22:14:56.582171312 +0200
 @@ -0,0 +1,821 @@
 +#!/usr/bin/perl
 +
@@ -928,9 +928,9 @@
 +
 +  return %PREFS;
 +}
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/admingraph.cgi dspam-3.9.0~beta2/webui/cgi-bin/admingraph.cgi
---- dspam-3.9.0~beta2~/webui/cgi-bin/admingraph.cgi	2009-08-12 10:08:27.248734587 +0200
-+++ dspam-3.9.0~beta2/webui/cgi-bin/admingraph.cgi	2009-08-12 10:08:27.496733524 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/admingraph.cgi dspam-3.9.0~beta1+git20090815/webui/cgi-bin/admingraph.cgi
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/admingraph.cgi	2009-08-15 22:14:56.390171719 +0200
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/admingraph.cgi	2009-08-15 22:14:56.582171312 +0200
 @@ -21,10 +21,15 @@
  use CGI ':standard';
  use GD::Graph::bars;
@@ -969,9 +969,9 @@
  my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
                                                                                  
  print "Content-type: image/png\n\n";
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/dspam.cgi dspam-3.9.0~beta2/webui/cgi-bin/dspam.cgi
---- dspam-3.9.0~beta2~/webui/cgi-bin/dspam.cgi	2009-08-12 10:08:27.308734348 +0200
-+++ dspam-3.9.0~beta2/webui/cgi-bin/dspam.cgi	2009-08-12 10:08:27.496733524 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/dspam.cgi dspam-3.9.0~beta1+git20090815/webui/cgi-bin/dspam.cgi
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/dspam.cgi	2009-08-15 22:14:56.450170222 +0200
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/dspam.cgi	2009-08-15 22:15:15.190180160 +0200
 @@ -20,12 +20,17 @@
  
  use strict;
@@ -1068,14 +1068,7 @@
        }
        $rec{$messageid}->{'resend'} = $signature;
      }
-@@ -406,18 +411,18 @@
-     $subject = substr($subject, 0, $CONFIG{'MAX_COL_LEN'}) . "..." if (length($subject)>$CONFIG{'MAX_COL_LEN'});
- 
-     my($rclass);
--    $rclass = "spam" if ($class eq "I" || $class eq "W" || $class eq "F");
--    $rclass = "innocent" if ($class eq "S" || $class eq "M" || $class eq "V" || $class eq "A" || $class eq "O");
-+    $rclass = $LANG{'history_retrain_as_spam'} if ($class eq "I" || $class eq "W" || $class eq "F");
-+    $rclass = $LANG{'history_retrain_as_innocent'} if ($class eq "S" || $class eq "M" || $class eq "V" || $class eq "A" || $class eq "O");
+@@ -411,13 +416,13 @@
  
      my($retrain);
      if ($rec{$signature}->{'class'} =~ /^(M|F)$/ && $rec{$signature}->{'count'} % 2 != 0) {
@@ -1085,7 +1078,7 @@
  
      if ($retrain eq "") {
 -      $retrain = qq!<A HREF="$MYURL&show=$show&history_page=$history_page&retrain=$rclass&signatureID=$signature">As ! . ucfirst($rclass) . "</A>";
-+      $retrain = qq!<A HREF="$MYURL&show=$show&history_page=$history_page&retrain=$rclass&signatureID=$signature">$LANG{'history_retrain_as'} ! . ucfirst($rclass) . "</A>";
++      $retrain = qq!<A HREF="$MYURL&show=$show&history_page=$history_page&retrain=$rclass&signatureID=$signature">$LANG{'history_retrain_as'} ! . ucfirst($LANG{"history_retrain_as_" . $rclass}) . "</A>";
      } else {
 -      $retrain .= qq! (<A HREF="$MYURL&show=$show&history_page=$history_page&retrain=$rclass&signatureID=$signature">Undo</A>)!;
 +      $retrain .= qq! (<A HREF="$MYURL&show=$show&history_page=$history_page&retrain=$rclass&signatureID=$signature">$LANG{'history_retrain_undo'}</A>)!;
@@ -1122,7 +1115,7 @@
 +    $DATA{'SHOW_SELECTOR'} .= "$LANG{'history_show_innocent'}";
 +  }
 +  $DATA{'SHOW_SELECTOR'} .=  "</a> | <a href=\"$MYURL&show=virus\">";
-+  if ($show eq "innocent") {
++  if ($show eq "virus") {
 +    $DATA{'SHOW_SELECTOR'} .= "<strong>$LANG{'history_show_virus'}</strong>";
 +  } else {
 +    $DATA{'SHOW_SELECTOR'} .= "$LANG{'history_show_virus'}";
@@ -1318,9 +1311,9 @@
      }
      open(FILE, "<$DEFAULT_PREFS");
      while(<FILE>) {
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/dspam.cgi.orig dspam-3.9.0~beta2/webui/cgi-bin/dspam.cgi.orig
---- dspam-3.9.0~beta2~/webui/cgi-bin/dspam.cgi.orig	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/dspam.cgi.orig	2009-08-12 10:08:27.496733524 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/dspam.cgi.orig dspam-3.9.0~beta1+git20090815/webui/cgi-bin/dspam.cgi.orig
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/dspam.cgi.orig	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/dspam.cgi.orig	2009-08-15 22:14:56.582171312 +0200
 @@ -0,0 +1,1671 @@
 +#!/usr/bin/perl
 +
@@ -2993,9 +2986,9 @@
 +  }
 +  return %PREFS
 +}
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/graph.cgi dspam-3.9.0~beta2/webui/cgi-bin/graph.cgi
---- dspam-3.9.0~beta2~/webui/cgi-bin/graph.cgi	2009-08-12 10:08:27.252734844 +0200
-+++ dspam-3.9.0~beta2/webui/cgi-bin/graph.cgi	2009-08-12 10:08:27.496733524 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/graph.cgi dspam-3.9.0~beta1+git20090815/webui/cgi-bin/graph.cgi
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/graph.cgi	2009-08-15 22:14:56.394171432 +0200
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/graph.cgi	2009-08-15 22:14:56.582171312 +0200
 @@ -22,10 +22,15 @@
  use GD::Graph::lines3d;
  use GD::Graph::lines;
@@ -3031,9 +3024,9 @@
  my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
                                                                                  
  print "Content-type: image/png\n\n";
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/strings.txt dspam-3.9.0~beta2/webui/cgi-bin/templates/strings.txt
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/strings.txt	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/strings.txt	2009-08-12 10:08:21.284764058 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/strings.txt dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/strings.txt
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/strings.txt	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/strings.txt	2009-08-15 22:14:56.582171312 +0200
 @@ -0,0 +1,67 @@
 +#!/usr/bin/perl
 +

Modified: branches/experimental/debian/patches/templates_fr.dpatch
==============================================================================
--- branches/experimental/debian/patches/templates_fr.dpatch	Wed Aug 12 10:56:29 2009	(r200)
+++ branches/experimental/debian/patches/templates_fr.dpatch	Mon Aug 17 08:48:09 2009	(r201)
@@ -5,9 +5,9 @@
 ## DP: French translation for WebUI
 
 @DPATCH@
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_admin_error.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_admin_error.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_admin_error.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_admin_error.html	2009-08-06 14:20:39.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_admin_error.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_admin_error.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_admin_error.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_admin_error.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,37 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
@@ -46,9 +46,9 @@
 +
 +</body>
 +</html>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_admin_preferences.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_admin_preferences.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_admin_preferences.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_admin_preferences.html	2009-08-06 14:20:39.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_admin_preferences.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_admin_preferences.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_admin_preferences.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_admin_preferences.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,129 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
@@ -113,7 +113,7 @@
 + &nbsp;</td><td>
 +Lorsque j'entraine DSPAM, je pr&eacute;f&egrave;re&nbsp;:<br><br>
 +<INPUT TYPE=RADIO NAME=signatureLocation VALUE="message" $S_LOC_MESSAGE$>
-+<u>transf&eacute;rer</u> les pourriels re&ccedil;us (la signature appera&icirc;t dans le corps du message)<BR>
++<u>transf&eacute;rer</u> les pourriels re&ccedil;us (la signature appara&icirc;t dans le corps du message)<BR>
 +<INPUT TYPE=RADIO NAME=signatureLocation VALUE="headers" $S_LOC_HEADERS$>
 +transf&eacute;rer les pourriels re&ccedil;us en tant que <u>pi&egrave;ce jointe</u> (la signature appara&icirc;t dans les en-t&ecirc;tes du messages)<BR>
 +<INPUT TYPE=RADIO NAME=signatureLocation VALUE="attachment" $S_LOC_ATTACHMENT$>
@@ -179,9 +179,9 @@
 +
 +</BODY>
 +</HTML>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_admin_status.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_admin_status.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_admin_status.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_admin_status.html	2009-08-06 15:05:41.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_admin_status.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_admin_status.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_admin_status.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_admin_status.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,140 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
@@ -323,9 +323,9 @@
 +
 +</body>
 +</html>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_admin_user.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_admin_user.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_admin_user.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_admin_user.html	2009-08-06 14:20:39.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_admin_user.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_admin_user.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_admin_user.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_admin_user.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,58 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
@@ -385,9 +385,9 @@
 +
 +</body>
 +</html>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_alerts.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_alerts.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_alerts.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_alerts.html	2009-08-06 14:20:39.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_alerts.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_alerts.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_alerts.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_alerts.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,52 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
@@ -441,9 +441,9 @@
 +
 +</BODY>
 +</HTML>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_analysis.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_analysis.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_analysis.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_analysis.html	2009-08-06 14:20:39.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_analysis.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_analysis.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_analysis.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_analysis.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,52 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
@@ -497,9 +497,9 @@
 +
 +</BODY>
 +</HTML>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_error.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_error.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_error.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_error.html	2009-08-06 14:20:39.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_error.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_error.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_error.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_error.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,40 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
@@ -541,9 +541,9 @@
 +
 +</BODY>
 +</HTML>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_fragment.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_fragment.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_fragment.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_fragment.html	2009-08-06 14:20:39.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_fragment.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_fragment.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_fragment.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_fragment.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,26 @@
 +
 +<HEAD><TITLE>DSPAM v3 Control Center: $SUBJECT$</TITLE>
@@ -571,9 +571,9 @@
 +</html>
 +
 +
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_history.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_history.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_history.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_history.html	2009-08-06 14:20:39.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_history.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_history.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_history.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_history.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,85 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
@@ -660,9 +660,9 @@
 +
 +</BODY>
 +</HTML>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_performance.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_performance.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_performance.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_performance.html	2009-08-06 14:20:39.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_performance.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_performance.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_performance.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_performance.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,108 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
@@ -762,7 +762,7 @@
 +	</table>
 +
 +	<p>
-+		<a href="$CGI$?$USER$command=resetStats" title="Remettre les statistiques &agrave; z&eacute;ro">R&eacute;initalisation</a> | <a href="$CGI$?$USER$command=tweak" title="Ajustement des messages transf&aecute;r&eacute;s au filtre">Ajustement -1</a>
++		<a href="$CGI$?$USER$command=resetStats" title="Remettre les statistiques &agrave; z&eacute;ro">R&eacute;initalisation</a> | <a href="$CGI$?$USER$command=tweak" title="Ajustement des messages transf&eacute;r&eacute;s au filtre">Ajustement -1</a>
 +	</p>
 +</div>
 +
@@ -772,9 +772,9 @@
 +
 +</body>
 +</html>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_preferences.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_preferences.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_preferences.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_preferences.html	2009-08-06 15:09:40.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_preferences.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_preferences.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_preferences.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_preferences.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,120 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
@@ -896,9 +896,9 @@
 +
 +</BODY>
 +</HTML>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_quarantine.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_quarantine.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_quarantine.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_quarantine.html	2009-08-06 14:58:33.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_quarantine.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_quarantine.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_quarantine.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_quarantine.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,85 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
@@ -934,7 +934,7 @@
 +
 +<p>
 +Les messages ci-dessous n'ont pas &eacute;t&eacute; distribu&eacute;s version votre application de messagerie car ils ont
-+&eacute;t&eacutes; consid&eacute;r&eacute;s comme pourriels probables.
++&eacute;t&eacute;s consid&eacute;r&eacute;s comme pourriels probables.
 +Cliquez sur l'object pour voir un message, ou choisissez une option de tri pour modifier la fa&ccedil;on sont sont tri&eacute;s les messages.
 +Utilisez les case &agrave; cocher <strong>Distribuer les messages s&eacute;lectionn&eacute;s</strong> pour distribuer les messages que vous souhaitez lire,
 +ou utilisez <strong>Supprimer tous les messages</strong> pour vider la zone de quarantaine.
@@ -985,9 +985,9 @@
 +
 +</BODY>
 +</HTML>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_viewmessage.html dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_viewmessage.html
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/nav_viewmessage.html	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/nav_viewmessage.html	2009-08-06 14:20:39.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_viewmessage.html dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_viewmessage.html
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/nav_viewmessage.html	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/nav_viewmessage.html	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,54 @@
 +<HTML>
 +<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
@@ -1043,9 +1043,9 @@
 +
 +</BODY>
 +</HTML>
-diff -urNad dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/strings.txt dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/strings.txt
---- dspam-3.9.0~beta2~/webui/cgi-bin/templates/fr/strings.txt	1970-01-01 01:00:00.000000000 +0100
-+++ dspam-3.9.0~beta2/webui/cgi-bin/templates/fr/strings.txt	2009-08-06 15:14:59.000000000 +0200
+diff -urNad dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/strings.txt dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/strings.txt
+--- dspam-3.9.0~beta1+git20090815~/webui/cgi-bin/templates/fr/strings.txt	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0~beta1+git20090815/webui/cgi-bin/templates/fr/strings.txt	2009-08-15 22:14:35.210670664 +0200
 @@ -0,0 +1,67 @@
 +#!/usr/bin/perl
 +

Modified: branches/experimental/debian/rules
==============================================================================
--- branches/experimental/debian/rules	Wed Aug 12 10:56:29 2009	(r200)
+++ branches/experimental/debian/rules	Mon Aug 17 08:48:09 2009	(r201)
@@ -110,7 +110,7 @@
 	dh_prep
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --list-missing
+	dh_install
 
 	# Install PostgreSQL data file
 	cp debian/sqlfiles/pgsql-dbadmin $(CURDIR)/debian/libdspam7-drv-pgsql/usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install-dbadmin/pgsql

More information about the Pkg-dspam-commits mailing list