OK, I managed to obtain a dpatch similar to those which were present.

See attachment's patch to the debian/ sources for the results on my
local generation of a package which hopefully fixes it...

Le mercredi 25 avril 2007 à 16:03 +0200, Olivier Berger a écrit :

> In the meantime, I tried and regenerate a local package adding a .dpatch
> file on the model of those supplied in the package source... but it
> doesn't seem to work with a .
> 
> Are these .dpatch patches still used ?
> 
> I tend to believe not... it may be wise to remove them from package's
> sources, then...
> 

-- 
Olivier BERGER <[EMAIL PROTECTED]> (ATTENTION : new address)
Ingénieur Recherche - Dept INF
GET/INT at Evry (http://www.int-edu.eu/)
OpenPGP-Id: 1024D/6B829EEC

diff -Naur sympa-5.2.3.orig/debian/changelog sympa-5.2.3/debian/changelog
--- sympa-5.2.3.orig/debian/changelog	2007-04-25 16:36:18.000000000 +0200
+++ sympa-5.2.3/debian/changelog	2007-04-25 16:37:17.000000000 +0200
@@ -1,3 +1,9 @@
+sympa (5.2.3-2.1) unstable; urgency=low
+
+  * my NMU : fix #418836
+
+ -- Olivier Berger <[EMAIL PROTECTED]>  Wed, 25 Apr 2007 15:51:27 +0200
+
 sympa (5.2.3-2) unstable; urgency=medium
 
   * fixed incorrect typography in debconf templates (Closes: #413623,
diff -Naur sympa-5.2.3.orig/debian/patches/fix-bug_418836.dpatch sympa-5.2.3/debian/patches/fix-bug_418836.dpatch
--- sympa-5.2.3.orig/debian/patches/fix-bug_418836.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ sympa-5.2.3/debian/patches/fix-bug_418836.dpatch	2007-04-25 16:36:55.000000000 +0200
@@ -0,0 +1,28 @@
+#! /bin/sh -e
+
+# DP: proposed fix for bug #418836
+#     
+
+if [ $# -ne 1 ]; then
+    echo >&2 "$0: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f -p0 < $0;;
+    -unpatch) patch -f -R -p0 < $0;;
+    *)
+        echo >&2 "$0: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- src/List.pm.orig	2007-04-25 15:37:25.000000000 +0200
++++ src/List.pm	2007-04-25 15:33:44.000000000 +0200
+@@ -10748,6 +10748,7 @@
+ 	
+ 	## Clean table names that could be surrounded by `` (recent DBD::mysql release)
+ 	foreach my $t (@tables) {
++	    $t =~ s/^([^.]+\.)?(.+)$/\2/;
+ 	    $t =~ s/^\`(.+)\`$/\1/;
+ 	}
+ 	
diff -Naur sympa-5.2.3.orig/debian/patches/list_aliases_tpl.dpatch sympa-5.2.3/debian/patches/list_aliases_tpl.dpatch
--- sympa-5.2.3.orig/debian/patches/list_aliases_tpl.dpatch	2007-04-25 16:36:18.000000000 +0200
+++ sympa-5.2.3/debian/patches/list_aliases_tpl.dpatch	1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-#! /bin/sh -e
-#
-# DP: enable subscribe alias
-
-if [ $# -ne 1 ]; then
-    echo >&2 "$0: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f -p0 < $0;;
-    -unpatch) patch -f -R -p0 < $0;;
-    *)
-        echo >&2 "$0: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- src/etc/list_aliases.tpl	Wed Feb  5 08:49:44 2003
-+++ src/etc/list_aliases.tpl	Wed Apr 30 13:27:46 2003
-@@ -3,14 +3,14 @@
- [list->name]: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
- [list->name]-request: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
- [list->name]-editor: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
--#[list->name]-subscribe: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
-+[list->name]-subscribe: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
- [list->name]-unsubscribe: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
- [list->name]-owner: "| --MAILERPROGDIR--/bouncequeue [list->[EMAIL PROTECTED]>domain]"
- [ELSE]
- [list->domain]-[list->name]: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
- [list->domain]-[list->name]-request: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
- [list->domain]-[list->name]-editor: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
--#[list->domain]-[list->name]-subscribe: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
-+[list->domain]-[list->name]-subscribe: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
- [list->domain]-[list->name]-unsubscribe: "| --MAILERPROGDIR--/queue [list->[EMAIL PROTECTED]>domain]"
- [list->domain]-[list->name]-owner: "| --MAILERPROGDIR--/bouncequeue [list->[EMAIL PROTECTED]>domain]"
- [ENDIF]
diff -Naur sympa-5.2.3.orig/debian/patches/PATCHES sympa-5.2.3/debian/patches/PATCHES
--- sympa-5.2.3.orig/debian/patches/PATCHES	1970-01-01 01:00:00.000000000 +0100
+++ sympa-5.2.3/debian/patches/PATCHES	2007-04-25 16:36:55.000000000 +0200
@@ -0,0 +1 @@
+fix-bug_418836
diff -Naur sympa-5.2.3.orig/debian/patches/tools_fix.dpatch sympa-5.2.3/debian/patches/tools_fix.dpatch
--- sympa-5.2.3.orig/debian/patches/tools_fix.dpatch	2007-04-25 16:36:18.000000000 +0200
+++ sympa-5.2.3/debian/patches/tools_fix.dpatch	1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-
-# DP: Modification of the regexp in tools.pl for the checkcommand
-#     routine
-#     
-
-if [ $# -ne 1 ]; then
-    echo >&2 "$0: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f -p0 < $0;;
-    -unpatch) patch -f -R -p0 < $0;;
-    *)
-        echo >&2 "$0: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- src/tools.pl.orig	Fri Jan 25 21:34:09 2002
-+++ src/tools.pl	Fri Jan 25 21:36:28 2002
-@@ -101,7 +101,7 @@
-    my $subject = $msg->head->get('Subject');
-    if ($subject) {
-       foreach $avoid (@avoid_hdr) {
--         if ($subject =~ /^\s*(quiet)?($avoid)(\s+|$)/im) {
-+         if ($subject =~ /^\s*(quiet)?($avoid)(\s+)?$/im) {
-             &rejectMessage($msg, $sender,$robot);
-             return 1;
-          }
-@@ -112,7 +112,7 @@
- 
-    foreach $i (@{$msg->body}) {
-       foreach $avoid (@avoid_hdr) {
--         if ($i =~ /^\s*(quiet)?($avoid)(\s+|$)/im) {  ## Suspicious line
-+         if ($i =~ /^\s*(quiet)?($avoid)(\s+)?$/im) {  ## Suspicious line
-           #  &rejectMessage($msg, $sender);
-             return 1;
-          }

Reply via email to