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

Julien Valroff julien-guest at alioth.debian.org
Fri Nov 6 06:26:25 UTC 2009 

Author: julien-guest
Date: Fri Nov  6 06:26:25 2009
New Revision: 211

Log:
Final fixes for beta4

Added:
   branches/experimental/debian/patches/11_strings.pl-hack.dpatch   (contents, props changed)
Modified:
   branches/experimental/debian/patches/00list
   branches/experimental/debian/rules

Modified: branches/experimental/debian/patches/00list
==============================================================================
--- branches/experimental/debian/patches/00list	Tue Nov  3 17:03:59 2009	(r210)
+++ branches/experimental/debian/patches/00list	Fri Nov  6 06:26:25 2009	(r211)
@@ -8,3 +8,4 @@
 07_path-to-dspam_for-training-script.dpatch
 09_where-to-find-txt-files.dpatch
 10_fix-fr-templates.dpatch
+11_strings.pl-hack.dpatch

Added: branches/experimental/debian/patches/11_strings.pl-hack.dpatch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/11_strings.pl-hack.dpatch	Fri Nov  6 06:26:25 2009	(r211)
@@ -0,0 +1,204 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_strings.pl-hack.dpatch by Julien Valroff <julien at kirya.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Updating make files to include changes mentioned in log entry [20090818:0100]
+
+ at DPATCH@
+diff -urNad dspam-3.9.0-BETA4~/webui/cgi-bin/templates/Makefile.am dspam-3.9.0-BETA4/webui/cgi-bin/templates/Makefile.am
+--- dspam-3.9.0-BETA4~/webui/cgi-bin/templates/Makefile.am	2009-01-22 16:42:36.000000000 +0100
++++ dspam-3.9.0-BETA4/webui/cgi-bin/templates/Makefile.am	2009-11-06 06:47:11.257448884 +0100
+@@ -13,4 +13,5 @@
+         nav_admin_status.html \
+         nav_admin_user.html \
+         nav_admin_preferences.html \
+-	nav_fragment.html
++	nav_fragment.html \
++	strings.pl
+diff -urNad dspam-3.9.0-BETA4~/webui/cgi-bin/templates/fr/Makefile.am dspam-3.9.0-BETA4/webui/cgi-bin/templates/fr/Makefile.am
+--- dspam-3.9.0-BETA4~/webui/cgi-bin/templates/fr/Makefile.am	2009-10-27 12:45:58.000000000 +0100
++++ dspam-3.9.0-BETA4/webui/cgi-bin/templates/fr/Makefile.am	2009-11-06 06:47:11.257448884 +0100
+@@ -13,4 +13,5 @@
+         nav_admin_status.html \
+         nav_admin_user.html \
+         nav_admin_preferences.html \
+-	nav_fragment.html
++	nav_fragment.html \
++	strings.pl
+diff -urNad dspam-3.9.0-BETA4~/webui/cgi-bin/templates/fr/strings.pl dspam-3.9.0-BETA4/webui/cgi-bin/templates/fr/strings.pl
+--- dspam-3.9.0-BETA4~/webui/cgi-bin/templates/fr/strings.pl	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0-BETA4/webui/cgi-bin/templates/fr/strings.pl	2009-11-06 06:47:11.257448884 +0100
+@@ -0,0 +1,85 @@
++#!/usr/bin/perl
++
++# $Id: strings.pl,v 1.00 2009/08/18 01:17:50 sbajic Exp $
++# DSPAM
++# COPYRIGHT (C) DSPAM PROJECT 2002-2009
++#
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License
++# as published by the Free Software Foundation; version 2
++# of the License.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++
++$LANG{'empty'}				= "Vide";
++$LANG{'admin_suite'}			= "Administration";
++$LANG{'alert_name'}			= "Nom de l'alerte";
++$LANG{'remove_alert'}			= "Supprimer";
++$LANG{'user_form'}			= "Centre de contr&ocirc;le DSPAM pour";
++$LANG{'user_form_submit'}		= "Changer";
++
++$LANG{'option_disable_filtering'}       = "D&eacute;sactiver le filtre DSPAM";
++$LANG{'option_enable_filtering'}        = "Activer le filtre DSPAM";
++
++$LANG{'quarantine_rating'}		= "Score";
++$LANG{'quarantine_date'}		= "Date";
++$LANG{'quarantine_from'}		= "Exp&eacute;diteur";
++$LANG{'quarantine_subject'}		= "Objet";
++
++$LANG{'history_show'}			= "Afficher&nbsp;";
++$LANG{'history_show_all'}		= "tous";
++$LANG{'history_show_spam'}		= "pourriels";
++$LANG{'history_show_innocent'}		= "l&eacute;gitimes";
++$LANG{'history_show_virus'}		= "virus";
++$LANG{'history_show_whitelisted'}	= "mis en liste blanche";
++$LANG{'history_retrain_as_spam'}	= "pourriel";
++$LANG{'history_retrain_as_innocent'}	= "l&eacute;gitime";
++$LANG{'history_retrain_as'}		= "comme";
++$LANG{'history_retrained'}		= "R&eacute;-analys&eacute;";
++$LANG{'history_retrain_undo'}		= "d&eacute;faire";
++$LANG{'history_label_resend'}		= "Renvoi";
++$LANG{'history_label_whitelist'}	= "Liste blanche";
++$LANG{'history_label_spam'}		= "Pourriel";
++$LANG{'history_label_innocent'}		= "L&eacute;gitime";
++$LANG{'history_label_miss'}		= "Manqu&eacute;";
++$LANG{'history_label_virus'}		= "Virus";
++$LANG{'history_label_RBL'}		= "RBL";
++$LANG{'history_label_block'}		= "Bloqu&eacute;";
++$LANG{'history_label_corpus'}		= "Corpus";
++$LANG{'history_label_unknown'}		= "Inconnu";
++$LANG{'history_label_error'}		= "Erreur";
++
++$LANG{'error_no_historic'}		= "Aucune donn&eacute;e d'historique n'est disponible.";
++$LANG{'error_cannot_open_log'}		= "Impossible d'ouvrir le journal";
++$LANG{'error_no_identity'}		= "Erreur syst&egrave;me. Impossible de d&eacute;terminer votre identit&eacute;.";
++$LANG{'error_invalid_command'}		= "Commande invalide";
++$LANG{'error_cannot_write_prefs'}	= "Impossible d'enregistrer les pr&eacute;f&eacute;rences";
++$LANG{'error_no_sigid'}			= "Aucun identifiant de message n'a &eacute;t&eacute; sp&eacute;cifi&eacute;";
++$LANG{'error_no_alert_specified'}	= "Aucune alerte sp&eacute;cifi&eacute;e.";
++$LANG{'error_message_part1'}		= "L'erreur suivante s'est produite pendant le traitement de votre requ&ecirc;te&nbsp;:";
++$LANG{'error_message_part2'}		= "Si le probl&egrave;me persiste, contactez votre administrateur.";
++$LANG{'error_filesystem_scale'}		= "Impossible de d&eacute;terminer l'organisation du syst&egrave;me de fichiers";
++$LANG{'error_load_default_prefs'}	= "Impossible de charger les pr&eacute;f&eacute;rences par d&eacute;faut.";
++$LANG{'error_access_denied'}		= "Acc&egrave;s interdit";
++
++$LANG{'graph_legend_nb_messages'}	= "Nombre de messages";
++$LANG{'graph_legend_spam'}		= "Pourriels";
++$LANG{'graph_legend_good'}		= "Messages legitimes";
++$LANG{'graph_legend_inoculations'}	= "Inoculations";
++$LANG{'graph_legend_corpusfeds'}	= "Depuis le corpus";
++$LANG{'graph_legend_virus'}		= "Virus";
++$LANG{'graph_legend_RBL'}		= "RBL";
++$LANG{'graph_legend_blocklisted'}	= "Mis en liste noire";
++$LANG{'graph_legend_whitelisted'}	= "Mis en liste blanche";
++$LANG{'graph_legend_nonspam'}		= "Messages legitimes";
++$LANG{'graph_legend_spam_misses'}	= "Pourriels manques";
++$LANG{'graph_legend_falsepositives'}	= "Faux positifs";
++
++1;
+diff -urNad dspam-3.9.0-BETA4~/webui/cgi-bin/templates/strings.pl dspam-3.9.0-BETA4/webui/cgi-bin/templates/strings.pl
+--- dspam-3.9.0-BETA4~/webui/cgi-bin/templates/strings.pl	1970-01-01 01:00:00.000000000 +0100
++++ dspam-3.9.0-BETA4/webui/cgi-bin/templates/strings.pl	2009-11-06 06:47:11.257448884 +0100
+@@ -0,0 +1,84 @@
++#!/usr/bin/perl
++
++# $Id: strings.pl,v 1.00 2009/08/18 00:41:12 sbajic Exp $
++# DSPAM
++# COPYRIGHT (C) DSPAM PROJECT 2002-2009
++#
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License
++# as published by the Free Software Foundation; version 2
++# of the License.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++
++$LANG{'empty'}				= "Empty";
++$LANG{'admin_suite'}			= "Administrative Suite";
++$LANG{'alert_name'}			= "Alert Name";
++$LANG{'remove_alert'}			= "Remove";
++$LANG{'user_form'}			= "Statistical SPAM Protection for";
++$LANG{'user_form_submit'}		= "Change";
++
++$LANG{'option_disable_filtering'}	= "Disable DSPAM filtering";
++$LANG{'option_enable_filtering'}	= "Enable DSPAM filtering";
++
++$LANG{'quarantine_rating'}		= "Rating";
++$LANG{'quarantine_date'}		= "Date";
++$LANG{'quarantine_from'}		= "From";
++$LANG{'quarantine_subject'}		= "Subject";
++
++$LANG{'history_show'}			= "Show";
++$LANG{'history_show_all'}		= "all";
++$LANG{'history_show_spam'}		= "spam";
++$LANG{'history_show_innocent'}		= "innocent";
++$LANG{'history_show_whitelisted'}	= "whitelisted";
++$LANG{'history_retrain_as_spam'}	= "spam";
++$LANG{'history_retrain_as_innocent'}	= "innocent";
++$LANG{'history_retrain_as'}		= "As";
++$LANG{'history_retrain_undo'}		= "Undo";
++$LANG{'history_retrained'}		= "Retrained";
++$LANG{'history_label_resend'}		= "Resend";
++$LANG{'history_label_whitelist'}	= "Whitelist";
++$LANG{'history_label_spam'}		= "SPAM";
++$LANG{'history_label_innocent'}		= "Good";
++$LANG{'history_label_miss'}		= "Miss";
++$LANG{'history_label_virus'}		= "Virus";
++$LANG{'history_label_RBL'}		= "RBL";
++$LANG{'history_label_block'}		= "BLOCK";
++$LANG{'history_label_corpus'}		= "Corpus";
++$LANG{'history_label_unknown'}		= "UNKN";
++$LANG{'history_label_error'}		= "Error";
++
++$LANG{'error_no_historic'}		= "No historical data is available.";
++$LANG{'error_cannot_open_log'}		= "Unable to open logfile";
++$LANG{'error_no_identity'}		= "System Error. I was unable to determine your identity.";
++$LANG{'error_invalid_command'}		= "Invalid Command";
++$LANG{'error_cannot_write_prefs'}	= "Unable to write preferences";
++$LANG{'error_no_sigid'}			= "No Message ID Specified";
++$LANG{'error_no_alert_specified'}	= "No Alert Specified.";
++$LANG{'error_message_part1'}		= "The following error occured while trying to process your request:";
++$LANG{'error_message_part2'}		= "If this problem persists, please contact your administrator.";
++$LANG{'error_filesystem_scale'}		= "Unable to determine filesystem scale";
++$LANG{'error_load_default_prefs'}	= "Unable to load default preferences";
++$LANG{'error_access_denied'}		= "Access Denied";
++
++$LANG{'graph_legend_nb_messages'}	= "Number of Messages";
++$LANG{'graph_legend_spam'}		= "SPAM";
++$LANG{'graph_legend_good'}		= "Good";
++$LANG{'graph_legend_inoculations'}	= "Inoculations";
++$LANG{'graph_legend_corpusfeds'}	= "Corpusfeds";
++$LANG{'graph_legend_virus'}		= "Virus";
++$LANG{'graph_legend_RBL'}		= "Blacklisted (RBL)";
++$LANG{'graph_legend_blocklisted'}	= "Blocklisted";
++$LANG{'graph_legend_whitelisted'}	= "Auto-Whitelisted";
++$LANG{'graph_legend_nonspam'}		= "Nonspam";
++$LANG{'graph_legend_spam_misses'}	= "Spam Misses";
++$LANG{'graph_legend_falsepositives'}	= "False Positives";
++
++1;

Modified: branches/experimental/debian/rules
==============================================================================
--- branches/experimental/debian/rules	Tue Nov  3 17:03:59 2009	(r210)
+++ branches/experimental/debian/rules	Fri Nov  6 06:26:25 2009	(r211)
@@ -95,8 +95,8 @@
 	rm -f build-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) maintainer-clean
 	# maintainer-clean doesn't catch all the Makefile.in:
-	find -type f \( -name Makefile.in \) -print0 | xargs -0 rm -f
-	rm -f config.guess config.sub
+	#find -type f \( -name Makefile.in \) -print0 | xargs -0 rm -f
+	#rm -f config.guess config.sub
 
 	# Remove DB schemas
 	rm -f debian/sqlfiles/pgsql debian/sqlfiles/mysql

More information about the Pkg-dspam-commits mailing list