[Pkg-mailman-hackers] Pkg-mailman commit - rev 660 - trunk/debian/patches

Mon May 24 15:51:50 UTC 2010

Author: thijs
Date: 2010-05-24 15:51:48 +0000 (Mon, 24 May 2010)
New Revision: 660

Modified:
   trunk/debian/patches/01_defaults.debian.patch
   trunk/debian/patches/02_force_autoconf_2.50.patch
   trunk/debian/patches/07_snooze.patch
   trunk/debian/patches/10_wrapper_uid.patch
   trunk/debian/patches/15_mailmanctl_daemonize.patch
   trunk/debian/patches/16_update_debian.patch
   trunk/debian/patches/20_qmail_to_mailman.debian.patch
   trunk/debian/patches/21_newlist_help.patch
   trunk/debian/patches/25_site_logo.patch
   trunk/debian/patches/51_nocompile.pyc.patch
   trunk/debian/patches/52_check_perms_lstat.patch
   trunk/debian/patches/53_disable_addons.patch
   trunk/debian/patches/59_fix_missing_language_crash.patch
   trunk/debian/patches/63_update_default_server_language.patch
   trunk/debian/patches/64_correct_html_nesting.patch
   trunk/debian/patches/66_donot_let_cache_html_pages.patch
   trunk/debian/patches/70_invalid_utf8_dos.patch
   trunk/debian/patches/71_date_overflows.patch
   trunk/debian/patches/74_admin_non-ascii_emails.patch
   trunk/debian/patches/79_archiver_slash.patch
   trunk/debian/patches/99_js_templates.patch
Log:
refresh some more


Modified: trunk/debian/patches/01_defaults.debian.patch
===================================================================

--- trunk/debian/patches/01_defaults.debian.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/01_defaults.debian.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -3,8 +3,8 @@
 Set sane defaults in Defaults.py.in
 Index: b/Mailman/Defaults.py.in
 ===================================================================
---- a/Mailman/Defaults.py.in	2010-05-24 17:28:44.000000000 +0200
-+++ b/Mailman/Defaults.py.in	2010-05-24 17:28:46.000000000 +0200
+--- a/Mailman/Defaults.py.in	2010-05-24 17:50:52.000000000 +0200
++++ b/Mailman/Defaults.py.in	2010-05-24 17:50:58.000000000 +0200
 @@ -54,7 +54,7 @@
  # disable Mailman's logo footer altogther, hack
  # Mailman/htmlformat.py:MailmanLogo(), which also contains the hardcoded links

Modified: trunk/debian/patches/02_force_autoconf_2.50.patch
===================================================================
--- trunk/debian/patches/02_force_autoconf_2.50.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/02_force_autoconf_2.50.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -4,8 +4,8 @@
 uses) and not autoconf 2.13.
 Index: b/configure.in
 ===================================================================
---- a/configure.in	2010-05-24 17:28:44.000000000 +0200
-+++ b/configure.in	2010-05-24 17:28:47.000000000 +0200
+--- a/configure.in	2010-05-24 17:50:51.000000000 +0200
++++ b/configure.in	2010-05-24 17:50:59.000000000 +0200
 @@ -16,7 +16,7 @@
  
  dnl Process this file with autoconf to produce a configure script.

