[Pkg-mailman-hackers] Pkg-mailman commit - rev 763 - trunk/debian/patches

[Thijs Kinkhorst]

Author: thijs
Date: 2014-07-10 18:00:25 +0000 (Thu, 10 Jul 2014)
New Revision: 763

Removed:
   trunk/debian/patches/80_sync_members_unicode.patch
Modified:
   trunk/debian/patches/51_nocompile.pyc.patch
   trunk/debian/patches/series
Log:
adjust 51_nocompile.pyc.patch
80_sync_members_unicode.patch is merged upstream


Modified: trunk/debian/patches/51_nocompile.pyc.patch
===================================================================
--- trunk/debian/patches/51_nocompile.pyc.patch	2014-07-10 17:56:32 UTC (rev 762)
+++ trunk/debian/patches/51_nocompile.pyc.patch	2014-07-10 18:00:25 UTC (rev 763)
@@ -10,8 +10,8 @@
  	do \
  	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
  	done
--	$(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman")'
-+	#$(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman")'
+-	$(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman", ddir="$(prefix)/Mailman")'
++	#$(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman", ddir="$(prefix)/Mailman")'
  
  # Only run bin/update if we aren't installing in DESTDIR, as this
  # means there are probably no lists to deal with, and it wouldn't

Deleted: trunk/debian/patches/80_sync_members_unicode.patch
===================================================================
--- trunk/debian/patches/80_sync_members_unicode.patch	2014-07-10 17:56:32 UTC (rev 762)
+++ trunk/debian/patches/80_sync_members_unicode.patch	2014-07-10 18:00:25 UTC (rev 763)
@@ -1,39 +0,0 @@
-Description: Fix UnicodeError in sync_members
-Origin: https://bazaar.launchpad.net/~mailman-coders/mailman/2.1/revision/1429
- and https://bazaar.launchpad.net/~mailman-coders/mailman/2.1/revision/1437
-Bug-Debian: #732741
-Forwarded: not-needed
-Applied-Upstream: in 2.1.18 (2.1.17 contains the bug!)
-
---- a/bin/sync_members
-+++ b/bin/sync_members
-@@ -1,6 +1,6 @@
- #! @PYTHON@
- #
--# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
-+# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
-@@ -256,6 +256,10 @@ def main():
-             try:
-                 if not dryrun:
-                     mlist.ApprovedAddMember(userdesc, welcome, notifyadmin)
-+                # Avoid UnicodeError if name can't be decoded
-+                if isinstance(name, str):
-+                    name = unicode(name, errors='replace')
-+                name = name.encode(enc, 'replace')
-                 s = email.Utils.formataddr((name, addr)).encode(enc, 'replace')
-                 print _('Added  : %(s)s')
-             except Errors.MMAlreadyAMember:
-@@ -276,6 +280,10 @@ def main():
-                     # reasons is in the database.  Use a lower level remove to
-                     # get rid of this member's entry
-                     mlist.removeMember(addr)
-+            # Avoid UnicodeError if name can't be decoded
-+            if isinstance(name, str):
-+                name = unicode(name, errors='replace')
-+            name = name.encode(enc, 'replace')
-             s = email.Utils.formataddr((name, addr)).encode(enc, 'replace')
-             print _('Removed: %(s)s')
- 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2014-07-10 17:56:32 UTC (rev 762)
+++ trunk/debian/patches/series	2014-07-10 18:00:25 UTC (rev 763)
@@ -8,6 +8,5 @@
 63_update_default_server_language.patch
 66_donot_let_cache_html_pages.patch
 79_archiver_slash.patch
-80_sync_members_unicode.patch
 90_gettext_errors.patch
 91_utf8.patch