[Pkg-mailman-hackers] Pkg-mailman commit - rev 138 - branches/pkg-split/core/debian/patches
Bernd S. Brentrup
bsb@haydn.debian.org
Wed, 19 May 2004 10:28:22 -0600
Author: bsb
Date: 2004-05-19 10:28:19 -0600 (Wed, 19 May 2004)
New Revision: 138
Added:
branches/pkg-split/core/debian/patches/56_fix_translations.dpatch
Removed:
branches/pkg-split/core/debian/patches/56_fix_de_broken_links.dpatch
branches/pkg-split/core/debian/patches/58_fix_translations.dpatch
Modified:
branches/pkg-split/core/debian/patches/00list
Log:
Join patches fixing translations.
Modified: branches/pkg-split/core/debian/patches/00list
===================================================================
--- branches/pkg-split/core/debian/patches/00list 2004-05-19 16:21:42 UTC (rev 137)
+++ branches/pkg-split/core/debian/patches/00list 2004-05-19 16:28:19 UTC (rev 138)
@@ -9,7 +9,6 @@
21_newlist_help
23_fix_urls
30_pipermail_threads
-31_buggy_queuefiles
32_MIME_fixup
40_FHS_dirs
42_remove_shebang
@@ -19,9 +18,7 @@
52_check_perms
53_disable_addons
55_options_traceback
-56_fix_de_broken_links
+56_fix_translations
57_fix_missing_da_template
-58_fix_translations
59_build_arch_indep
60_type_error_temp_fix
-99_js_templates
Deleted: branches/pkg-split/core/debian/patches/56_fix_de_broken_links.dpatch
===================================================================
--- branches/pkg-split/core/debian/patches/56_fix_de_broken_links.dpatch 2004-05-19 16:21:42 UTC (rev 137)
+++ branches/pkg-split/core/debian/patches/56_fix_de_broken_links.dpatch 2004-05-19 16:28:19 UTC (rev 138)
@@ -1,55 +0,0 @@
-#! /bin/sh -e
-## 56_fix_de_broken_links, based on Ralf Doeblitz <r.doeblitz@asco.de>
-## fixes (see bug #233048)
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: update is called from the Debian maintainer scripts and prints
-## DP: non-appropriate output. Change that.
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-@DPATCH@
-diff -urNad /debuild/mine/mailman/build-area/mailman-2.1.5/messages/de/LC_MESSAGES/mailman.po mailman-2.1.5/messages/de/LC_MESSAGES/mailman.po
---- /debuild/mine/mailman/build-area/mailman-2.1.5/messages/de/LC_MESSAGES/mailman.po 2004-05-19 17:46:40.000000000 +0200
-+++ mailman-2.1.5/messages/de/LC_MESSAGES/mailman.po 2004-05-19 17:58:40.000000000 +0200
-@@ -6013,7 +6013,7 @@
- msgstr ""
- "Soll Mailman das Zustellungshandling für normale Mailinglisten "
- "personalisieren? Diese Option kann interessant für reine Ankündigungslisten "
--"sein, lesen sie aber auf alle Fälle die <ahref=\"?VARHELP=nondigest/"
-+"sein, lesen sie aber auf alle Fälle die <a href=\"?VARHELP=nondigest/"
- "personalize\"> Details</a> durch, bevor Sie sich hieran "
- "die Finger verbrennen."
-
-@@ -7006,7 +7006,7 @@
- "\">topics_bodylines_limit</a>\n"
- " configuration variable."
- msgstr ""
--"Der Themenfilter kategorisiert jede eingehende e-Mailnachricht gemäss href="
-+"Der Themenfilter kategorisiert jede eingehende e-Mailnachricht gemäss <a href="
- "\"http://www.python.org/doc/current/lib/module-re.html\">Filterregeln mit "
- "regulären Ausdrücken</a>, die Sie weiter unten festlegen können. Wenn die "
- "<code>Subject:</code> oder <code>Keywords:</code> Header der Nachricht mit "
-@@ -7019,7 +7019,7 @@
- "nicht mit Sammelnachrichten.\n"
- " <p>Optional kann auch der Nachrichtentext auf Vorkommen von <code>Subject:</"
- "code> und <code>Keyword:</code> Header durchsucht werden. Spezifizieren Sie "
--"hierzu die Optionhref=\"?VARHELP=topics/topics_bodylines_limit"
-+"hierzu die Option <a href=\"?VARHELP=topics/topics_bodylines_limit"
- "\">topics_bodylines_limit</a>."
-
- # Mailman/Gui/Topics.py:57
Copied: branches/pkg-split/core/debian/patches/56_fix_translations.dpatch (from rev 137, branches/pkg-split/core/debian/patches/56_fix_de_broken_links.dpatch)
===================================================================
--- branches/pkg-split/core/debian/patches/56_fix_de_broken_links.dpatch 2004-05-19 16:21:42 UTC (rev 137)
+++ branches/pkg-split/core/debian/patches/56_fix_translations.dpatch 2004-05-19 16:28:19 UTC (rev 138)
@@ -0,0 +1,67 @@
+#! /bin/sh -e
+## 56_fix_de_broken_links, based on Ralf Doeblitz <r.doeblitz@asco.de>
+## fixes (see bug #233048)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: update is called from the Debian maintainer scripts and prints
+## DP: non-appropriate output. Change that.
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
+
+if [ $# -lt 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+@DPATCH@
+diff -urNad /debuild/mine/mailman/build-area/mailman-2.1.5/messages/de/LC_MESSAGES/mailman.po mailman-2.1.5/messages/de/LC_MESSAGES/mailman.po
+--- /debuild/mine/mailman/build-area/mailman-2.1.5/messages/de/LC_MESSAGES/mailman.po 2004-05-19 17:46:40.000000000 +0200
++++ mailman-2.1.5/messages/de/LC_MESSAGES/mailman.po 2004-05-19 17:58:40.000000000 +0200
+@@ -6013,7 +6013,7 @@
+ msgstr ""
+ "Soll Mailman das Zustellungshandling für normale Mailinglisten "
+ "personalisieren? Diese Option kann interessant für reine Ankündigungslisten "
+-"sein, lesen sie aber auf alle Fälle die <ahref=\"?VARHELP=nondigest/"
++"sein, lesen sie aber auf alle Fälle die <a href=\"?VARHELP=nondigest/"
+ "personalize\"> Details</a> durch, bevor Sie sich hieran "
+ "die Finger verbrennen."
+
+@@ -7006,7 +7006,7 @@
+ "\">topics_bodylines_limit</a>\n"
+ " configuration variable."
+ msgstr ""
+-"Der Themenfilter kategorisiert jede eingehende e-Mailnachricht gemäss href="
++"Der Themenfilter kategorisiert jede eingehende e-Mailnachricht gemäss <a href="
+ "\"http://www.python.org/doc/current/lib/module-re.html\">Filterregeln mit "
+ "regulären Ausdrücken</a>, die Sie weiter unten festlegen können. Wenn die "
+ "<code>Subject:</code> oder <code>Keywords:</code> Header der Nachricht mit "
+@@ -7019,7 +7019,7 @@
+ "nicht mit Sammelnachrichten.\n"
+ " <p>Optional kann auch der Nachrichtentext auf Vorkommen von <code>Subject:</"
+ "code> und <code>Keyword:</code> Header durchsucht werden. Spezifizieren Sie "
+-"hierzu die Optionhref=\"?VARHELP=topics/topics_bodylines_limit"
++"hierzu die Option <a href=\"?VARHELP=topics/topics_bodylines_limit"
+ "\">topics_bodylines_limit</a>."
+
+ # Mailman/Gui/Topics.py:57
+diff -urNad /debuild/mine/mailman/build-area/mailman-2.1.4/messages/es/LC_MESSAGES/mailman.po mailman-2.1.4/messages/es/LC_MESSAGES/mailman.po
+--- /debuild/mine/mailman/build-area/mailman-2.1.4/messages/es/LC_MESSAGES/mailman.po 2003-12-13 20:54:53.000000000 +0100
++++ mailman-2.1.4/messages/es/LC_MESSAGES/mailman.po 2004-05-09 13:49:31.000000000 +0200
+@@ -1945,7 +1945,7 @@
+
+ #: Mailman/Cgi/create.py:200 bin/newlist:164
+ msgid "Illegal list name: %(s)s"
+-msgstr "Nombre de lista ilegal: %(opt)s"
++msgstr "Nombre de lista ilegal: %(s)s"
+
+ #: Mailman/Cgi/create.py:205
+ msgid ""
Deleted: branches/pkg-split/core/debian/patches/58_fix_translations.dpatch
===================================================================
--- branches/pkg-split/core/debian/patches/58_fix_translations.dpatch 2004-05-19 16:21:42 UTC (rev 137)
+++ branches/pkg-split/core/debian/patches/58_fix_translations.dpatch 2004-05-19 16:28:19 UTC (rev 138)
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-## 58_fix_translations.dpatch by Siggy Brentrup <bsb@debian.org>
-##
-## $URL$
-## $Id$
-##
-## DP: Fix translation errors
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /debuild/mine/mailman/build-area/mailman-2.1.4/messages/es/LC_MESSAGES/mailman.po mailman-2.1.4/messages/es/LC_MESSAGES/mailman.po
---- /debuild/mine/mailman/build-area/mailman-2.1.4/messages/es/LC_MESSAGES/mailman.po 2003-12-13 20:54:53.000000000 +0100
-+++ mailman-2.1.4/messages/es/LC_MESSAGES/mailman.po 2004-05-09 13:49:31.000000000 +0200
-@@ -1945,7 +1945,7 @@
-
- #: Mailman/Cgi/create.py:200 bin/newlist:164
- msgid "Illegal list name: %(s)s"
--msgstr "Nombre de lista ilegal: %(opt)s"
-+msgstr "Nombre de lista ilegal: %(s)s"
-
- #: Mailman/Cgi/create.py:205
- msgid ""