[Pkg-mailman-hackers] Pkg-mailman commit - rev 379 - in branches/2.1.8/debian: . patches

[Hector Garcia]

Author: hector
Date: 2006-09-19 20:24:33 +0000 (Tue, 19 Sep 2006)
New Revision: 379

Modified:
   branches/2.1.8/debian/changelog
   branches/2.1.8/debian/patches/53_disable_addons.patch
Log:
Merging revision 350 from trunk

Modified: branches/2.1.8/debian/changelog
===================================================================
--- branches/2.1.8/debian/changelog	2006-09-19 20:16:50 UTC (rev 378)
+++ branches/2.1.8/debian/changelog	2006-09-19 20:24:33 UTC (rev 379)
@@ -13,6 +13,11 @@
   [ Matej Vela ]
   * Rearrange find options in debian/postinst to prevent warnings.
 
+  [ Lionel Elie Mamane ]
+  * Use Mailman's fork of the Python email package instead of the one from
+    Python; Mailman is incompatible with the one in Python 2.4
+    (closes: #384016)
+
  -- Thijs Kinkhorst <thijs at debian.org>  Tue, 22 Aug 2006 02:19:15 +0200
 
 mailman (1:2.1.8-2) unstable; urgency=low

Modified: branches/2.1.8/debian/patches/53_disable_addons.patch
===================================================================
--- branches/2.1.8/debian/patches/53_disable_addons.patch	2006-09-19 20:16:50 UTC (rev 378)
+++ branches/2.1.8/debian/patches/53_disable_addons.patch	2006-09-19 20:24:33 UTC (rev 379)
@@ -5,12 +5,15 @@
 ===================================================================
 --- misc/Makefile.in.orig	2006-08-15 15:12:18.000000000 +0800
 +++ misc/Makefile.in	2006-08-15 15:14:39.000000000 +0800
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,10 @@
  JACODECSPKG=	JapaneseCodecs-1.4.11
  KOCODECSPKG=	KoreanCodecs-2.0.5
  
 -PACKAGES= $(EMAILPKG) $(JACODECSPKG) $(KOCODECSPKG)
-+PACKAGES=  
++#Debian note (LEM): we take the Japanese and Korean codecs from other
++#Debian packages, but not email because the one in Python 2.4 doesn't work
++#with Mailman; when Mailman upgrades to mailman 3.0.x, we can try again.
++PACKAGES= $(EMAILPKG)
  
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but