[Pkg-mailman-hackers] Pkg-mailman commit - rev 137 - branches/pkg-split/core/debian/patches

Bernd S. Brentrup bsb@haydn.debian.org
Wed, 19 May 2004 10:21:44 -0600


Author: bsb
Date: 2004-05-19 10:21:42 -0600 (Wed, 19 May 2004)
New Revision: 137

Modified:
   branches/pkg-split/core/debian/patches/21_newlist_help.dpatch
   branches/pkg-split/core/debian/patches/56_fix_de_broken_links.dpatch
   branches/pkg-split/core/debian/patches/57_fix_missing_da_template.dpatch
Log:
Modify patches to apply to new upstream.

Modified: branches/pkg-split/core/debian/patches/21_newlist_help.dpatch
===================================================================
--- branches/pkg-split/core/debian/patches/21_newlist_help.dpatch	2004-05-19 16:19:24 UTC (rev 136)
+++ branches/pkg-split/core/debian/patches/21_newlist_help.dpatch	2004-05-19 16:21:42 UTC (rev 137)
@@ -21,9 +21,9 @@
 
 exit 0
 @DPATCH@
-
---- mailman-2.1.4.orig/bin/newlist
-+++ mailman-2.1.4/bin/newlist
+diff -urNad /debuild/mine/mailman/build-area/mailman-2.1.5/bin/newlist mailman-2.1.5/bin/newlist
+--- /debuild/mine/mailman/build-area/mailman-2.1.5/bin/newlist	2004-05-19 16:55:03.000000000 +0200
++++ mailman-2.1.5/bin/newlist	2004-05-19 16:59:42.000000000 +0200
 @@ -62,6 +62,9 @@
  defined in your Defaults.py file or overridden by settings in mm_cfg.py).
  
@@ -44,7 +44,7 @@
  from Mailman import mm_cfg
 @@ -97,6 +101,9 @@
  
- ^L
+ 
  def main():
 +    gid = grp.getgrnam(mm_cfg.MAILMAN_GROUP)[2]
 +    if os.getgid() != mm_cfg.MAILMAN_GROUP:
@@ -55,7 +55,7 @@
 @@ -163,7 +170,7 @@
          except Errors.BadListNameError, s:
              usage(1, _('Illegal list name: %(s)s'))
-         except Errors.MMBadEmailError, s:
+         except Errors.EmailAddressError, s:
 -            usage(1, _('Bad owner email address: %(s)s'))
 +            usage(1, _('Bad owner email address: %(s)s.  Owner addresses need to be fully-qualified names, like "owner@example.com", not just "owner".'))
          except Errors.MMListAlreadyExistsError:

Modified: 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:19:24 UTC (rev 136)
+++ branches/pkg-split/core/debian/patches/56_fix_de_broken_links.dpatch	2004-05-19 16:21:42 UTC (rev 137)
@@ -23,18 +23,19 @@
 
 exit 0
 @DPATCH@
---- mailman-2.1.4/messages/de/LC_MESSAGES/mailman.po.orig	2004-03-14 21:10:18.000000000 +0000
-+++ mailman-2.1.4/messages/de/LC_MESSAGES/mailman.po	2004-03-14 21:10:28.000000000 +0000
-@@ -5899,7 +5899,7 @@
+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ündigunslisten "
+ "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 zu Leistungsaspekten</a> durch, bevor Sie sich hieran "
+ "personalize\"> Details</a> durch, bevor Sie sich hieran "
  "die Finger verbrennen."
  
-@@ -6846,7 +6846,7 @@
+@@ -7006,7 +7006,7 @@
  "\">topics_bodylines_limit</a>\n"
  "             configuration variable."
  msgstr ""
@@ -43,7 +44,7 @@
  "\"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 "
-@@ -6859,7 +6859,7 @@
+@@ -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 "

Modified: branches/pkg-split/core/debian/patches/57_fix_missing_da_template.dpatch
===================================================================
--- branches/pkg-split/core/debian/patches/57_fix_missing_da_template.dpatch	2004-05-19 16:19:24 UTC (rev 136)
+++ branches/pkg-split/core/debian/patches/57_fix_missing_da_template.dpatch	2004-05-19 16:21:42 UTC (rev 137)
@@ -22,14 +22,15 @@
 
 exit 0
 @DPATCH@
---- mailman-2.1.4.orig/templates/Makefile.in	2003-12-13 16:32:44.000000000 +0000
-+++ mailman-2.1.4/templates/Makefile.in	2004-04-08 16:51:25.000000000 +0000
+diff -urNad /debuild/mine/mailman/build-area/mailman-2.1.5/templates/Makefile.in mailman-2.1.5/templates/Makefile.in
+--- /debuild/mine/mailman/build-area/mailman-2.1.5/templates/Makefile.in	2004-05-19 17:34:23.000000000 +0200
++++ mailman-2.1.5/templates/Makefile.in	2004-05-19 17:38:16.000000000 +0200
 @@ -42,7 +42,7 @@
  
  SHELL=		/bin/sh
  
 -LANGUAGES=	big5 ca cs de en es et eu fi fr gb hr hu it ja ko lt nl \
 +LANGUAGES=	big5 ca cs da de en es et eu fi fr gb hr hu it ja ko lt nl \
- 		no pl pt pt_BR ro ru sl sr sv uk
+ 		no pl pt pt_BR ro ru sl sr sv tr uk
  
  # Modes for directories and executables created by the install