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

[Thijs Kinkhorst]

Author: thijs
Date: 2009-03-02 20:39:23 +0000 (Mon, 02 Mar 2009)
New Revision: 611

Removed:
   trunk/debian/patches/00_stolen_from_HEAD.patch
   trunk/debian/patches/32_MIME_fixup.patch
   trunk/debian/patches/62_new_list_bad_pending_requests.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
remove more obsolete patches, thanks Paul Wise and Mark Sapiro


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-03-02 20:19:47 UTC (rev 610)
+++ trunk/debian/changelog	2009-03-02 20:39:23 UTC (rev 611)
@@ -3,9 +3,16 @@
   * New upstream release.
     + Minimum Python version is now 2.4.
     + Patches obsoleted (incorporated or not useful anymore):
-      11_handle_propfind.patch, 67_update_handle_old_versions,
-      68_update_catalan, 78_DeprecationWarning.patch,
-      80_fix_string_search; refresh all others.
+      00_stolen_from_HEAD,
+      11_handle_propfind.patch,
+      32_MIME_fixup,
+      62_new_list_bad_pending_requests,
+      67_update_handle_old_versions,
+      68_update_catalan,
+      78_DeprecationWarning,
+      80_fix_string_search.
+      Refresh all others. Many thanks to Mark Sapiro and
+      Paul Wise for the help in cleaning this up.
   * Various packaging cleanups, upgrade debhelper to level 7.
 
  -- Thijs Kinkhorst <thijs at debian.org>  Mon, 02 Mar 2009 19:56:25 +0100

Deleted: trunk/debian/patches/00_stolen_from_HEAD.patch
===================================================================
--- trunk/debian/patches/00_stolen_from_HEAD.patch	2009-03-02 20:19:47 UTC (rev 610)
+++ trunk/debian/patches/00_stolen_from_HEAD.patch	2009-03-02 20:39:23 UTC (rev 611)
@@ -1,16 +0,0 @@
-Patch: 00_stolen_from_HEAD.patch
-Author: Tollef Fog Heen <tfheen at debian.org>
-Handle empty queue files (Closes: #212643)
-Index: mailman-2.1.12/Mailman/Handlers/Scrubber.py
-===================================================================
---- mailman-2.1.12.orig/Mailman/Handlers/Scrubber.py	2009-03-02 20:41:57.000000000 +0100
-+++ mailman-2.1.12/Mailman/Handlers/Scrubber.py	2009-03-02 20:49:54.000000000 +0100
-@@ -388,6 +388,8 @@
-                     t = unicode(t, 'ascii', 'replace')
-                 try:
-                     # Should use HTML-Escape, or try generalizing to UTF-8
-+                    if len(charset) == 0:
-+                        charset = 'us-ascii'
-                     t = t.encode(charset, 'replace')
-                 except (UnicodeError, LookupError, ValueError,
-                         AssertionError):

Deleted: trunk/debian/patches/32_MIME_fixup.patch
===================================================================
--- trunk/debian/patches/32_MIME_fixup.patch	2009-03-02 20:19:47 UTC (rev 610)
+++ trunk/debian/patches/32_MIME_fixup.patch	2009-03-02 20:39:23 UTC (rev 611)
@@ -1,15 +0,0 @@
-Patch: 32_MIME_fixup.patch
-Author: Tollef Fog Heen <tfheen at debian.org>
-Handle empty queue files (Closes: #223906)
-Index: mailman-2.1.12/Mailman/Handlers/Decorate.py
-===================================================================
---- mailman-2.1.12.orig/Mailman/Handlers/Decorate.py	2009-03-02 20:41:53.000000000 +0100
-+++ mailman-2.1.12/Mailman/Handlers/Decorate.py	2009-03-02 20:50:06.000000000 +0100
-@@ -205,6 +205,7 @@
-     del msg['content-transfer-encoding']
-     del msg['content-disposition']
-     msg['Content-Type'] = 'multipart/mixed'
-+    msg['Mime-version'] = '1.0'
- 
- 
- 

Deleted: trunk/debian/patches/62_new_list_bad_pending_requests.patch
===================================================================
--- trunk/debian/patches/62_new_list_bad_pending_requests.patch	2009-03-02 20:19:47 UTC (rev 610)
+++ trunk/debian/patches/62_new_list_bad_pending_requests.patch	2009-03-02 20:39:23 UTC (rev 611)
@@ -1,22 +0,0 @@
-Patch: 62_new_list_bad_pending_requests.patch
-Author: Richard Mortimer <richm at oldelvet.org.uk>
-Only mail 'pending admin requests' if the database for the
-particular list exists, so we do not send out '-1' requests.
-Index: mailman-2.1.12/Mailman/ListAdmin.py
-===================================================================
---- mailman-2.1.12.orig/Mailman/ListAdmin.py	2009-03-02 20:41:51.000000000 +0100
-+++ mailman-2.1.12/Mailman/ListAdmin.py	2009-03-02 20:50:12.000000000 +0100
-@@ -130,8 +130,11 @@
- 
-     def NumRequestsPending(self):
-         self.__opendb()
--        # Subtract one for the version pseudo-entry
--        return len(self.__db) - 1
-+        if self.__db.has_key('version'):
-+            # Subtract one for the version pseudo-entry
-+            return len(self.__db) - 1
-+        else:
-+            return len(self.__db)
- 
-     def __getmsgids(self, rtype):
-         self.__opendb()

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-03-02 20:19:47 UTC (rev 610)
+++ trunk/debian/patches/series	2009-03-02 20:39:23 UTC (rev 611)
@@ -1,4 +1,3 @@
-00_stolen_from_HEAD.patch
 01_defaults.debian.patch
 02_HyperDatabase_mapkeys.patch
 07_snooze.patch
@@ -8,12 +7,10 @@
 20_qmail_to_mailman.debian.patch
 21_newlist_help.patch
 30_pipermail_threads.patch
-32_MIME_fixup.patch
 51_nocompile.pyc.patch
 52_check_perms_lstat.patch
 53_disable_addons.patch
 59_fix_missing_language_crash.patch
-62_new_list_bad_pending_requests.patch
 63_update_default_server_language.patch
 64_correct_html_nesting.patch
 65_handle_templates_directories.patch