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

[Thijs Kinkhorst]

Author: thijs
Date: 2009-03-02 20:19:47 +0000 (Mon, 02 Mar 2009)
New Revision: 610

Removed:
   trunk/debian/patches/11_handle_propfind.patch
   trunk/debian/patches/78_DeprecationWarning.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
11_handle_propfind has been fixed in 2.1.12 in a different way;
78_DeprecationWarning is irrelevant since our min version is 2.4


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-03-02 20:07:07 UTC (rev 609)
+++ trunk/debian/changelog	2009-03-02 20:19:47 UTC (rev 610)
@@ -2,9 +2,10 @@
 
   * New upstream release.
     + Minimum Python version is now 2.4.
-    + Patches 68_update_catalan and 80_fix_string_search are now
-      incorporated upstream; 67_update_handle_old_versions is
-      obsolete, refresh all others.
+    + 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.
   * 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/11_handle_propfind.patch
===================================================================
--- trunk/debian/patches/11_handle_propfind.patch	2009-03-02 20:07:07 UTC (rev 609)
+++ trunk/debian/patches/11_handle_propfind.patch	2009-03-02 20:19:47 UTC (rev 610)
@@ -1,25 +0,0 @@
-Patch: 11_handle_propfind.patch
-Author: Tollef Fog Heen <tfheen at debian.org>
-Submitted upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1578756&group_id=103&atid=300103
-Don't fall flat on our face if we get a request type which we
-don't understand (Closes: #202821)
-Index: mailman-2.1.12/scripts/driver
-===================================================================
---- mailman-2.1.12.orig/scripts/driver	2009-03-02 20:41:55.000000000 +0100
-+++ mailman-2.1.12/scripts/driver	2009-03-02 20:50:00.000000000 +0100
-@@ -98,6 +98,15 @@
-         module = getattr(pkg, scriptname)
-         main = getattr(module, 'main')
-         try:
-+            import os
-+            request_method = os.environ.get('REQUEST_METHOD')
-+            if not request_method in ['GET', 'POST', 'HEAD']:
-+                print "Status: 405 Method not allowed"
-+                print "Content-type: text/plain"
-+                print
-+                print "The method is not allowed"
-+                sys.exit()
-+                
-             try:
-                 sys.stderr = logger
-                 sys.stdout = tempstdout

Deleted: trunk/debian/patches/78_DeprecationWarning.patch
===================================================================
--- trunk/debian/patches/78_DeprecationWarning.patch	2009-03-02 20:07:07 UTC (rev 609)
+++ trunk/debian/patches/78_DeprecationWarning.patch	2009-03-02 20:19:47 UTC (rev 610)
@@ -1,26 +0,0 @@
-Patch: 78_DeprecationWarning.patch
-Author: Lionel Elie Mamane <lionel at mamane.lu>
-Shut up DeprecationWarning in Python 2.4 (Closes: #341699)
-Index: mailman-2.1.12/Mailman/Handlers/Scrubber.py
-===================================================================
---- mailman-2.1.12.orig/Mailman/Handlers/Scrubber.py	2009-03-02 20:50:20.000000000 +0100
-+++ mailman-2.1.12/Mailman/Handlers/Scrubber.py	2009-03-02 20:50:24.000000000 +0100
-@@ -25,6 +25,7 @@
- import errno
- import binascii
- import tempfile
-+import warnings
- from cStringIO import StringIO
- from types import IntType, StringType
- 
-@@ -77,6 +78,10 @@
-             check(mimetypes.common_types)
-         return all
- 
-+# FIXME: Remove for Mailman 2.2 (which will drop support for Python 2.1)
-+# and then actually replace part.get_type(part.get_default_type())
-+# with part.get_content_type()
-+warnings.filterwarnings("ignore","^get_type\(\) deprecated;",DeprecationWarning,"Mailman")
- 
- 
- def guess_extension(ctype, ext):

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-03-02 20:07:07 UTC (rev 609)
+++ trunk/debian/patches/series	2009-03-02 20:19:47 UTC (rev 610)
@@ -3,7 +3,6 @@
 02_HyperDatabase_mapkeys.patch
 07_snooze.patch
 10_wrapper_uid.patch
-11_handle_propfind.patch
 15_mailmanctl_daemonize.patch
 16_update_debian.patch
 20_qmail_to_mailman.debian.patch
@@ -23,6 +22,5 @@
 71_date_overflows.patch
 74_admin_non-ascii_emails.patch
 77_header_folding_in_attachments.patch
-78_DeprecationWarning.patch
 79_archiver_slash.patch
 99_js_templates.patch