[Pkg-mailman-hackers] Pkg-mailman commit - rev 608 - in trunk/debian: . patches

Mon Mar 2 19:55:23 UTC 2009

Author: thijs
Date: 2009-03-02 19:55:23 +0000 (Mon, 02 Mar 2009)
New Revision: 608

Removed:
   trunk/debian/patches/68_update_catalan.patch
   trunk/debian/patches/80_fix_string_search.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00_stolen_from_HEAD.patch
   trunk/debian/patches/01_defaults.debian.patch
   trunk/debian/patches/02_HyperDatabase_mapkeys.patch
   trunk/debian/patches/07_snooze.patch
   trunk/debian/patches/10_wrapper_uid.patch
   trunk/debian/patches/11_handle_propfind.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/30_pipermail_threads.patch
   trunk/debian/patches/32_MIME_fixup.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/62_new_list_bad_pending_requests.patch
   trunk/debian/patches/63_update_default_server_language.patch
   trunk/debian/patches/64_correct_html_nesting.patch
   trunk/debian/patches/65_handle_templates_directories.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/77_header_folding_in_attachments.patch
   trunk/debian/patches/78_DeprecationWarning.patch
   trunk/debian/patches/79_archiver_slash.patch
   trunk/debian/patches/99_js_templates.patch
   trunk/debian/patches/series
   trunk/debian/pyversions
