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

[Thijs Kinkhorst]

Author: thijs
Date: 2014-07-10 17:56:32 +0000 (Thu, 10 Jul 2014)
New Revision: 762

Removed:
   trunk/debian/patches/20_qmail_to_mailman.debian.patch
Modified:
   trunk/debian/patches/series
Log:
patch 20_qmail_to_mailman.debian.patch no longer needed


Deleted: trunk/debian/patches/20_qmail_to_mailman.debian.patch
===================================================================
--- trunk/debian/patches/20_qmail_to_mailman.debian.patch	2014-07-10 17:42:52 UTC (rev 761)
+++ trunk/debian/patches/20_qmail_to_mailman.debian.patch	2014-07-10 17:56:32 UTC (rev 762)
@@ -1,33 +0,0 @@
-Author: Tollef Fog Heen <tfheen at debian.org>
-Description: Fix some paths in the qmail_to_mailman wrapper (Closes: #217573)
-Bug-Debian: #217573
-Forwarded: not-needed
-
-Index: b/contrib/qmail-to-mailman.py
-===================================================================
---- a/contrib/qmail-to-mailman.py	2012-05-20 14:21:35.642867903 +0200
-+++ b/contrib/qmail-to-mailman.py	2012-05-20 14:21:40.422891600 +0200
-@@ -28,12 +28,12 @@
- #
- # INSTALLATION:
- #
--# Install this file as ~mailman/qmail-to-mailman.py
-+# Install this file as ~mailman/bin/qmail-to-mailman.py
- #
- # To configure a virtual domain to connect to mailman, create these files:
- #
- # ~mailman/.qmail-default
--# |preline @PYTHON@ @prefix@/mail-in.py
-+# |preline /usr/bin/python /usr/lib/mailman/bin/mail-in.py
- #
- # /var/qmail/control/virtualdomains:
- # DOMAIN.COM:mailman
-@@ -64,7 +64,7 @@
-         sys.exit(100)
- 
-     local = string.lower(local)
--    local = re.sub("^mailman-","",local)
-+    local = re.sub("^" + MailmanUser + "-","",local)
- 
-     names = ("root", "postmaster", "mailer-daemon", "mailman-owner", "owner",
-              "abuse")

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2014-07-10 17:42:52 UTC (rev 761)
+++ trunk/debian/patches/series	2014-07-10 17:56:32 UTC (rev 762)
@@ -1,7 +1,6 @@
 01_defaults.debian.patch
 10_wrapper_uid.patch
 16_update_debian.patch
-20_qmail_to_mailman.debian.patch
 25_site_logo.patch
 51_nocompile.pyc.patch
 52_check_perms_lstat.patch