Patch: 53_disable_addons.patch

Author: Tollef Fog Heen <tfheen@debian.org>

Disable some modules which are pulled in from other Debian packages.

Index: misc/Makefile.in

===================================================================

--- 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,10 @@

 JACODECSPKG=	JapaneseCodecs-1.4.11

 KOCODECSPKG=	KoreanCodecs-2.0.5

-PACKAGES= $(EMAILPKG) $(JACODECSPKG) $(KOCODECSPKG)

+#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 email 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

Index: misc/paths.py.in

===================================================================

--- misc/paths.py.in.orig	2006-08-15 15:12:18.000000000 +0800

+++ misc/paths.py.in	2006-08-15 15:14:39.000000000 +0800

@@ -53,12 +53,18 @@

 # 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

 # Arabic and Hebrew (RFC-1556) encoding aliases. (temporary solution)

 import encodings.aliases

 encodings.aliases.aliases.update({