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

[Lionel Elie Mamane]

Author: lmamane-guest
Date: 2005-11-13 11:02:27 +0000 (Sun, 13 Nov 2005)
New Revision: 219

Added:
   trunk/debian/patches/69_python24_bouncehandler_datetime.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
Merge with ubuntu: Python 2.4 compatibility


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-13 10:52:26 UTC (rev 218)
+++ trunk/debian/changelog	2005-11-13 11:02:27 UTC (rev 219)
@@ -1,3 +1,10 @@
+mailman (2.1.5-10) unstable; urgency=low
+
+  * Merge with 2.1.5-8ubuntu2:
+    Python 2.4 compatibility patch in bounce handling.
+
+ --
+
 mailman (2.1.5-9) unstable; urgency=medium
 
   * Update the Belgian translation, thanks to Luc Stroobant for prodding

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2005-11-13 10:52:26 UTC (rev 218)
+++ trunk/debian/patches/00list	2005-11-13 11:02:27 UTC (rev 219)
@@ -33,4 +33,5 @@
 66_donot_let_cache_html_pages
 67_update_handle_old_versions
 68_translation_update_nl
+69_python24_bouncehandler_datetime
 99_js_templates

Added: trunk/debian/patches/69_python24_bouncehandler_datetime.dpatch
===================================================================
--- trunk/debian/patches/69_python24_bouncehandler_datetime.dpatch	2005-11-13 10:52:26 UTC (rev 218)
+++ trunk/debian/patches/69_python24_bouncehandler_datetime.dpatch	2005-11-13 11:02:27 UTC (rev 219)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 69_python24_bouncehandler_datetime.dpatch by  <tfheen at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Python 2.4 compatibility patch in bounce handler
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./Mailman/Bouncer.py /tmp/dpep-work.xo86JD/mailman-2.1.5/Mailman/Bouncer.py
+--- ./Mailman/Bouncer.py	2004-02-10 23:38:26.000000000 +0100
++++ /tmp/dpep-work.xo86JD/mailman-2.1.5/Mailman/Bouncer.py	2005-10-10 10:38:24.000000000 +0200
+@@ -128,7 +128,7 @@
+             # We've already scored any bounces for this day, so ignore it.
+             syslog('bounce', '%s: %s already scored a bounce for date %s',
+                    self.internal_name(), member,
+-                   time.strftime('%d-%b-%Y', day + (0,)*6))
++                   time.strftime('%d-%b-%Y', day + (0,0,0,0,1,0)))
+             # Continue to check phase below
+         else:
+             # See if this member's bounce information is stale.