Modified: trunk/debian/patches/07_snooze.patch
===================================================================
--- trunk/debian/patches/07_snooze.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/07_snooze.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -3,8 +3,8 @@
 Snooze a bit to avoid eating too much CPU if you get an SMTP error (Closes: #175173)
 Index: b/Mailman/Queue/OutgoingRunner.py
 ===================================================================
---- a/Mailman/Queue/OutgoingRunner.py	2010-05-24 17:28:44.000000000 +0200
-+++ b/Mailman/Queue/OutgoingRunner.py	2010-05-24 17:28:48.000000000 +0200
+--- a/Mailman/Queue/OutgoingRunner.py	2010-05-24 17:50:51.000000000 +0200
++++ b/Mailman/Queue/OutgoingRunner.py	2010-05-24 17:50:59.000000000 +0200
 @@ -89,6 +89,7 @@
                  syslog('error', 'Cannot connect to SMTP server %s on port %s',
                         mm_cfg.SMTPHOST, port)

Modified: trunk/debian/patches/10_wrapper_uid.patch
===================================================================
--- trunk/debian/patches/10_wrapper_uid.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/10_wrapper_uid.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -3,8 +3,8 @@
 Makes sure we're called with the right UID and GID (Closes: #36010, #89564, #89848, 89818)
 Index: b/src/cgi-wrapper.c
 ===================================================================
---- a/src/cgi-wrapper.c	2010-05-24 17:28:43.000000000 +0200
-+++ b/src/cgi-wrapper.c	2010-05-24 17:28:49.000000000 +0200
+--- a/src/cgi-wrapper.c	2010-05-24 17:50:51.000000000 +0200
++++ b/src/cgi-wrapper.c	2010-05-24 17:51:00.000000000 +0200
 @@ -42,7 +42,8 @@
          char* fake_argv[3];
  
@@ -17,8 +17,8 @@
           * don't contain anything useful.  `script' will always be the driver
 Index: b/src/mail-wrapper.c
 ===================================================================
---- a/src/mail-wrapper.c	2010-05-24 17:28:43.000000000 +0200
-+++ b/src/mail-wrapper.c	2010-05-24 17:28:49.000000000 +0200
+--- a/src/mail-wrapper.c	2010-05-24 17:50:51.000000000 +0200
++++ b/src/mail-wrapper.c	2010-05-24 17:51:00.000000000 +0200
 @@ -74,7 +74,8 @@
                  fatal(logident, MAIL_ILLEGAL_COMMAND,
                        "Illegal command: %s", argv[1]);

Modified: trunk/debian/patches/15_mailmanctl_daemonize.patch
===================================================================
--- trunk/debian/patches/15_mailmanctl_daemonize.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/15_mailmanctl_daemonize.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -3,8 +3,8 @@
 Daemonize mailmanctl properly (Closes: #175175)
 Index: b/bin/mailmanctl
 ===================================================================
---- a/bin/mailmanctl	2010-05-24 17:28:43.000000000 +0200
-+++ b/bin/mailmanctl	2010-05-24 17:28:50.000000000 +0200
+--- a/bin/mailmanctl	2010-05-24 17:50:50.000000000 +0200
++++ b/bin/mailmanctl	2010-05-24 17:51:01.000000000 +0200
 @@ -417,6 +417,13 @@
          # won't be opening any terminal devices, don't do the ultra-paranoid
          # suggestion of doing a second fork after the setsid() call.

Modified: trunk/debian/patches/16_update_debian.patch
===================================================================
--- trunk/debian/patches/16_update_debian.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/16_update_debian.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -4,8 +4,8 @@
 prints non-appropriate output.  Change that.
 Index: b/bin/update
 ===================================================================
---- a/bin/update	2010-05-24 17:28:43.000000000 +0200
-+++ b/bin/update	2010-05-24 17:28:51.000000000 +0200
+--- a/bin/update	2010-05-24 17:50:50.000000000 +0200
++++ b/bin/update	2010-05-24 17:51:02.000000000 +0200
 @@ -334,37 +334,6 @@
      # BAW: Is this still necessary?!
      mlist.Save()

Modified: trunk/debian/patches/20_qmail_to_mailman.debian.patch
===================================================================
--- trunk/debian/patches/20_qmail_to_mailman.debian.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/20_qmail_to_mailman.debian.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -3,8 +3,8 @@
 Fix some paths in the qmail_to_mailman wrapper (Closes: #217573)
 Index: b/contrib/qmail-to-mailman.py
 ===================================================================
---- a/contrib/qmail-to-mailman.py	2010-05-24 17:28:43.000000000 +0200
-+++ b/contrib/qmail-to-mailman.py	2010-05-24 17:28:51.000000000 +0200
+--- a/contrib/qmail-to-mailman.py	2010-05-24 17:50:50.000000000 +0200
++++ b/contrib/qmail-to-mailman.py	2010-05-24 17:51:03.000000000 +0200
 @@ -28,12 +28,12 @@
  #
  # INSTALLATION:

Modified: trunk/debian/patches/21_newlist_help.patch
===================================================================
--- trunk/debian/patches/21_newlist_help.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/21_newlist_help.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -3,8 +3,8 @@
 make newlist be a bit friendlier (Closes: #309339, #170362)
 Index: b/bin/newlist
 ===================================================================
---- a/bin/newlist	2010-05-24 17:28:43.000000000 +0200
-+++ b/bin/newlist	2010-05-24 17:28:52.000000000 +0200
+--- a/bin/newlist	2010-05-24 17:50:50.000000000 +0200
++++ b/bin/newlist	2010-05-24 17:51:04.000000000 +0200
 @@ -88,12 +88,16 @@
  defined in your Defaults.py file or overridden by settings in mm_cfg.py).
  

Modified: trunk/debian/patches/25_site_logo.patch
===================================================================
--- trunk/debian/patches/25_site_logo.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/25_site_logo.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -5,8 +5,8 @@
 http://sf.net/support/tracker.php?aid=1615748
 Index: b/Mailman/Defaults.py.in
 ===================================================================
---- a/Mailman/Defaults.py.in	2010-05-24 17:28:46.000000000 +0200
-+++ b/Mailman/Defaults.py.in	2010-05-24 17:28:53.000000000 +0200
+--- a/Mailman/Defaults.py.in	2010-05-24 17:50:58.000000000 +0200
++++ b/Mailman/Defaults.py.in	2010-05-24 17:51:04.000000000 +0200
 @@ -64,6 +64,12 @@
  #MAILMAN_URL = 'http://www.list.org/'
  #MAILMAN_URL = 'http://mailman.sf.net/'
@@ -22,8 +22,8 @@
  # addresses for your domain.  For example, if people visit your Mailman system
 Index: b/Mailman/htmlformat.py
 ===================================================================
---- a/Mailman/htmlformat.py	2010-05-24 17:28:43.000000000 +0200
-+++ b/Mailman/htmlformat.py	2010-05-24 17:28:53.000000000 +0200
+--- a/Mailman/htmlformat.py	2010-05-24 17:50:49.000000000 +0200
++++ b/Mailman/htmlformat.py	2010-05-24 17:51:04.000000000 +0200
 @@ -622,24 +622,33 @@
  
  def MailmanLogo():

Modified: trunk/debian/patches/51_nocompile.pyc.patch
===================================================================
--- trunk/debian/patches/51_nocompile.pyc.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/51_nocompile.pyc.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -3,8 +3,8 @@
 Don't do the compileall dance.  It'll just waste CPU cycles.
 Index: b/Makefile.in
 ===================================================================
---- a/Makefile.in	2010-05-24 17:28:43.000000000 +0200
-+++ b/Makefile.in	2010-05-24 17:28:54.000000000 +0200
+--- a/Makefile.in	2010-05-24 17:50:49.000000000 +0200
++++ b/Makefile.in	2010-05-24 17:51:05.000000000 +0200
 @@ -124,7 +124,7 @@
  	do \
  	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \

Modified: trunk/debian/patches/52_check_perms_lstat.patch
===================================================================
--- trunk/debian/patches/52_check_perms_lstat.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/52_check_perms_lstat.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -3,8 +3,8 @@
 Use lstat instead of stat in check_perms
 Index: b/bin/check_perms
 ===================================================================
---- a/bin/check_perms	2010-05-24 17:28:43.000000000 +0200
-+++ b/bin/check_perms	2010-05-24 17:28:55.000000000 +0200
+--- a/bin/check_perms	2010-05-24 17:50:49.000000000 +0200
++++ b/bin/check_perms	2010-05-24 17:51:06.000000000 +0200
 @@ -82,7 +82,7 @@
      return os.stat(path)[ST_MODE]
  

Modified: trunk/debian/patches/53_disable_addons.patch
===================================================================
--- trunk/debian/patches/53_disable_addons.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/53_disable_addons.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -1,9 +1,10 @@
 Patch: 53_disable_addons.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Disable some modules which are pulled in from other Debian packages.
-diff -Nur mailman-2.1.13/misc/Makefile.in mailman-2.1.13/misc/Makefile.in
---- mailman-2.1.13/misc/Makefile.in	2009-12-22 19:00:43.000000000 +0100
-+++ mailman-2.1.13/misc/Makefile.in	2010-05-24 17:37:28.000000000 +0200
+Index: b/misc/Makefile.in
+===================================================================
+--- a/misc/Makefile.in	2010-05-24 17:50:48.000000000 +0200
++++ b/misc/Makefile.in	2010-05-24 17:51:07.000000000 +0200
 @@ -57,7 +57,10 @@
  JACODECSPKG=	@JACODECSPKG@
  KOCODECSPKG=	@KOCODECSPKG@
@@ -16,9 +17,10 @@
  
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
-diff -Nur mailman-2.1.13/misc/paths.py.in mailman-2.1.13/misc/paths.py.in
---- mailman-2.1.13/misc/paths.py.in	2009-12-22 19:00:43.000000000 +0100
-+++ mailman-2.1.13/misc/paths.py.in	2010-05-24 17:37:28.000000000 +0200
+Index: b/misc/paths.py.in
+===================================================================
+--- a/misc/paths.py.in	2010-05-24 17:50:48.000000000 +0200
++++ b/misc/paths.py.in	2010-05-24 17:51:07.000000000 +0200
 @@ -67,13 +67,19 @@
  # files would be imported automatically.  But because we inhibit the importing
  # of the site module, we need to be explicit about importing these codecs.

Modified: trunk/debian/patches/59_fix_missing_language_crash.patch
===================================================================
--- trunk/debian/patches/59_fix_missing_language_crash.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/59_fix_missing_language_crash.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -1,10 +1,10 @@
 Patch: fix_missing_language_crash.patch
 Author: Paul Wise <pabs3 at bonedaddy.net>
 Fix crash when a language is missing (Closes: #257606)
-Index: mailman-2.1.12/Mailman/htmlformat.py
+Index: b/Mailman/htmlformat.py
 ===================================================================
---- mailman-2.1.12.orig/Mailman/htmlformat.py	2009-03-02 20:41:51.000000000 +0100
-+++ mailman-2.1.12/Mailman/htmlformat.py	2009-03-02 20:50:11.000000000 +0100
+--- a/Mailman/htmlformat.py	2010-05-24 17:51:04.000000000 +0200
++++ b/Mailman/htmlformat.py	2010-05-24 17:51:08.000000000 +0200
 @@ -298,7 +298,7 @@
  
      def Format(self, indent=0, **kws):

Modified: trunk/debian/patches/63_update_default_server_language.patch
===================================================================
--- trunk/debian/patches/63_update_default_server_language.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/63_update_default_server_language.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -2,11 +2,11 @@
 Author: László 'GCS' Böszörményi <gcs at lsc.hu>
 Get the default language from the config file, and do not use the
 hardcoded English.
-Index: mailman-2.1.12/bin/update
+Index: b/bin/update
 ===================================================================
---- mailman-2.1.12.orig/bin/update	2009-03-02 20:50:02.000000000 +0100
-+++ mailman-2.1.12/bin/update	2009-03-02 20:50:13.000000000 +0100
-@@ -120,7 +120,7 @@
+--- a/bin/update	2010-05-24 17:51:02.000000000 +0200
++++ b/bin/update	2010-05-24 17:51:09.000000000 +0200
+@@ -121,7 +121,7 @@
      #
      # First, get rid of any lists/<list> template or lists/<list>/en template
      # that is identical to the global templates/* default.
@@ -15,7 +15,7 @@
          # BAW: get rid of old templates, e.g. admlogin.txt and
          # handle_opts.html
          try:
-@@ -154,14 +154,14 @@
+@@ -155,14 +155,14 @@
                  os.unlink(os.path.join(mlist.fullpath(), gtemplate + '.prev'))
          # Match against the lists/<list>/en/* templates
          try:

Modified: trunk/debian/patches/64_correct_html_nesting.patch
===================================================================
--- trunk/debian/patches/64_correct_html_nesting.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/64_correct_html_nesting.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -3,10 +3,10 @@
 Fix the subscription form template with iCab (Closes: #249212)
 http://archives.lists.indymedia.org/listwork/2004-May/009962.html
 http://archives.lists.indymedia.org/listwork/2004-May/009964.html
-Index: mailman-2.1.12/templates/ca/listinfo.html
+Index: b/templates/ca/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ca/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/ca/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/ca/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/ca/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -62,8 +62,8 @@
  	  <P>
  	    Ompliu el formulari seg&uuml;ent per a
@@ -17,10 +17,10 @@
  
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
-Index: mailman-2.1.12/templates/cs/listinfo.html
+Index: b/templates/cs/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/cs/listinfo.html	2009-03-02 20:41:48.000000000 +0100
-+++ mailman-2.1.12/templates/cs/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/cs/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/cs/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	<td colspan="2">
  	  <P>
@@ -31,10 +31,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/da/listinfo.html
+Index: b/templates/da/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/da/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/da/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/da/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/da/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -62,8 +62,8 @@
  	<td colspan="2">
  	  <P>
@@ -45,10 +45,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/de/listinfo.html
+Index: b/templates/de/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/de/listinfo.html	2009-03-02 20:41:50.000000000 +0100
-+++ mailman-2.1.12/templates/de/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/de/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/de/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	  <P>
  	    Abonnieren Sie <MM-List-Name>, indem Sie das folgende Formular
@@ -59,10 +59,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/en/listinfo.html
+Index: b/templates/en/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/en/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/en/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/en/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/en/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	  <P>
  	    Subscribe to <MM-List-Name> by filling out the following
@@ -73,10 +73,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/es/listinfo.html
+Index: b/templates/es/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/es/listinfo.html	2009-03-02 20:41:48.000000000 +0100
-+++ mailman-2.1.12/templates/es/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/es/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/es/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -64,8 +64,8 @@
  	  <P>
  	    Suscr&iacute;base a <MM-List-Name> rellenando los datos del
@@ -87,10 +87,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/et/listinfo.html
+Index: b/templates/et/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/et/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/et/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/et/listinfo.html	2010-05-24 17:50:46.000000000 +0200
++++ b/templates/et/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -58,8 +58,8 @@
  	<td colspan="2">
  	  <P>
@@ -101,10 +101,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/eu/listinfo.html
+Index: b/templates/eu/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/eu/listinfo.html	2009-03-02 20:41:50.000000000 +0100
-+++ mailman-2.1.12/templates/eu/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/eu/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/eu/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -62,8 +62,8 @@
  	<td colspan="2">
  	  <P>
@@ -115,10 +115,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/fi/listinfo.html
+Index: b/templates/fi/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/fi/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/fi/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/fi/listinfo.html	2010-05-24 17:50:46.000000000 +0200
++++ b/templates/fi/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	<td colspan="2">
  	  <P>
@@ -129,10 +129,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/fr/listinfo.html
+Index: b/templates/fr/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/fr/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/fr/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/fr/listinfo.html	2010-05-24 17:50:46.000000000 +0200
++++ b/templates/fr/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -61,8 +61,8 @@
        <p> 	    
  	Abonnez-vous &agrave; <MM-List-Name> en remplissant le formulaire 
@@ -143,10 +143,10 @@
          <table border="0" cellspacing="2" cellpadding="2" width="70%"
   height="112">
              <tr>
-Index: mailman-2.1.12/templates/hr/listinfo.html
+Index: b/templates/hr/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/hr/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/hr/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/hr/listinfo.html	2010-05-24 17:50:48.000000000 +0200
++++ b/templates/hr/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	  <P>
  	    Pretplatite se na <MM-List-Name> ispunjavanjem sljedeæe 
@@ -157,10 +157,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/hu/listinfo.html
+Index: b/templates/hu/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/hu/listinfo.html	2009-03-02 20:41:48.000000000 +0100
-+++ mailman-2.1.12/templates/hu/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/hu/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/hu/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -59,11 +59,10 @@
  	<td colspan="2">
  	  <P>
@@ -174,10 +174,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/it/listinfo.html
+Index: b/templates/it/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/it/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/it/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/it/listinfo.html	2010-05-24 17:50:46.000000000 +0200
++++ b/templates/it/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	<td colspan="2">
  	  <P>
@@ -188,10 +188,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/ja/listinfo.html
+Index: b/templates/ja/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ja/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/ja/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/ja/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/ja/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -65,8 +65,8 @@
  	  <P>
  	    <MM-List-Name> ¤Ø¤ÎÆþ²ñ¤Ï, 
@@ -202,10 +202,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/ko/listinfo.html
+Index: b/templates/ko/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ko/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/ko/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/ko/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/ko/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	<td colspan="2">
  	  <P>
@@ -216,10 +216,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/lt/listinfo.html
+Index: b/templates/lt/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/lt/listinfo.html	2009-03-02 20:41:50.000000000 +0100
-+++ mailman-2.1.12/templates/lt/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/lt/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/lt/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -61,8 +61,8 @@
  	<td colspan="2">
  	  <P>
@@ -230,10 +230,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/nl/listinfo.html
+Index: b/templates/nl/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/nl/listinfo.html	2009-03-02 20:41:50.000000000 +0100
-+++ mailman-2.1.12/templates/nl/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/nl/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/nl/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -59,8 +59,8 @@
  	<td colspan="2">
  	  <P>
@@ -244,10 +244,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/no/listinfo.html
+Index: b/templates/no/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/no/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/no/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/no/listinfo.html	2010-05-24 17:50:46.000000000 +0200
++++ b/templates/no/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -62,8 +62,8 @@
  	<td colspan="2">
  	  <P>
@@ -258,10 +258,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/pl/listinfo.html
+Index: b/templates/pl/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/pl/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/pl/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/pl/listinfo.html	2010-05-24 17:50:46.000000000 +0200
++++ b/templates/pl/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	  <P>
            Wype³nij poni¿szy formularz, by zapisaæ siê na listê <MM-List-Name>.
@@ -272,10 +272,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/pt/listinfo.html
+Index: b/templates/pt/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/pt/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/pt/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/pt/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/pt/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	<td colspan="2">
  	  <P>
@@ -286,10 +286,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/pt_BR/listinfo.html
+Index: b/templates/pt_BR/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/pt_BR/listinfo.html	2009-03-02 20:41:50.000000000 +0100
-+++ mailman-2.1.12/templates/pt_BR/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/pt_BR/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/pt_BR/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	  <P>
  	    Para se inscrever na lista <MM-List-Name>, preencha o seguinte
@@ -300,10 +300,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/ro/listinfo.html
+Index: b/templates/ro/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ro/listinfo.html	2009-03-02 20:41:50.000000000 +0100
-+++ mailman-2.1.12/templates/ro/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/ro/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/ro/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -60,8 +60,8 @@
  	  <P>
  	    Vã puteþi abona la lista de discuþii <MM-List-Name> completând formularul
@@ -314,10 +314,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/ru/listinfo.html
+Index: b/templates/ru/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ru/listinfo.html	2009-03-02 20:41:48.000000000 +0100
-+++ mailman-2.1.12/templates/ru/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/ru/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/ru/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -51,8 +51,8 @@
          <td colspan="2">
            <P>
@@ -328,10 +328,10 @@
                <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
                  WIDTH="70%" HEIGHT= "112">
                  <TR>
-Index: mailman-2.1.12/templates/sl/listinfo.html
+Index: b/templates/sl/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sl/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/sl/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/sl/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/sl/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	  <P>
  	    Na seznam <MM-List-Name> se prijavite tako, da izpolnite
@@ -342,10 +342,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/sr/listinfo.html
+Index: b/templates/sr/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sr/listinfo.html	2009-03-02 20:41:49.000000000 +0100
-+++ mailman-2.1.12/templates/sr/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/sr/listinfo.html	2010-05-24 17:50:48.000000000 +0200
++++ b/templates/sr/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -52,8 +52,9 @@
        </TR>
        <tr>
@@ -357,10 +357,10 @@
          <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
            <TR> 
-Index: mailman-2.1.12/templates/sv/listinfo.html
+Index: b/templates/sv/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sv/listinfo.html	2009-03-02 20:41:50.000000000 +0100
-+++ mailman-2.1.12/templates/sv/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/sv/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/sv/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -56,8 +56,9 @@
        </TR>
        <tr>
@@ -372,10 +372,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/tr/listinfo.html
+Index: b/templates/tr/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/tr/listinfo.html	2009-03-02 20:41:50.000000000 +0100
-+++ mailman-2.1.12/templates/tr/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/tr/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/tr/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -63,8 +63,8 @@
  	  <P>
  	    <MM-List-Name> listesine aþaðýdaki formu doldurarak üye
@@ -386,10 +386,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/uk/listinfo.html
+Index: b/templates/uk/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/uk/listinfo.html	2009-03-02 20:41:50.000000000 +0100
-+++ mailman-2.1.12/templates/uk/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/uk/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/uk/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -62,8 +62,8 @@
  	<td colspan="2">
  	  <P>
@@ -400,10 +400,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/zh_CN/listinfo.html
+Index: b/templates/zh_CN/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/zh_CN/listinfo.html	2009-03-02 20:41:48.000000000 +0100
-+++ mailman-2.1.12/templates/zh_CN/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/zh_CN/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/zh_CN/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -60,8 +60,8 @@
  	<td colspan="2">
  	  <P>
@@ -414,10 +414,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-Index: mailman-2.1.12/templates/zh_TW/listinfo.html
+Index: b/templates/zh_TW/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/zh_TW/listinfo.html	2009-03-02 20:41:50.000000000 +0100
-+++ mailman-2.1.12/templates/zh_TW/listinfo.html	2009-03-02 20:50:14.000000000 +0100
+--- a/templates/zh_TW/listinfo.html	2010-05-24 17:50:47.000000000 +0200
++++ b/templates/zh_TW/listinfo.html	2010-05-24 17:51:09.000000000 +0200
 @@ -60,8 +60,8 @@
  	<td colspan="2">
  	  <P>

Modified: trunk/debian/patches/66_donot_let_cache_html_pages.patch
===================================================================
--- trunk/debian/patches/66_donot_let_cache_html_pages.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/66_donot_let_cache_html_pages.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -1,10 +1,10 @@
 Patch: 66_donot_let_cache_html_pages.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Patch to prevent browser from caching pages (Closes: #281284)
-Index: mailman-2.1.12/Mailman/htmlformat.py
+Index: b/Mailman/htmlformat.py
 ===================================================================
---- mailman-2.1.12.orig/Mailman/htmlformat.py	2009-03-02 20:50:11.000000000 +0100
-+++ mailman-2.1.12/Mailman/htmlformat.py	2009-03-02 20:50:18.000000000 +0100
+--- a/Mailman/htmlformat.py	2010-05-24 17:51:08.000000000 +0200
++++ b/Mailman/htmlformat.py	2010-05-24 17:51:11.000000000 +0200
 @@ -300,7 +300,8 @@
          charset = 'us-ascii'
          if self.language and Utils.IsLanguage(self.language):

Modified: trunk/debian/patches/70_invalid_utf8_dos.patch
===================================================================
--- trunk/debian/patches/70_invalid_utf8_dos.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/70_invalid_utf8_dos.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -1,11 +1,11 @@
 Patch: 70_invalid_utf8_dos.patch
 Author: Lionel Elie Mamane <lionel at mamane.lu>
 Avoid DOS if attachement filename is invalid Unicode string (Closes: #327732, CVE-2005-3573)
-Index: mailman-2.1.12/Mailman/Handlers/Scrubber.py
+Index: b/Mailman/Handlers/Scrubber.py
 ===================================================================
---- mailman-2.1.12.orig/Mailman/Handlers/Scrubber.py	2009-03-02 20:49:54.000000000 +0100
-+++ mailman-2.1.12/Mailman/Handlers/Scrubber.py	2009-03-02 20:50:19.000000000 +0100
-@@ -320,7 +320,10 @@
+--- a/Mailman/Handlers/Scrubber.py	2010-05-24 17:50:44.000000000 +0200
++++ b/Mailman/Handlers/Scrubber.py	2010-05-24 17:51:12.000000000 +0200
+@@ -300,7 +300,10 @@
                  os.umask(omask)
              desc = part.get('content-description', _('not available'))
              desc = Utils.oneline(desc, lcset)
@@ -17,7 +17,7 @@
              filename = Utils.oneline(filename, lcset)
              replace_payload_by_text(part, _("""\
  A non-text attachment was scrubbed...
-@@ -444,7 +447,10 @@
+@@ -422,7 +425,10 @@
      ctype = msg.get_content_type()
      # i18n file name is encoded
      lcset = Utils.GetCharSet(mlist.preferred_language)

Modified: trunk/debian/patches/71_date_overflows.patch
===================================================================
--- trunk/debian/patches/71_date_overflows.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/71_date_overflows.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -1,11 +1,11 @@
 Patch: 71_date_overflows.patch
 Author: Lionel Elie Mamane <lionel at mamane.lu>
 React sensibly on integer overflow in date handling (Closes: #326024, CVE-2005-4153)
-Index: mailman-2.1.12/Mailman/Handlers/Scrubber.py
+Index: b/Mailman/Handlers/Scrubber.py
 ===================================================================
---- mailman-2.1.12.orig/Mailman/Handlers/Scrubber.py	2009-03-02 20:50:19.000000000 +0100
-+++ mailman-2.1.12/Mailman/Handlers/Scrubber.py	2009-03-02 20:50:20.000000000 +0100
-@@ -143,7 +143,7 @@
+--- a/Mailman/Handlers/Scrubber.py	2010-05-24 17:51:12.000000000 +0200
++++ b/Mailman/Handlers/Scrubber.py	2010-05-24 17:51:13.000000000 +0200
+@@ -122,7 +122,7 @@
                       }.get(parts[3], 0)
              day = int(parts[4])
              year = int(parts[6])

Modified: trunk/debian/patches/74_admin_non-ascii_emails.patch
===================================================================
--- trunk/debian/patches/74_admin_non-ascii_emails.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/74_admin_non-ascii_emails.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -1,10 +1,10 @@
 Patch: 74_admin_non-ascii_emails.patch
 Author: Lionel Elie Mamane <lionel at mamane.lu>
 Don't assume emails are ASCII (Closes: #315358)
-Index: mailman-2.1.12/Mailman/Cgi/admin.py
+Index: b/Mailman/Cgi/admin.py
 ===================================================================
---- mailman-2.1.12.orig/Mailman/Cgi/admin.py	2009-03-02 20:41:46.000000000 +0100
-+++ mailman-2.1.12/Mailman/Cgi/admin.py	2009-03-02 20:50:21.000000000 +0100
+--- a/Mailman/Cgi/admin.py	2010-05-24 17:50:44.000000000 +0200
++++ b/Mailman/Cgi/admin.py	2010-05-24 17:51:14.000000000 +0200
 @@ -867,7 +867,12 @@
      chunksz = mlist.admin_member_chunksize
      # The email addresses had /better/ be ASCII, but might be encoded in the

Modified: trunk/debian/patches/79_archiver_slash.patch
===================================================================
--- trunk/debian/patches/79_archiver_slash.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/79_archiver_slash.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -1,10 +1,10 @@
 Patch: 79_archiver_slash.patch
 Author: Lionel Elie Mamane <lionel at mamane.lu>
 Some non-pipermail archivers require _no_ final slash (Closes: #350388)
-Index: mailman-2.1.12/Mailman/Archiver/Archiver.py
+Index: b/Mailman/Archiver/Archiver.py
 ===================================================================
---- mailman-2.1.12.orig/Mailman/Archiver/Archiver.py	2009-03-02 20:41:44.000000000 +0100
-+++ mailman-2.1.12/Mailman/Archiver/Archiver.py	2009-03-02 20:50:25.000000000 +0100
+--- a/Mailman/Archiver/Archiver.py	2010-05-24 17:50:44.000000000 +0200
++++ b/Mailman/Archiver/Archiver.py	2010-05-24 17:51:15.000000000 +0200
 @@ -146,8 +146,6 @@
                  'listname': self.internal_name(),
                  'hostname': hostname
@@ -14,11 +14,11 @@
              return url
  
      def __archive_file(self, afn):
-Index: mailman-2.1.12/Mailman/Defaults.py.in
+Index: b/Mailman/Defaults.py.in
 ===================================================================
---- mailman-2.1.12.orig/Mailman/Defaults.py.in	2009-03-02 20:49:55.000000000 +0100
-+++ mailman-2.1.12/Mailman/Defaults.py.in	2009-03-02 20:50:25.000000000 +0100
-@@ -210,7 +210,7 @@
+--- a/Mailman/Defaults.py.in	2010-05-24 17:51:04.000000000 +0200
++++ b/Mailman/Defaults.py.in	2010-05-24 17:51:15.000000000 +0200
+@@ -216,7 +216,7 @@
  # interpolate the name of the list into this.  You can also include a
  # "%(hostname)s" in the string, into which Mailman will interpolate
  # the host name (usually DEFAULT_URL_HOST).

Modified: trunk/debian/patches/99_js_templates.patch
===================================================================
--- trunk/debian/patches/99_js_templates.patch	2010-05-24 15:49:59 UTC (rev 659)
+++ trunk/debian/patches/99_js_templates.patch	2010-05-24 15:51:48 UTC (rev 660)
@@ -2,10 +2,10 @@
 Author: Tollef Fog Heen <tfheen at debian.org>
 Make the password field be focused on page entry, if you have JS
 enabled.  Again thanks to Md.
-Index: mailman-2.1.12/templates/ar/private.html
+Index: b/templates/ar/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ar/private.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/ar/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ar/private.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/ar/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -2,9 +2,10 @@
  <head>
      <title>Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† Ø§Ù„Ø´Ø®ØµÙŠØ© Ù„Ù„Ø£Ø±Ø´ÙŠÙ Ø§Ù„Ø®Ø§Øµ Ø¨Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© %(realname)s</title>
@@ -19,10 +19,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ca/admlogin.html
+Index: b/templates/ca/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ca/admlogin.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/ca/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ca/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/ca/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -36,10 +36,10 @@
  %(message)s  
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ca/private.html
+Index: b/templates/ca/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ca/private.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/ca/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ca/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/ca/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -53,10 +53,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/cs/admlogin.html
+Index: b/templates/cs/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/cs/admlogin.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/cs/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/cs/admlogin.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/cs/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -70,10 +70,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/cs/private.html
+Index: b/templates/cs/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/cs/private.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/cs/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/cs/private.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/cs/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -87,10 +87,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/da/admlogin.html
+Index: b/templates/da/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/da/admlogin.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/da/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/da/admlogin.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/da/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -104,10 +104,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/da/private.html
+Index: b/templates/da/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/da/private.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/da/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/da/private.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/da/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -121,10 +121,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/de/admlogin.html
+Index: b/templates/de/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/de/admlogin.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/de/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/de/admlogin.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/de/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -138,10 +138,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/de/private.html
+Index: b/templates/de/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/de/private.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/de/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/de/private.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/de/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -155,10 +155,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/en/admlogin.html
+Index: b/templates/en/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/en/admlogin.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/en/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/en/admlogin.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/en/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -172,10 +172,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/en/listinfo.html
+Index: b/templates/en/listinfo.html
 ===================================================================
---- mailman-2.1.12.orig/templates/en/listinfo.html	2009-03-02 20:50:14.000000000 +0100
-+++ mailman-2.1.12/templates/en/listinfo.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/en/listinfo.html	2010-05-24 17:51:09.000000000 +0200
++++ b/templates/en/listinfo.html	2010-05-24 17:51:16.000000000 +0200
 @@ -4,7 +4,7 @@
      <TITLE><MM-List-Name> Info Page</TITLE>
    
@@ -185,10 +185,10 @@
  
      <P>
        <TABLE COLS="1" BORDER="0" CELLSPACING="4" CELLPADDING="5">
-Index: mailman-2.1.12/templates/en/private.html
+Index: b/templates/en/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/en/private.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/en/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/en/private.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/en/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -202,10 +202,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/es/admlogin.html
+Index: b/templates/es/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/es/admlogin.html	2009-03-02 20:41:39.000000000 +0100
-+++ mailman-2.1.12/templates/es/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/es/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/es/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -219,10 +219,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/es/private.html
+Index: b/templates/es/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/es/private.html	2009-03-02 20:41:39.000000000 +0100
-+++ mailman-2.1.12/templates/es/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/es/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/es/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -236,10 +236,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/et/admlogin.html
+Index: b/templates/et/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/et/admlogin.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/et/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/et/admlogin.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/et/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -253,10 +253,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/et/private.html
+Index: b/templates/et/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/et/private.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/et/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/et/private.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/et/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -270,10 +270,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/eu/admlogin.html
+Index: b/templates/eu/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/eu/admlogin.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/eu/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/eu/admlogin.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/eu/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -287,10 +287,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/eu/private.html
+Index: b/templates/eu/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/eu/private.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/eu/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/eu/private.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/eu/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -304,10 +304,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/fi/admlogin.html
+Index: b/templates/fi/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/fi/admlogin.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/fi/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/fi/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/fi/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -2,9 +2,10 @@
  <html>
  <head>
@@ -321,10 +321,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/fi/private.html
+Index: b/templates/fi/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/fi/private.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/fi/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/fi/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/fi/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -2,9 +2,10 @@
  <html>
  <head>
@@ -338,10 +338,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/fr/admlogin.html
+Index: b/templates/fr/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/fr/admlogin.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/fr/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/fr/admlogin.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/fr/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -355,10 +355,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/fr/private.html
+Index: b/templates/fr/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/fr/private.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/fr/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/fr/private.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/fr/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -2,9 +2,10 @@
  <head>
      <title>Authentification pour l'acc&egrave;s aux archives priv&eacute;es de
@@ -372,10 +372,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/gl/admlogin.html
+Index: b/templates/gl/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/gl/admlogin.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/gl/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/gl/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/gl/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -389,10 +389,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/gl/private.html
+Index: b/templates/gl/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/gl/private.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/gl/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/gl/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/gl/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -406,10 +406,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/he/admlogin.html
+Index: b/templates/he/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/he/admlogin.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/he/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/he/admlogin.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/he/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -423,10 +423,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/he/private.html
+Index: b/templates/he/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/he/private.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/he/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/he/private.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/he/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -440,10 +440,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/hr/admlogin.html
+Index: b/templates/hr/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/hr/admlogin.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/hr/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/hr/admlogin.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/hr/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -457,10 +457,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/hr/private.html
+Index: b/templates/hr/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/hr/private.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/hr/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/hr/private.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/hr/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -474,10 +474,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/hu/admlogin.html
+Index: b/templates/hu/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/hu/admlogin.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/hu/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/hu/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/hu/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -491,10 +491,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/hu/private.html
+Index: b/templates/hu/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/hu/private.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/hu/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/hu/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/hu/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -508,10 +508,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ia/admlogin.html
+Index: b/templates/ia/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ia/admlogin.html	2009-03-02 20:41:44.000000000 +0100
-+++ mailman-2.1.12/templates/ia/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ia/admlogin.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/ia/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -525,10 +525,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ia/private.html
+Index: b/templates/ia/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ia/private.html	2009-03-02 20:41:44.000000000 +0100
-+++ mailman-2.1.12/templates/ia/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ia/private.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/ia/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -542,10 +542,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/it/admlogin.html
+Index: b/templates/it/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/it/admlogin.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/it/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/it/admlogin.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/it/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -559,10 +559,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/it/private.html
+Index: b/templates/it/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/it/private.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/it/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/it/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/it/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -576,10 +576,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ja/admlogin.html
+Index: b/templates/ja/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ja/admlogin.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/ja/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ja/admlogin.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/ja/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -593,10 +593,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ja/private.html
+Index: b/templates/ja/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ja/private.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/ja/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ja/private.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/ja/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -610,10 +610,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ko/admlogin.html
+Index: b/templates/ko/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ko/admlogin.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/ko/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ko/admlogin.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/ko/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -627,10 +627,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ko/private.html
+Index: b/templates/ko/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ko/private.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/ko/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ko/private.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/ko/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -644,10 +644,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/lt/admlogin.html
+Index: b/templates/lt/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/lt/admlogin.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/lt/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/lt/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/lt/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -661,10 +661,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/lt/private.html
+Index: b/templates/lt/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/lt/private.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/lt/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/lt/private.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/lt/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -678,10 +678,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/nl/admlogin.html
+Index: b/templates/nl/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/nl/admlogin.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/nl/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/nl/admlogin.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/nl/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -695,10 +695,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/nl/private.html
+Index: b/templates/nl/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/nl/private.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/nl/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/nl/private.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/nl/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -712,10 +712,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/no/admlogin.html
+Index: b/templates/no/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/no/admlogin.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/no/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/no/admlogin.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/no/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -729,10 +729,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/no/private.html
+Index: b/templates/no/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/no/private.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/no/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/no/private.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/no/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -746,10 +746,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/pl/admlogin.html
+Index: b/templates/pl/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/pl/admlogin.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/pl/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/pl/admlogin.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/pl/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -2,9 +2,10 @@
  <head>
    <title>Uwierzytelnienie %(who)s %(listname)s</title>
@@ -763,10 +763,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/pl/private.html
+Index: b/templates/pl/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/pl/private.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/pl/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/pl/private.html	2010-05-24 17:50:40.000000000 +0200
++++ b/templates/pl/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -780,10 +780,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/pt/admlogin.html
+Index: b/templates/pt/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/pt/admlogin.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/pt/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/pt/admlogin.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/pt/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -797,10 +797,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/pt/private.html
+Index: b/templates/pt/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/pt/private.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/pt/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/pt/private.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/pt/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -814,10 +814,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/pt_BR/admlogin.html
+Index: b/templates/pt_BR/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/pt_BR/admlogin.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/pt_BR/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/pt_BR/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/pt_BR/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -831,10 +831,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/pt_BR/private.html
+Index: b/templates/pt_BR/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/pt_BR/private.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/pt_BR/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/pt_BR/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/pt_BR/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -848,10 +848,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ro/admlogin.html
+Index: b/templates/ro/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ro/admlogin.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/ro/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ro/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/ro/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -2,9 +2,10 @@
  <head>
    <title>%(listname)s: Autentificare - %(who)s</title>
@@ -865,10 +865,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ro/private.html
+Index: b/templates/ro/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ro/private.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/ro/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ro/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/ro/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -2,9 +2,10 @@
  <head>
      <title>Autentificare la arhivele private %(realname)s</title>
@@ -882,10 +882,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ru/admlogin.html
+Index: b/templates/ru/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ru/admlogin.html	2009-03-02 20:41:39.000000000 +0100
-+++ mailman-2.1.12/templates/ru/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ru/admlogin.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/ru/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -899,10 +899,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/ru/private.html
+Index: b/templates/ru/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/ru/private.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/ru/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/ru/private.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/ru/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -916,10 +916,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/sk/admlogin.html
+Index: b/templates/sk/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sk/admlogin.html	2009-03-02 20:41:39.000000000 +0100
-+++ mailman-2.1.12/templates/sk/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/sk/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/sk/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -933,10 +933,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/sk/private.html
+Index: b/templates/sk/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sk/private.html	2009-03-02 20:41:39.000000000 +0100
-+++ mailman-2.1.12/templates/sk/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/sk/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/sk/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -950,10 +950,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/sl/admlogin.html
+Index: b/templates/sl/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sl/admlogin.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/sl/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/sl/admlogin.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/sl/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -967,10 +967,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/sl/private.html
+Index: b/templates/sl/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sl/private.html	2009-03-02 20:41:41.000000000 +0100
-+++ mailman-2.1.12/templates/sl/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/sl/private.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/sl/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -984,10 +984,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/sr/admlogin.html
+Index: b/templates/sr/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sr/admlogin.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/sr/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/sr/admlogin.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/sr/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,11 @@
  <html>
  <head>
@@ -1003,10 +1003,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/sr/private.html
+Index: b/templates/sr/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sr/private.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/sr/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/sr/private.html	2010-05-24 17:50:43.000000000 +0200
++++ b/templates/sr/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,11 @@
  ï»¿<html>
  <head>
@@ -1022,10 +1022,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/sv/admlogin.html
+Index: b/templates/sv/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sv/admlogin.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/sv/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/sv/admlogin.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/sv/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1039,10 +1039,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/sv/private.html
+Index: b/templates/sv/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/sv/private.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/sv/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/sv/private.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/sv/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1056,10 +1056,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/tr/admlogin.html
+Index: b/templates/tr/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/tr/admlogin.html	2009-03-02 20:41:44.000000000 +0100
-+++ mailman-2.1.12/templates/tr/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/tr/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/tr/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1073,10 +1073,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/tr/private.html
+Index: b/templates/tr/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/tr/private.html	2009-03-02 20:41:44.000000000 +0100
-+++ mailman-2.1.12/templates/tr/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/tr/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/tr/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1090,10 +1090,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/uk/admlogin.html
+Index: b/templates/uk/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/uk/admlogin.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/uk/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/uk/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/uk/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1107,10 +1107,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/uk/private.html
+Index: b/templates/uk/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/uk/private.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/uk/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/uk/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/uk/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1124,10 +1124,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/vi/admlogin.html
+Index: b/templates/vi/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/vi/admlogin.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/vi/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/vi/admlogin.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/vi/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1141,10 +1141,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/vi/private.html
+Index: b/templates/vi/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/vi/private.html	2009-03-02 20:41:42.000000000 +0100
-+++ mailman-2.1.12/templates/vi/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/vi/private.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/vi/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1158,10 +1158,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/zh_CN/admlogin.html
+Index: b/templates/zh_CN/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/zh_CN/admlogin.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/zh_CN/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/zh_CN/admlogin.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/zh_CN/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1175,10 +1175,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/zh_CN/private.html
+Index: b/templates/zh_CN/private.html
 ===================================================================
---- mailman-2.1.12.orig/templates/zh_CN/private.html	2009-03-02 20:41:40.000000000 +0100
-+++ mailman-2.1.12/templates/zh_CN/private.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/zh_CN/private.html	2010-05-24 17:50:41.000000000 +0200
++++ b/templates/zh_CN/private.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1192,10 +1192,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-Index: mailman-2.1.12/templates/zh_TW/admlogin.html
+Index: b/templates/zh_TW/admlogin.html
 ===================================================================
---- mailman-2.1.12.orig/templates/zh_TW/admlogin.html	2009-03-02 20:41:43.000000000 +0100
-+++ mailman-2.1.12/templates/zh_TW/admlogin.html	2009-03-02 20:50:26.000000000 +0100
+--- a/templates/zh_TW/admlogin.html	2010-05-24 17:50:42.000000000 +0200
++++ b/templates/zh_TW/admlogin.html	2010-05-24 17:51:16.000000000 +0200
 @@ -1,9 +1,10 @@
  <html>
  <head>


