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

[Laszlo Boszormenyi]

Author: gcs-guest
Date: 2004-04-11 15:00:09 -0600 (Sun, 11 Apr 2004)
New Revision: 53

Added:
   trunk/debian/patches/53_disable_addons.dpatch
Removed:
   trunk/debian/patches/53_disable_addons
Modified:
   trunk/debian/changelog
Log:
Fix for Woody FTBFS.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-04-10 10:49:04 UTC (rev 52)
+++ trunk/debian/changelog	2004-04-11 21:00:09 UTC (rev 53)
@@ -5,6 +5,8 @@
   * Add fix for missing installation of Danish templates (by GCS)
   * config: don't try to list_lists when upgrading from pre 2.1
     (bsb, closes: #242945).
+  * Fix Woody FTBFS, reported and solution provided by Andreas Barth
+    <aba@not.so.argh.org>, (by GCS, closes: #243209).
 
  -- Siggy Brentrup <bsb@debian.org>  Sat, 10 Apr 2004 12:46:59 +0200
 

Deleted: trunk/debian/patches/53_disable_addons
===================================================================
--- trunk/debian/patches/53_disable_addons	2004-04-10 10:49:04 UTC (rev 52)
+++ trunk/debian/patches/53_disable_addons	2004-04-11 21:00:09 UTC (rev 53)
@@ -1,57 +0,0 @@
-#! /bin/sh -e
-## 53_disable_addons.dpatch by Tollef Fog Heen <tfheen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable some modules which are pulled in from other Debian
-## DP: packages.
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -lt 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch $patch_opts -p1 < $0;;
-    -unpatch) patch $patch_opts -p1 -R < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-@DPATCH@
-
---- mailman-2.1.4.orig/misc/Makefile.in
-+++ mailman-2.1.4/misc/Makefile.in
-@@ -56,7 +56,7 @@
- JACODECSPKG=   JapaneseCodecs-1.4.10
- KOCODECSPKG=   KoreanCodecs-2.0.5
- 
--PACKAGES= $(EMAILPKG) $(JACODECSPKG) $(KOCODECSPKG)
-+PACKAGES=  
- 
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
---- mailman-2.1.4.orig/misc/paths.py.in
-+++ mailman-2.1.4/misc/paths.py.in
-@@ -52,9 +52,15 @@
- # In a normal interactive Python environment, the japanese.pth and korean.pth
- # files would be imported automatically.  But because we inhibit the importing
- # of the site module, we need to be explicit about importing these codecs.
--import japanese
-+try:
-+    import japanese
-+except ImportError:
-+    pass
- # As of KoreanCodecs 2.0.5, you had to do the second import to get the Korean
- # codecs installed, however leave the first import in there in case an upgrade
- # changes this.
--import korean
--import korean.aliases
-+try:
-+    import korean
-+    import korean.aliases
-+except ImportError:
-+    pass

Copied: trunk/debian/patches/53_disable_addons.dpatch (from rev 50, trunk/debian/patches/53_disable_addons)