Log:
* New upstream release.
  + Minimum Python version is now 2.4.
  + Patches 68_update_catalan and 80_fix_string_search are now
    incorporated upstream; refresh all others.


Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/changelog	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,3 +1,12 @@
+mailman (1:2.1.12-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    + Minimum Python version is now 2.4.
+    + Patches 68_update_catalan and 80_fix_string_search are now
+      incorporated upstream; refresh all others.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Mon, 02 Mar 2009 19:56:25 +0100
+
 mailman (1:2.1.11-11) unstable; urgency=high
 
   [ Debconf Translations ]

Modified: trunk/debian/patches/00_stolen_from_HEAD.patch
===================================================================
--- trunk/debian/patches/00_stolen_from_HEAD.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/00_stolen_from_HEAD.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,11 +1,11 @@
 Patch: 00_stolen_from_HEAD.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Handle empty queue files (Closes: #212643)
-Index: mailman-2.1.10/Mailman/Handlers/Scrubber.py
+Index: mailman-2.1.12/Mailman/Handlers/Scrubber.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Handlers/Scrubber.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Handlers/Scrubber.py	2008-06-15 18:49:38.000000000 +0200
-@@ -385,6 +385,8 @@
+--- mailman-2.1.12.orig/Mailman/Handlers/Scrubber.py	2009-03-02 20:41:57.000000000 +0100
++++ mailman-2.1.12/Mailman/Handlers/Scrubber.py	2009-03-02 20:49:54.000000000 +0100
+@@ -388,6 +388,8 @@
                      t = unicode(t, 'ascii', 'replace')
                  try:
                      # Should use HTML-Escape, or try generalizing to UTF-8

Modified: trunk/debian/patches/01_defaults.debian.patch
===================================================================
--- trunk/debian/patches/01_defaults.debian.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/01_defaults.debian.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +1,10 @@
 Patch: 01_defaults.debian.dpatch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Set sane defaults in Defaults.py.in
-Index: mailman-2.1.10/Mailman/Defaults.py.in
+Index: mailman-2.1.12/Mailman/Defaults.py.in
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Defaults.py.in	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Defaults.py.in	2008-06-15 18:49:39.000000000 +0200
+--- mailman-2.1.12.orig/Mailman/Defaults.py.in	2009-03-02 20:41:57.000000000 +0100
++++ mailman-2.1.12/Mailman/Defaults.py.in	2009-03-02 20:49:55.000000000 +0100
 @@ -54,7 +54,7 @@
  # disable Mailman's logo footer altogther, hack
  # Mailman/htmlformat.py:MailmanLogo(), which also contains the hardcoded links
@@ -23,7 +23,7 @@
  
  # DEFAULT_HOST_NAME has been replaced with DEFAULT_EMAIL_HOST, however some
  # sites may have the former in their mm_cfg.py files.  If so, we'll believe
-@@ -1323,7 +1323,7 @@
+@@ -1352,7 +1352,7 @@
  MAILDIR_DIR     = os.path.join(QUEUE_DIR, 'maildir')
  
  # Other useful files

Modified: trunk/debian/patches/02_HyperDatabase_mapkeys.patch
===================================================================
--- trunk/debian/patches/02_HyperDatabase_mapkeys.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/02_HyperDatabase_mapkeys.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +1,10 @@
 Patch: 02_HyperDatabase_mapkeys.patch
 Author: Lionel Elie Mamane <lmamane at debian.org>
 Added to support unicodify_archives (Closes: #412142)
-Index: mailman-2.1.10/Mailman/Archiver/HyperDatabase.py
+Index: mailman-2.1.12/Mailman/Archiver/HyperDatabase.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Archiver/HyperDatabase.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Archiver/HyperDatabase.py	2008-06-15 18:49:40.000000000 +0200
+--- mailman-2.1.12.orig/Mailman/Archiver/HyperDatabase.py	2009-03-02 20:41:56.000000000 +0100
++++ mailman-2.1.12/Mailman/Archiver/HyperDatabase.py	2009-03-02 20:49:56.000000000 +0100
 @@ -54,7 +54,7 @@
      SortedDictionary.
      """

Modified: trunk/debian/patches/07_snooze.patch
===================================================================
--- trunk/debian/patches/07_snooze.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/07_snooze.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +1,10 @@
 Patch: 07_snooze.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Snooze a bit to avoid eating too much CPU if you get an SMTP error (Closes: #175173)
-Index: mailman-2.1.10/Mailman/Queue/OutgoingRunner.py
+Index: mailman-2.1.12/Mailman/Queue/OutgoingRunner.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Queue/OutgoingRunner.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Queue/OutgoingRunner.py	2008-06-15 18:49:40.000000000 +0200
+--- mailman-2.1.12.orig/Mailman/Queue/OutgoingRunner.py	2009-03-02 20:41:56.000000000 +0100
++++ mailman-2.1.12/Mailman/Queue/OutgoingRunner.py	2009-03-02 20:49:57.000000000 +0100
 @@ -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	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/10_wrapper_uid.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +1,10 @@
 Patch: 10_wrapper_uid.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Makes sure we're called with the right UID and GID (Closes: #36010, #89564, #89848, 89818)
-Index: mailman-2.1.10/src/cgi-wrapper.c
+Index: mailman-2.1.12/src/cgi-wrapper.c
 ===================================================================
---- mailman-2.1.10.orig/src/cgi-wrapper.c	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/src/cgi-wrapper.c	2008-12-10 22:39:41.989031204 +0100
+--- mailman-2.1.12.orig/src/cgi-wrapper.c	2009-03-02 20:41:55.000000000 +0100
++++ mailman-2.1.12/src/cgi-wrapper.c	2009-03-02 20:49:59.000000000 +0100
 @@ -42,7 +42,8 @@
          char* fake_argv[3];
  
@@ -15,10 +15,10 @@
  
          /* For these CGI programs, we can ignore argc and argv since they
           * don't contain anything useful.  `script' will always be the driver
-Index: mailman-2.1.10/src/mail-wrapper.c
+Index: mailman-2.1.12/src/mail-wrapper.c
 ===================================================================
---- mailman-2.1.10.orig/src/mail-wrapper.c	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/src/mail-wrapper.c	2008-12-10 22:37:24.589031857 +0100
+--- mailman-2.1.12.orig/src/mail-wrapper.c	2009-03-02 20:41:56.000000000 +0100
++++ mailman-2.1.12/src/mail-wrapper.c	2009-03-02 20:49:59.000000000 +0100
 @@ -74,7 +74,8 @@
                  fatal(logident, MAIL_ILLEGAL_COMMAND,
                        "Illegal command: %s", argv[1]);

Modified: trunk/debian/patches/11_handle_propfind.patch
===================================================================
--- trunk/debian/patches/11_handle_propfind.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/11_handle_propfind.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -3,11 +3,11 @@
 Submitted upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1578756&group_id=103&atid=300103
 Don't fall flat on our face if we get a request type which we
 don't understand (Closes: #202821)
-Index: mailman-2.1.10/scripts/driver
+Index: mailman-2.1.12/scripts/driver
 ===================================================================
---- mailman-2.1.10.orig/scripts/driver	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/scripts/driver	2008-06-15 18:49:41.000000000 +0200
-@@ -95,6 +95,15 @@
+--- mailman-2.1.12.orig/scripts/driver	2009-03-02 20:41:55.000000000 +0100
++++ mailman-2.1.12/scripts/driver	2009-03-02 20:50:00.000000000 +0100
+@@ -98,6 +98,15 @@
          module = getattr(pkg, scriptname)
          main = getattr(module, 'main')
          try:

Modified: trunk/debian/patches/15_mailmanctl_daemonize.patch
===================================================================
--- trunk/debian/patches/15_mailmanctl_daemonize.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/15_mailmanctl_daemonize.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +1,10 @@
 Patch: 15_mailmanctl_daemonize.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Daemonize mailmanctl properly (Closes: #175175)
-Index: mailman-2.1.10/bin/mailmanctl
+Index: mailman-2.1.12/bin/mailmanctl
 ===================================================================
---- mailman-2.1.10.orig/bin/mailmanctl	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/bin/mailmanctl	2008-06-15 18:49:42.000000000 +0200
+--- mailman-2.1.12.orig/bin/mailmanctl	2009-03-02 20:41:55.000000000 +0100
++++ mailman-2.1.12/bin/mailmanctl	2009-03-02 20:50:01.000000000 +0100
 @@ -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	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/16_update_debian.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -2,11 +2,11 @@
 Author: Tollef Fog Heen <tfheen at debian.org>
 update is called from the Debian maintainer scripts and
 prints non-appropriate output.  Change that.
-Index: mailman-2.1.10/bin/update
+Index: mailman-2.1.12/bin/update
 ===================================================================
---- mailman-2.1.10.orig/bin/update	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/bin/update	2008-06-15 18:49:43.000000000 +0200
-@@ -300,8 +300,7 @@
+--- mailman-2.1.12.orig/bin/update	2009-03-02 20:41:54.000000000 +0100
++++ mailman-2.1.12/bin/update	2009-03-02 20:50:02.000000000 +0100
+@@ -299,8 +299,7 @@
          else:
              # directory
              print _("""\
@@ -16,7 +16,7 @@
  
  
      #
-@@ -323,8 +322,7 @@
+@@ -322,8 +321,7 @@
          %(newname)s""")
          else: # directory
              print _("""\
@@ -26,7 +26,7 @@
  
      #
      # move the html archives there
-@@ -338,37 +338,6 @@
+@@ -337,37 +335,6 @@
      # BAW: Is this still necessary?!
      mlist.Save()
      #
@@ -64,7 +64,7 @@
      #
      # Move all the templates to the en language subdirectory as required for
      # Mailman 2.1
-@@ -656,12 +629,12 @@
+@@ -666,12 +633,12 @@
                  'Mailman/HyperDatabase.py', 'Mailman/pipermail.py',
                  'Mailman/smtplib.py', 'Mailman/Cookie.py',
                  'bin/update_to_10b6', 'scripts/mailcmd',

Modified: trunk/debian/patches/20_qmail_to_mailman.debian.patch
===================================================================
--- trunk/debian/patches/20_qmail_to_mailman.debian.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/20_qmail_to_mailman.debian.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +1,10 @@
 Patch: 20_qmail_to_mailman.debian.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Fix some paths in the qmail_to_mailman wrapper (Closes: #217573)
-Index: mailman-2.1.10/contrib/qmail-to-mailman.py
+Index: mailman-2.1.12/contrib/qmail-to-mailman.py
 ===================================================================
---- mailman-2.1.10.orig/contrib/qmail-to-mailman.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/contrib/qmail-to-mailman.py	2008-06-15 18:49:43.000000000 +0200
+--- mailman-2.1.12.orig/contrib/qmail-to-mailman.py	2009-03-02 20:41:54.000000000 +0100
++++ mailman-2.1.12/contrib/qmail-to-mailman.py	2009-03-02 20:50:03.000000000 +0100
 @@ -28,12 +28,12 @@
  #
  # INSTALLATION:

Modified: trunk/debian/patches/21_newlist_help.patch
===================================================================
--- trunk/debian/patches/21_newlist_help.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/21_newlist_help.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,11 +1,11 @@
 Patch: 21_newlist_help.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 make newlist be a bit friendlier (Closes: #309339, #170362)
-Index: mailman-2.1.10/bin/newlist
+Index: mailman-2.1.12/bin/newlist
 ===================================================================
---- mailman-2.1.10.orig/bin/newlist	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/bin/newlist	2008-06-15 18:49:44.000000000 +0200
-@@ -87,6 +87,9 @@
+--- mailman-2.1.12.orig/bin/newlist	2009-03-02 20:41:54.000000000 +0100
++++ mailman-2.1.12/bin/newlist	2009-03-02 20:50:04.000000000 +0100
+@@ -88,12 +88,16 @@
  defined in your Defaults.py file or overridden by settings in mm_cfg.py).
  
  Note that listnames are forced to lowercase.
@@ -15,10 +15,9 @@
  """
  
  import sys
-@@ -94,6 +97,7 @@
+ import os
  import getpass
  import getopt
- import sha
 +import grp
  
  import paths

Modified: trunk/debian/patches/30_pipermail_threads.patch
===================================================================
--- trunk/debian/patches/30_pipermail_threads.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/30_pipermail_threads.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +1,10 @@
 Patch: 30_pipermail_threads.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Pipermail non-appropriate output, change that (Closes: #167758)
-Index: mailman-2.1.10/Mailman/Archiver/pipermail.py
+Index: mailman-2.1.12/Mailman/Archiver/pipermail.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Archiver/pipermail.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Archiver/pipermail.py	2008-06-15 18:49:44.000000000 +0200
+--- mailman-2.1.12.orig/Mailman/Archiver/pipermail.py	2009-03-02 20:41:53.000000000 +0100
++++ mailman-2.1.12/Mailman/Archiver/pipermail.py	2009-03-02 20:50:05.000000000 +0100
 @@ -122,9 +122,9 @@
          parentID = article.parentID
          if parentID is not None and self.articleIndex.has_key(parentID):

Modified: trunk/debian/patches/32_MIME_fixup.patch
===================================================================
--- trunk/debian/patches/32_MIME_fixup.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/32_MIME_fixup.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,11 +1,11 @@
 Patch: 32_MIME_fixup.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Handle empty queue files (Closes: #223906)
-Index: mailman-2.1.10/Mailman/Handlers/Decorate.py
+Index: mailman-2.1.12/Mailman/Handlers/Decorate.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Handlers/Decorate.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Handlers/Decorate.py	2008-06-15 18:49:45.000000000 +0200
-@@ -191,6 +191,7 @@
+--- mailman-2.1.12.orig/Mailman/Handlers/Decorate.py	2009-03-02 20:41:53.000000000 +0100
++++ mailman-2.1.12/Mailman/Handlers/Decorate.py	2009-03-02 20:50:06.000000000 +0100
+@@ -205,6 +205,7 @@
      del msg['content-transfer-encoding']
      del msg['content-disposition']
      msg['Content-Type'] = 'multipart/mixed'

Modified: trunk/debian/patches/51_nocompile.pyc.patch
===================================================================
--- trunk/debian/patches/51_nocompile.pyc.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/51_nocompile.pyc.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +1,10 @@
 Patch: 51_nocompile.pyc.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Don't do the compileall dance.  It'll just waste CPU cycles.
-Index: mailman-2.1.10/Makefile.in
+Index: mailman-2.1.12/Makefile.in
 ===================================================================
---- mailman-2.1.10.orig/Makefile.in	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Makefile.in	2008-06-15 18:49:46.000000000 +0200
+--- mailman-2.1.12.orig/Makefile.in	2009-03-02 20:41:52.000000000 +0100
++++ mailman-2.1.12/Makefile.in	2009-03-02 20:50:07.000000000 +0100
 @@ -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	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/52_check_perms_lstat.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +1,10 @@
 Patch: 52_check_perms_lstat.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Use lstat instead of stat in check_perms
-Index: mailman-2.1.10/bin/check_perms
+Index: mailman-2.1.12/bin/check_perms
 ===================================================================
---- mailman-2.1.10.orig/bin/check_perms	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/bin/check_perms	2008-06-15 18:49:46.000000000 +0200
+--- mailman-2.1.12.orig/bin/check_perms	2009-03-02 20:41:52.000000000 +0100
++++ mailman-2.1.12/bin/check_perms	2009-03-02 20:50:08.000000000 +0100
 @@ -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	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/53_disable_addons.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +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.
-Index: mailman-2.1.10/misc/Makefile.in
+Index: mailman-2.1.12/misc/Makefile.in
 ===================================================================
---- mailman-2.1.10.orig/misc/Makefile.in	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/misc/Makefile.in	2008-06-15 18:49:47.000000000 +0200
+--- mailman-2.1.12.orig/misc/Makefile.in	2009-03-02 20:41:52.000000000 +0100
++++ mailman-2.1.12/misc/Makefile.in	2009-03-02 20:50:09.000000000 +0100
 @@ -57,7 +57,10 @@
  JACODECSPKG=	JapaneseCodecs-1.4.11
  KOCODECSPKG=	KoreanCodecs-2.0.5
@@ -17,11 +17,11 @@
  
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
-Index: mailman-2.1.10/misc/paths.py.in
+Index: mailman-2.1.12/misc/paths.py.in
 ===================================================================
---- mailman-2.1.10.orig/misc/paths.py.in	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/misc/paths.py.in	2008-06-15 18:49:47.000000000 +0200
-@@ -71,13 +71,19 @@
+--- mailman-2.1.12.orig/misc/paths.py.in	2009-03-02 20:41:52.000000000 +0100
++++ mailman-2.1.12/misc/paths.py.in	2009-03-02 20:50:09.000000000 +0100
+@@ -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.
  if not jaok:

Modified: trunk/debian/patches/59_fix_missing_language_crash.patch
===================================================================
--- trunk/debian/patches/59_fix_missing_language_crash.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/59_fix_missing_language_crash.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -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.10/Mailman/htmlformat.py
+Index: mailman-2.1.12/Mailman/htmlformat.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/htmlformat.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/htmlformat.py	2008-06-15 18:49:48.000000000 +0200
+--- 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
 @@ -298,7 +298,7 @@
  
      def Format(self, indent=0, **kws):

Modified: trunk/debian/patches/62_new_list_bad_pending_requests.patch
===================================================================
--- trunk/debian/patches/62_new_list_bad_pending_requests.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/62_new_list_bad_pending_requests.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -2,10 +2,10 @@
 Author: Richard Mortimer <richm at oldelvet.org.uk>
 Only mail 'pending admin requests' if the database for the
 particular list exists, so we do not send out '-1' requests.
-Index: mailman-2.1.10/Mailman/ListAdmin.py
+Index: mailman-2.1.12/Mailman/ListAdmin.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/ListAdmin.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/ListAdmin.py	2008-06-15 18:49:49.000000000 +0200
+--- mailman-2.1.12.orig/Mailman/ListAdmin.py	2009-03-02 20:41:51.000000000 +0100
++++ mailman-2.1.12/Mailman/ListAdmin.py	2009-03-02 20:50:12.000000000 +0100
 @@ -130,8 +130,11 @@
  
      def NumRequestsPending(self):

Modified: trunk/debian/patches/63_update_default_server_language.patch
===================================================================
--- trunk/debian/patches/63_update_default_server_language.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/63_update_default_server_language.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -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.10/bin/update
+Index: mailman-2.1.12/bin/update
 ===================================================================
---- mailman-2.1.10.orig/bin/update	2008-06-15 18:49:43.000000000 +0200
-+++ mailman-2.1.10/bin/update	2008-06-15 18:49:50.000000000 +0200
-@@ -121,7 +121,7 @@
+--- 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 @@
      #
      # 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:
-@@ -155,14 +155,14 @@
+@@ -154,14 +154,14 @@
                  os.unlink(os.path.join(mlist.fullpath(), gtemplate + '.prev'))
          # Match against the lists/<list>/en/* templates
          try:
@@ -24,7 +24,7 @@
          except IOError, e:
              if e.errno <> errno.ENOENT: raise
          else:
-             tcksum = md5.new(fp.read()).digest()
+             tcksum = Utils.md5_new(fp.read()).digest()
              fp.close()
              if gcksum == tcksum:
 -                os.unlink(os.path.join(mlist.fullpath(), 'en', gtemplate))

Modified: trunk/debian/patches/64_correct_html_nesting.patch
===================================================================
--- trunk/debian/patches/64_correct_html_nesting.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/64_correct_html_nesting.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -3,9 +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
-diff -Nur mailman-2.1.11.orig/templates/ca/listinfo.html mailman-2.1.11/templates/ca/listinfo.html
---- mailman-2.1.11.orig/templates/ca/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ca/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -62,8 +62,8 @@
  	  <P>
  	    Ompliu el formulari seg&uuml;ent per a
@@ -16,9 +17,10 @@
  
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
-diff -Nur mailman-2.1.11.orig/templates/cs/listinfo.html mailman-2.1.11/templates/cs/listinfo.html
---- mailman-2.1.11.orig/templates/cs/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/cs/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	<td colspan="2">
  	  <P>
@@ -29,9 +31,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/da/listinfo.html mailman-2.1.11/templates/da/listinfo.html
---- mailman-2.1.11.orig/templates/da/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/da/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -62,8 +62,8 @@
  	<td colspan="2">
  	  <P>
@@ -42,9 +45,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/de/listinfo.html mailman-2.1.11/templates/de/listinfo.html
---- mailman-2.1.11.orig/templates/de/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/de/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	  <P>
  	    Abonnieren Sie <MM-List-Name>, indem Sie das folgende Formular
@@ -55,9 +59,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/en/listinfo.html mailman-2.1.11/templates/en/listinfo.html
---- mailman-2.1.11.orig/templates/en/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/en/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	  <P>
  	    Subscribe to <MM-List-Name> by filling out the following
@@ -68,9 +73,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/es/listinfo.html mailman-2.1.11/templates/es/listinfo.html
---- mailman-2.1.11.orig/templates/es/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/es/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -64,8 +64,8 @@
  	  <P>
  	    Suscr&iacute;base a <MM-List-Name> rellenando los datos del
@@ -81,9 +87,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/et/listinfo.html mailman-2.1.11/templates/et/listinfo.html
---- mailman-2.1.11.orig/templates/et/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/et/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -58,8 +58,8 @@
  	<td colspan="2">
  	  <P>
@@ -94,9 +101,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/eu/listinfo.html mailman-2.1.11/templates/eu/listinfo.html
---- mailman-2.1.11.orig/templates/eu/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/eu/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -62,8 +62,8 @@
  	<td colspan="2">
  	  <P>
@@ -107,9 +115,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/fi/listinfo.html mailman-2.1.11/templates/fi/listinfo.html
---- mailman-2.1.11.orig/templates/fi/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/fi/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	<td colspan="2">
  	  <P>
@@ -120,9 +129,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/fr/listinfo.html mailman-2.1.11/templates/fr/listinfo.html
---- mailman-2.1.11.orig/templates/fr/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/fr/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -61,8 +61,8 @@
        <p> 	    
  	Abonnez-vous &agrave; <MM-List-Name> en remplissant le formulaire 
@@ -133,9 +143,10 @@
          <table border="0" cellspacing="2" cellpadding="2" width="70%"
   height="112">
              <tr>
-diff -Nur mailman-2.1.11.orig/templates/hr/listinfo.html mailman-2.1.11/templates/hr/listinfo.html
---- mailman-2.1.11.orig/templates/hr/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/hr/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	  <P>
  	    Pretplatite se na <MM-List-Name> ispunjavanjem sljedeæe 
@@ -146,9 +157,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/hu/listinfo.html mailman-2.1.11/templates/hu/listinfo.html
---- mailman-2.1.11.orig/templates/hu/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/hu/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -59,11 +59,10 @@
  	<td colspan="2">
  	  <P>
@@ -162,9 +174,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/it/listinfo.html mailman-2.1.11/templates/it/listinfo.html
---- mailman-2.1.11.orig/templates/it/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/it/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	<td colspan="2">
  	  <P>
@@ -175,9 +188,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/ja/listinfo.html mailman-2.1.11/templates/ja/listinfo.html
---- mailman-2.1.11.orig/templates/ja/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ja/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -65,8 +65,8 @@
  	  <P>
  	    <MM-List-Name> ¤Ø¤ÎÆþ²ñ¤Ï, 
@@ -188,9 +202,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/ko/listinfo.html mailman-2.1.11/templates/ko/listinfo.html
---- mailman-2.1.11.orig/templates/ko/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ko/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	<td colspan="2">
  	  <P>
@@ -201,9 +216,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/lt/listinfo.html mailman-2.1.11/templates/lt/listinfo.html
---- mailman-2.1.11.orig/templates/lt/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/lt/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -61,8 +61,8 @@
  	<td colspan="2">
  	  <P>
@@ -214,9 +230,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/nl/listinfo.html mailman-2.1.11/templates/nl/listinfo.html
---- mailman-2.1.11.orig/templates/nl/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/nl/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -59,8 +59,8 @@
  	<td colspan="2">
  	  <P>
@@ -227,9 +244,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/no/listinfo.html mailman-2.1.11/templates/no/listinfo.html
---- mailman-2.1.11.orig/templates/no/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/no/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -62,8 +62,8 @@
  	<td colspan="2">
  	  <P>
@@ -240,9 +258,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/pl/listinfo.html mailman-2.1.11/templates/pl/listinfo.html
---- mailman-2.1.11.orig/templates/pl/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/pl/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	  <P>
            Wype³nij poni¿szy formularz, by zapisaæ siê na listê <MM-List-Name>.
@@ -253,9 +272,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/pt/listinfo.html mailman-2.1.11/templates/pt/listinfo.html
---- mailman-2.1.11.orig/templates/pt/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/pt/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	<td colspan="2">
  	  <P>
@@ -266,9 +286,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/pt_BR/listinfo.html mailman-2.1.11/templates/pt_BR/listinfo.html
---- mailman-2.1.11.orig/templates/pt_BR/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/pt_BR/listinfo.html	2008-07-07 23:19:21.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	  <P>
  	    Para se inscrever na lista <MM-List-Name>, preencha o seguinte
@@ -279,9 +300,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/ro/listinfo.html mailman-2.1.11/templates/ro/listinfo.html
---- mailman-2.1.11.orig/templates/ro/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ro/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -60,8 +60,8 @@
  	  <P>
  	    Vã puteþi abona la lista de discuþii <MM-List-Name> completând formularul
@@ -292,9 +314,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/ru/listinfo.html mailman-2.1.11/templates/ru/listinfo.html
---- mailman-2.1.11.orig/templates/ru/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ru/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -51,8 +51,8 @@
          <td colspan="2">
            <P>
@@ -305,9 +328,10 @@
                <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
                  WIDTH="70%" HEIGHT= "112">
                  <TR>
-diff -Nur mailman-2.1.11.orig/templates/sl/listinfo.html mailman-2.1.11/templates/sl/listinfo.html
---- mailman-2.1.11.orig/templates/sl/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sl/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	  <P>
  	    Na seznam <MM-List-Name> se prijavite tako, da izpolnite
@@ -318,9 +342,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/sr/listinfo.html mailman-2.1.11/templates/sr/listinfo.html
---- mailman-2.1.11.orig/templates/sr/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sr/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -52,8 +52,9 @@
        </TR>
        <tr>
@@ -332,9 +357,10 @@
          <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
            <TR> 
-diff -Nur mailman-2.1.11.orig/templates/sv/listinfo.html mailman-2.1.11/templates/sv/listinfo.html
---- mailman-2.1.11.orig/templates/sv/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sv/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -56,8 +56,9 @@
        </TR>
        <tr>
@@ -346,9 +372,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/tr/listinfo.html mailman-2.1.11/templates/tr/listinfo.html
---- mailman-2.1.11.orig/templates/tr/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/tr/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -63,8 +63,8 @@
  	  <P>
  	    <MM-List-Name> listesine aþaðýdaki formu doldurarak üye
@@ -359,9 +386,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/uk/listinfo.html mailman-2.1.11/templates/uk/listinfo.html
---- mailman-2.1.11.orig/templates/uk/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/uk/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -62,8 +62,8 @@
  	<td colspan="2">
  	  <P>
@@ -372,9 +400,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/zh_CN/listinfo.html mailman-2.1.11/templates/zh_CN/listinfo.html
---- mailman-2.1.11.orig/templates/zh_CN/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/zh_CN/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -60,8 +60,8 @@
  	<td colspan="2">
  	  <P>
@@ -385,9 +414,10 @@
  	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
  		<TR>
-diff -Nur mailman-2.1.11.orig/templates/zh_TW/listinfo.html mailman-2.1.11/templates/zh_TW/listinfo.html
---- mailman-2.1.11.orig/templates/zh_TW/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/zh_TW/listinfo.html	2008-07-07 23:18:36.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -60,8 +60,8 @@
  	<td colspan="2">
  	  <P>

Modified: trunk/debian/patches/65_handle_templates_directories.patch
===================================================================
--- trunk/debian/patches/65_handle_templates_directories.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/65_handle_templates_directories.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,11 +1,11 @@
 Patch: 65_handle_templates_directories.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Skip directories when updating (Closes: #284771)
-Index: mailman-2.1.10/bin/update
+Index: mailman-2.1.12/bin/update
 ===================================================================
---- mailman-2.1.10.orig/bin/update	2008-06-15 18:49:50.000000000 +0200
-+++ mailman-2.1.10/bin/update	2008-06-15 18:49:52.000000000 +0200
-@@ -127,7 +127,7 @@
+--- mailman-2.1.12.orig/bin/update	2009-03-02 20:50:13.000000000 +0100
++++ mailman-2.1.12/bin/update	2009-03-02 20:50:17.000000000 +0100
+@@ -126,7 +126,7 @@
          try:
              fp = open(os.path.join(mm_cfg.TEMPLATE_DIR, gtemplate))
          except IOError, e:

Modified: trunk/debian/patches/66_donot_let_cache_html_pages.patch
===================================================================
--- trunk/debian/patches/66_donot_let_cache_html_pages.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/66_donot_let_cache_html_pages.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -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.10/Mailman/htmlformat.py
+Index: mailman-2.1.12/Mailman/htmlformat.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/htmlformat.py	2008-06-15 18:49:48.000000000 +0200
-+++ mailman-2.1.10/Mailman/htmlformat.py	2008-06-15 18:49:52.000000000 +0200
+--- 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
 @@ -300,7 +300,8 @@
          charset = 'us-ascii'
          if self.language and Utils.IsLanguage(self.language):

Deleted: trunk/debian/patches/68_update_catalan.patch
===================================================================
--- trunk/debian/patches/68_update_catalan.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/68_update_catalan.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,124 +0,0 @@
-Patch: 68_update_catalan.patch
-Author: Jordi Mallach <jordi at debian.org>
-Update Catalan translation (Closes: #492297)
-Applied upstream.
---- mailman-2.1.11.orig/messages/ca/LC_MESSAGES/mailman.po	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/messages/ca/LC_MESSAGES/mailman.po	2008-08-07 13:29:17.000000000 +0200
-@@ -1630,7 +1630,7 @@
- "            subscribed."
- msgstr ""
- "%(newaddr)s ja estÃ  subscrita a\n"
--"            la llista %(realname). Pot ser que estigueu intentant confirmar\n"
-+"            la llista %(realname)s. Pot ser que estigueu intentant confirmar\n"
- "            una solÂ·licitud per a una adreÃ§a que ja ha estat subscrita."
- 
- #: Mailman/Cgi/confirm.py:541
-@@ -2201,7 +2201,7 @@
- "            %(mailmanlink)s mailing lists on %(hostname)s."
- msgstr ""
- "<p>Actualment no hi ha llistes de correu %(mailmanlink)s\n"
--"            pÃºbliques a (hostname)s."
-+"            pÃºbliques a %(hostname)s."
- 
- #: Mailman/Cgi/listinfo.py:110
- msgid ""
-@@ -2381,7 +2381,7 @@
- msgstr ""
- "%(newaddr)s tÃ© l'accÃ©s prohibit a la llista de correu.\n"
- "                      Si penseu que la restricciÃ³ Ã©s errÃ²nia,\n"
--"                      contacteu amb el propietari de la llista a %(listowner)s."
-+"                      contacteu amb el propietari de la llista a %(owneraddr)s."
- 
- #: Mailman/Cgi/options.py:417
- msgid "Member name successfully changed. "
-@@ -2945,7 +2945,7 @@
- msgstr ""
- "L'adreÃ§a de correu electrÃ²nic que has donat tÃ© l'accÃ©s prohibit a la llista de correu.\n"
- "Si penses que la restricciÃ³ Ã©s errÃ²nia, per favor,\n"
--"contacte amb l'amo de la llista a %(listowner)s."
-+"contacte amb l'amo de la llista a %(owneraddr)s."
- 
- #: Mailman/Commands/cmd_confirm.py:74
- msgid ""
-@@ -6452,7 +6452,7 @@
- "                rule will be ignored."
- msgstr ""
- "El patrÃ³ de filtre de capÃ§alera\n"
--"                Â«%(pattern)sÂ» no Ã©s una expressiÃ³ regular vÃ lida. S'ignorarÃ e\n"
-+"                Â«%(safepattern)sÂ» no Ã©s una expressiÃ³ regular vÃ lida. S'ignorarÃ e\n"
- "                la regla."
- 
- #: Mailman/Gui/Topics.py:36
-@@ -6573,7 +6573,7 @@
- "The topic pattern '%(safepattern)s' is not a\n"
- "                legal regular expression.  It will be discarded."
- msgstr ""
--"El patrÃ³ de tema Â«%(pattern)sÂ» no Ã©s\n"
-+"El patrÃ³ de tema Â«%(safepattern)sÂ» no Ã©s\n"
- "                una expressiÃ³ regular vÃ lida. Es descartarÃ ."
- 
- #: Mailman/Gui/Usenet.py:25
-@@ -7508,7 +7508,7 @@
- 
- #: Mailman/MailList.py:1024
- msgid "%(realname)s unsubscribe notification"
--msgstr "NotificaciÃ³ de la cancelÂ·laciÃ³ de la subscripciÃ³ a %(realname)"
-+msgstr "NotificaciÃ³ de la cancelÂ·laciÃ³ de la subscripciÃ³ a %(realname)s"
- 
- #: Mailman/MailList.py:1214
- msgid "subscriptions to %(name)s require administrator approval"
-@@ -11088,7 +11088,7 @@
- #: cron/checkdbs:123
- #, fuzzy
- msgid "%(realname)s moderator request check result"
--msgstr "%(count)d %(realname)s peticions de moderador en espera "
-+msgstr "%(realname)s peticions de moderador en espera "
- 
- #: cron/checkdbs:143
- msgid "Pending subscriptions:"
---- mailman-2.1.11.orig/templates/ca/listinfo.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ca/listinfo.html	2008-08-07 13:26:15.000000000 +0200
-@@ -102,7 +102,7 @@
-       <tr>
-         <TD BGCOLOR="#dddddd">En quina llengua voleu
- que es mostrin els vostres missatges?</TD>
--        <TD>  </TD></TR>
-+        <TD> <MM-list-langs></TD></TR>
-       <mm-digest-question-start>
-       <tr>
- 	<td>Voleu rebre el correu de la llista compilat en un sol missatge enviat a diari?
---- mailman-2.1.11.orig/templates/ca/masthead.txt	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ca/masthead.txt	2008-08-07 13:26:15.000000000 +0200
-@@ -1,4 +1,4 @@
--Envieu les aportacions de %(real_name) a la llista de correu a
-+Envieu les aportacions de %(real_name)s a la llista de correu a
- 	%(got_list_email)s
- 
- Per a subscriure-us o cancelÂ·lar subscripcions a travÃ©s de la web, aneu
---- mailman-2.1.11.orig/templates/ca/nomoretoday.txt	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ca/nomoretoday.txt	2008-08-07 13:29:46.000000000 +0200
-@@ -1,6 +1,6 @@
- S'ha rebut un missatge de la vostra adreÃ§a Â«%(sender)sÂ» amb una
- solÂ·licitud de resposta automÃ tica de la llista de correu %(listname)s.
--Avui ja s'han rebut %(num) missatges com aquest des de la vostra adreÃ§a.
-+Avui ja s'han rebut %(num)s missatges com aquest des de la vostra adreÃ§a.
- Per a evitar problemes com ara bucles de correu entre els robots de
- correu, avui no se us enviarÃ  cap mÃ©s resposta de correu.  Torneu-ho a
- intentar demÃ .
---- mailman-2.1.11.orig/templates/ca/postack.txt	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ca/postack.txt	2008-08-07 13:26:15.000000000 +0200
-@@ -1,4 +1,4 @@
--La llista de correu %(listname) ha rebut correctament el vostre missatge
-+La llista de correu %(listname)s ha rebut correctament el vostre missatge
- anomenat
- 
-     %(subject)s
---- mailman-2.1.11.orig/templates/ca/refuse.txt	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ca/refuse.txt	2008-08-07 13:30:15.000000000 +0200
-@@ -1,5 +1,5 @@
- El moderador de la llista ha rebutjat la vostra solÂ·licitud a la llista
--de correu %(listname):
-+de correu %(listname)s:
- 
-     %(request)s
- 

Modified: trunk/debian/patches/70_invalid_utf8_dos.patch
===================================================================
--- trunk/debian/patches/70_invalid_utf8_dos.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/70_invalid_utf8_dos.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -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.10/Mailman/Handlers/Scrubber.py
+Index: mailman-2.1.12/Mailman/Handlers/Scrubber.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Handlers/Scrubber.py	2008-06-15 18:49:38.000000000 +0200
-+++ mailman-2.1.10/Mailman/Handlers/Scrubber.py	2008-06-15 18:49:54.000000000 +0200
-@@ -317,7 +317,10 @@
+--- 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 @@
                  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...
-@@ -441,7 +444,10 @@
+@@ -444,7 +447,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	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/71_date_overflows.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,10 +1,10 @@
 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.10/Mailman/Handlers/Scrubber.py
+Index: mailman-2.1.12/Mailman/Handlers/Scrubber.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Handlers/Scrubber.py	2008-06-15 18:49:54.000000000 +0200
-+++ mailman-2.1.10/Mailman/Handlers/Scrubber.py	2008-06-15 18:49:54.000000000 +0200
+--- 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 @@
                       }.get(parts[3], 0)
              day = int(parts[4])

Modified: trunk/debian/patches/74_admin_non-ascii_emails.patch
===================================================================
--- trunk/debian/patches/74_admin_non-ascii_emails.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/74_admin_non-ascii_emails.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -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.10/Mailman/Cgi/admin.py
+Index: mailman-2.1.12/Mailman/Cgi/admin.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Cgi/admin.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Cgi/admin.py	2008-06-15 18:49:55.000000000 +0200
+--- 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
 @@ -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/77_header_folding_in_attachments.patch
===================================================================
--- trunk/debian/patches/77_header_folding_in_attachments.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/77_header_folding_in_attachments.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -2,10 +2,10 @@
 Author: Lionel Elie Mamane <lionel at mamane.lu>
 Don't fold headers into message/rfc822 attachments.
 This avoids breaking signatures (Closes: #244673)
-Index: mailman-2.1.10/Mailman/Generator.py
+Index: mailman-2.1.12/Mailman/Generator.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ mailman-2.1.10/Mailman/Generator.py	2008-06-15 18:49:56.000000000 +0200
++++ mailman-2.1.12/Mailman/Generator.py	2009-03-02 20:50:23.000000000 +0100
 @@ -0,0 +1,55 @@
 +# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
 +#                    2005 Lionel Elie Mamane <lionel at mamane.lu>
@@ -62,10 +62,10 @@
 +        """Clone this generator with maxheaderlen set for children"""
 +        return self.__class__(fp, self._mangle_from_, self.__children_maxheaderlen, self.__children_maxheaderlen)
 +
-Index: mailman-2.1.10/Mailman/Mailbox.py
+Index: mailman-2.1.12/Mailman/Mailbox.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Mailbox.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Mailbox.py	2008-06-15 18:49:56.000000000 +0200
+--- mailman-2.1.12.orig/Mailman/Mailbox.py	2009-03-02 20:41:45.000000000 +0100
++++ mailman-2.1.12/Mailman/Mailbox.py	2009-03-02 20:50:23.000000000 +0100
 @@ -22,10 +22,10 @@
  
  import email
@@ -87,10 +87,10 @@
          g.flatten(msg, unixfrom=True)
          # Add one more trailing newline for separation with the next message
          # to be appended to the mbox.
-Index: mailman-2.1.10/Mailman/Message.py
+Index: mailman-2.1.12/Mailman/Message.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Message.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Message.py	2008-06-15 18:49:56.000000000 +0200
+--- mailman-2.1.12.orig/Mailman/Message.py	2009-03-02 20:41:45.000000000 +0100
++++ mailman-2.1.12/Mailman/Message.py	2009-03-02 20:50:23.000000000 +0100
 @@ -22,6 +22,8 @@
  """
  

Modified: trunk/debian/patches/78_DeprecationWarning.patch
===================================================================
--- trunk/debian/patches/78_DeprecationWarning.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/78_DeprecationWarning.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,11 +1,11 @@
 Patch: 78_DeprecationWarning.patch
 Author: Lionel Elie Mamane <lionel at mamane.lu>
 Shut up DeprecationWarning in Python 2.4 (Closes: #341699)
-Index: mailman-2.1.10/Mailman/Handlers/Scrubber.py
+Index: mailman-2.1.12/Mailman/Handlers/Scrubber.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Handlers/Scrubber.py	2008-06-15 18:49:54.000000000 +0200
-+++ mailman-2.1.10/Mailman/Handlers/Scrubber.py	2008-06-15 18:49:57.000000000 +0200
-@@ -26,6 +26,7 @@
+--- mailman-2.1.12.orig/Mailman/Handlers/Scrubber.py	2009-03-02 20:50:20.000000000 +0100
++++ mailman-2.1.12/Mailman/Handlers/Scrubber.py	2009-03-02 20:50:24.000000000 +0100
+@@ -25,6 +25,7 @@
  import errno
  import binascii
  import tempfile

Modified: trunk/debian/patches/79_archiver_slash.patch
===================================================================
--- trunk/debian/patches/79_archiver_slash.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/79_archiver_slash.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -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.10/Mailman/Archiver/Archiver.py
+Index: mailman-2.1.12/Mailman/Archiver/Archiver.py
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Archiver/Archiver.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Archiver/Archiver.py	2008-06-15 18:49:57.000000000 +0200
+--- 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
 @@ -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.10/Mailman/Defaults.py.in
+Index: mailman-2.1.12/Mailman/Defaults.py.in
 ===================================================================
---- mailman-2.1.10.orig/Mailman/Defaults.py.in	2008-06-15 18:49:39.000000000 +0200
-+++ mailman-2.1.10/Mailman/Defaults.py.in	2008-06-15 18:49:57.000000000 +0200
-@@ -205,7 +205,7 @@
+--- 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 @@
  # 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).

Deleted: trunk/debian/patches/80_fix_string_search.patch
===================================================================
--- trunk/debian/patches/80_fix_string_search.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/80_fix_string_search.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -1,17 +0,0 @@
-Patch: fix_admin.py.patch
-Author: Riccardo Setti <giskard at debian.org>
-Upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1532081&group_id=103&atid=300103
-Improve the search method in the admin page wich list members (Closes: #359721)
-Index: mailman-2.1.10/Mailman/Cgi/admin.py
-===================================================================
---- mailman-2.1.10.orig/Mailman/Cgi/admin.py	2008-06-15 18:49:55.000000000 +0200
-+++ mailman-2.1.10/Mailman/Cgi/admin.py	2008-06-15 18:49:58.000000000 +0200
-@@ -950,7 +950,7 @@
-         for letter in digits + lowercase:
-             if not buckets.get(letter):
-                 continue
--            url = adminurl + '/members?letter=%s' % letter
-+            url = adminurl + '/members?findmember=%s&letter=%s' %(urllib.quote(regexp) ,letter)
-             if letter == bucket:
-                 show = Bold('[%s]' % letter.upper()).Format()
-             else:

Modified: trunk/debian/patches/99_js_templates.patch
===================================================================
--- trunk/debian/patches/99_js_templates.patch	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/99_js_templates.patch	2009-03-02 19:55:23 UTC (rev 608)
@@ -2,9 +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.
-diff -Nur mailman-2.1.11.orig/templates/ar/private.html mailman-2.1.11/templates/ar/private.html
---- mailman-2.1.11.orig/templates/ar/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ar/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -2,9 +2,10 @@
  <head>
      <title>Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† Ø§Ù„Ø´Ø®ØµÙŠØ© Ù„Ù„Ø£Ø±Ø´ÙŠÙ Ø§Ù„Ø®Ø§Øµ Ø¨Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© %(realname)s</title>
@@ -18,9 +19,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ca/admlogin.html mailman-2.1.11/templates/ca/admlogin.html
---- mailman-2.1.11.orig/templates/ca/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ca/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -34,9 +36,10 @@
  %(message)s  
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ca/private.html mailman-2.1.11/templates/ca/private.html
---- mailman-2.1.11.orig/templates/ca/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ca/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -50,9 +53,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/cs/admlogin.html mailman-2.1.11/templates/cs/admlogin.html
---- mailman-2.1.11.orig/templates/cs/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/cs/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -66,9 +70,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/cs/private.html mailman-2.1.11/templates/cs/private.html
---- mailman-2.1.11.orig/templates/cs/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/cs/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -82,9 +87,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/da/admlogin.html mailman-2.1.11/templates/da/admlogin.html
---- mailman-2.1.11.orig/templates/da/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/da/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -98,9 +104,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/da/private.html mailman-2.1.11/templates/da/private.html
---- mailman-2.1.11.orig/templates/da/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/da/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -114,9 +121,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/de/admlogin.html mailman-2.1.11/templates/de/admlogin.html
---- mailman-2.1.11.orig/templates/de/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/de/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -130,9 +138,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/de/private.html mailman-2.1.11/templates/de/private.html
---- mailman-2.1.11.orig/templates/de/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/de/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -146,9 +155,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/en/admlogin.html mailman-2.1.11/templates/en/admlogin.html
---- mailman-2.1.11.orig/templates/en/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/en/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -162,9 +172,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/en/listinfo.html mailman-2.1.11/templates/en/listinfo.html
---- mailman-2.1.11.orig/templates/en/listinfo.html	2008-07-07 23:21:28.000000000 +0200
-+++ mailman-2.1.11/templates/en/listinfo.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -4,7 +4,7 @@
      <TITLE><MM-List-Name> Info Page</TITLE>
    
@@ -174,9 +185,10 @@
  
      <P>
        <TABLE COLS="1" BORDER="0" CELLSPACING="4" CELLPADDING="5">
-diff -Nur mailman-2.1.11.orig/templates/en/private.html mailman-2.1.11/templates/en/private.html
---- mailman-2.1.11.orig/templates/en/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/en/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -190,9 +202,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/es/admlogin.html mailman-2.1.11/templates/es/admlogin.html
---- mailman-2.1.11.orig/templates/es/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/es/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -206,9 +219,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/es/private.html mailman-2.1.11/templates/es/private.html
---- mailman-2.1.11.orig/templates/es/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/es/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -222,9 +236,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/et/admlogin.html mailman-2.1.11/templates/et/admlogin.html
---- mailman-2.1.11.orig/templates/et/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/et/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -238,9 +253,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/et/private.html mailman-2.1.11/templates/et/private.html
---- mailman-2.1.11.orig/templates/et/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/et/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -254,9 +270,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/eu/admlogin.html mailman-2.1.11/templates/eu/admlogin.html
---- mailman-2.1.11.orig/templates/eu/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/eu/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -270,9 +287,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/eu/private.html mailman-2.1.11/templates/eu/private.html
---- mailman-2.1.11.orig/templates/eu/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/eu/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -286,9 +304,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/fi/admlogin.html mailman-2.1.11/templates/fi/admlogin.html
---- mailman-2.1.11.orig/templates/fi/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/fi/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -2,9 +2,10 @@
  <html>
  <head>
@@ -302,9 +321,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/fi/private.html mailman-2.1.11/templates/fi/private.html
---- mailman-2.1.11.orig/templates/fi/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/fi/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -2,9 +2,10 @@
  <html>
  <head>
@@ -318,9 +338,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/fr/admlogin.html mailman-2.1.11/templates/fr/admlogin.html
---- mailman-2.1.11.orig/templates/fr/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/fr/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -334,9 +355,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/fr/private.html mailman-2.1.11/templates/fr/private.html
---- mailman-2.1.11.orig/templates/fr/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/fr/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -2,9 +2,10 @@
  <head>
      <title>Authentification pour l'acc&egrave;s aux archives priv&eacute;es de
@@ -350,9 +372,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/gl/admlogin.html mailman-2.1.11/templates/gl/admlogin.html
---- mailman-2.1.11.orig/templates/gl/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/gl/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -366,9 +389,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/gl/private.html mailman-2.1.11/templates/gl/private.html
---- mailman-2.1.11.orig/templates/gl/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/gl/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -382,9 +406,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/he/admlogin.html mailman-2.1.11/templates/he/admlogin.html
---- mailman-2.1.11.orig/templates/he/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/he/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -398,9 +423,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/he/private.html mailman-2.1.11/templates/he/private.html
---- mailman-2.1.11.orig/templates/he/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/he/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -414,9 +440,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/hr/admlogin.html mailman-2.1.11/templates/hr/admlogin.html
---- mailman-2.1.11.orig/templates/hr/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/hr/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -430,9 +457,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/hr/private.html mailman-2.1.11/templates/hr/private.html
---- mailman-2.1.11.orig/templates/hr/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/hr/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -446,9 +474,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/hu/admlogin.html mailman-2.1.11/templates/hu/admlogin.html
---- mailman-2.1.11.orig/templates/hu/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/hu/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -462,9 +491,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/hu/private.html mailman-2.1.11/templates/hu/private.html
---- mailman-2.1.11.orig/templates/hu/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/hu/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -478,9 +508,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ia/admlogin.html mailman-2.1.11/templates/ia/admlogin.html
---- mailman-2.1.11.orig/templates/ia/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ia/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -494,9 +525,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ia/private.html mailman-2.1.11/templates/ia/private.html
---- mailman-2.1.11.orig/templates/ia/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ia/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -510,9 +542,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/it/admlogin.html mailman-2.1.11/templates/it/admlogin.html
---- mailman-2.1.11.orig/templates/it/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/it/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -526,9 +559,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/it/private.html mailman-2.1.11/templates/it/private.html
---- mailman-2.1.11.orig/templates/it/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/it/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -542,9 +576,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ja/admlogin.html mailman-2.1.11/templates/ja/admlogin.html
---- mailman-2.1.11.orig/templates/ja/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ja/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -558,9 +593,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ja/private.html mailman-2.1.11/templates/ja/private.html
---- mailman-2.1.11.orig/templates/ja/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ja/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -574,9 +610,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ko/admlogin.html mailman-2.1.11/templates/ko/admlogin.html
---- mailman-2.1.11.orig/templates/ko/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ko/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -590,9 +627,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ko/private.html mailman-2.1.11/templates/ko/private.html
---- mailman-2.1.11.orig/templates/ko/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ko/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -606,9 +644,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/lt/admlogin.html mailman-2.1.11/templates/lt/admlogin.html
---- mailman-2.1.11.orig/templates/lt/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/lt/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -622,9 +661,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/lt/private.html mailman-2.1.11/templates/lt/private.html
---- mailman-2.1.11.orig/templates/lt/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/lt/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -638,9 +678,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/nl/admlogin.html mailman-2.1.11/templates/nl/admlogin.html
---- mailman-2.1.11.orig/templates/nl/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/nl/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -654,9 +695,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/nl/private.html mailman-2.1.11/templates/nl/private.html
---- mailman-2.1.11.orig/templates/nl/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/nl/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -670,9 +712,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/no/admlogin.html mailman-2.1.11/templates/no/admlogin.html
---- mailman-2.1.11.orig/templates/no/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/no/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -686,9 +729,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/no/private.html mailman-2.1.11/templates/no/private.html
---- mailman-2.1.11.orig/templates/no/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/no/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -702,9 +746,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/pl/admlogin.html mailman-2.1.11/templates/pl/admlogin.html
---- mailman-2.1.11.orig/templates/pl/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/pl/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -2,9 +2,10 @@
  <head>
    <title>Uwierzytelnienie %(who)s %(listname)s</title>
@@ -718,9 +763,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/pl/private.html mailman-2.1.11/templates/pl/private.html
---- mailman-2.1.11.orig/templates/pl/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/pl/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -734,9 +780,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/pt/admlogin.html mailman-2.1.11/templates/pt/admlogin.html
---- mailman-2.1.11.orig/templates/pt/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/pt/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -750,9 +797,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/pt/private.html mailman-2.1.11/templates/pt/private.html
---- mailman-2.1.11.orig/templates/pt/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/pt/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -766,9 +814,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/pt_BR/admlogin.html mailman-2.1.11/templates/pt_BR/admlogin.html
---- mailman-2.1.11.orig/templates/pt_BR/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/pt_BR/admlogin.html	2008-07-07 23:22:53.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -782,9 +831,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/pt_BR/private.html mailman-2.1.11/templates/pt_BR/private.html
---- mailman-2.1.11.orig/templates/pt_BR/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/pt_BR/private.html	2008-07-07 23:23:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -798,9 +848,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ro/admlogin.html mailman-2.1.11/templates/ro/admlogin.html
---- mailman-2.1.11.orig/templates/ro/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ro/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -2,9 +2,10 @@
  <head>
    <title>%(listname)s: Autentificare - %(who)s</title>
@@ -814,9 +865,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ro/private.html mailman-2.1.11/templates/ro/private.html
---- mailman-2.1.11.orig/templates/ro/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ro/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -2,9 +2,10 @@
  <head>
      <title>Autentificare la arhivele private %(realname)s</title>
@@ -830,9 +882,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ru/admlogin.html mailman-2.1.11/templates/ru/admlogin.html
---- mailman-2.1.11.orig/templates/ru/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ru/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -846,9 +899,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/ru/private.html mailman-2.1.11/templates/ru/private.html
---- mailman-2.1.11.orig/templates/ru/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/ru/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -862,9 +916,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/sk/admlogin.html mailman-2.1.11/templates/sk/admlogin.html
---- mailman-2.1.11.orig/templates/sk/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sk/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -878,9 +933,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/sk/private.html mailman-2.1.11/templates/sk/private.html
---- mailman-2.1.11.orig/templates/sk/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sk/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -894,9 +950,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/sl/admlogin.html mailman-2.1.11/templates/sl/admlogin.html
---- mailman-2.1.11.orig/templates/sl/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sl/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -910,9 +967,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/sl/private.html mailman-2.1.11/templates/sl/private.html
---- mailman-2.1.11.orig/templates/sl/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sl/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -926,9 +984,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/sr/admlogin.html mailman-2.1.11/templates/sr/admlogin.html
---- mailman-2.1.11.orig/templates/sr/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sr/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,11 @@
  <html>
  <head>
@@ -944,9 +1003,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/sr/private.html mailman-2.1.11/templates/sr/private.html
---- mailman-2.1.11.orig/templates/sr/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sr/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,11 @@
  ï»¿<html>
  <head>
@@ -962,9 +1022,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/sv/admlogin.html mailman-2.1.11/templates/sv/admlogin.html
---- mailman-2.1.11.orig/templates/sv/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sv/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -978,9 +1039,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/sv/private.html mailman-2.1.11/templates/sv/private.html
---- mailman-2.1.11.orig/templates/sv/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/sv/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -994,9 +1056,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/tr/admlogin.html mailman-2.1.11/templates/tr/admlogin.html
---- mailman-2.1.11.orig/templates/tr/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/tr/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1010,9 +1073,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/tr/private.html mailman-2.1.11/templates/tr/private.html
---- mailman-2.1.11.orig/templates/tr/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/tr/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1026,9 +1090,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/uk/admlogin.html mailman-2.1.11/templates/uk/admlogin.html
---- mailman-2.1.11.orig/templates/uk/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/uk/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1042,9 +1107,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/uk/private.html mailman-2.1.11/templates/uk/private.html
---- mailman-2.1.11.orig/templates/uk/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/uk/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1058,9 +1124,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/vi/admlogin.html mailman-2.1.11/templates/vi/admlogin.html
---- mailman-2.1.11.orig/templates/vi/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/vi/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1074,9 +1141,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/vi/private.html mailman-2.1.11/templates/vi/private.html
---- mailman-2.1.11.orig/templates/vi/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/vi/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1090,9 +1158,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/zh_CN/admlogin.html mailman-2.1.11/templates/zh_CN/admlogin.html
---- mailman-2.1.11.orig/templates/zh_CN/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/zh_CN/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1106,9 +1175,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/zh_CN/private.html mailman-2.1.11/templates/zh_CN/private.html
---- mailman-2.1.11.orig/templates/zh_CN/private.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/zh_CN/private.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>
@@ -1122,9 +1192,10 @@
  %(message)s
    <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
      <TR>
-diff -Nur mailman-2.1.11.orig/templates/zh_TW/admlogin.html mailman-2.1.11/templates/zh_TW/admlogin.html
---- mailman-2.1.11.orig/templates/zh_TW/admlogin.html	2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/templates/zh_TW/admlogin.html	2008-07-07 23:21:40.000000000 +0200
+Index: mailman-2.1.12/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
 @@ -1,9 +1,10 @@
  <html>
  <head>

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/patches/series	2009-03-02 19:55:23 UTC (rev 608)
@@ -19,12 +19,10 @@
 64_correct_html_nesting.patch
 65_handle_templates_directories.patch
 66_donot_let_cache_html_pages.patch
-68_update_catalan.patch
 70_invalid_utf8_dos.patch
 71_date_overflows.patch
 74_admin_non-ascii_emails.patch
 77_header_folding_in_attachments.patch
 78_DeprecationWarning.patch
 79_archiver_slash.patch
-80_fix_string_search.patch
 99_js_templates.patch

Modified: trunk/debian/pyversions
===================================================================
--- trunk/debian/pyversions	2009-03-02 18:42:08 UTC (rev 607)
+++ trunk/debian/pyversions	2009-03-02 19:55:23 UTC (rev 608)
@@ -1 +1 @@
-2.3-
+2.4-


