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

[Lionel Elie Mamane]

Author: lmamane
Date: 2006-01-29 20:53:09 +0000 (Sun, 29 Jan 2006)
New Revision: 279

Removed:
   trunk/debian/patches/79_archiver_base_no_slash.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
Patch 79_archiver_base_no_slash broken; remove it

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-29 20:43:56 UTC (rev 278)
+++ trunk/debian/changelog	2006-01-29 20:53:09 UTC (rev 279)
@@ -16,7 +16,6 @@
   * Ship documentation source (closes: #346180)
   * Document queue-is-not-empty upgrade condition better
     (closes: #268117)
-  * Don't forcibly add a slash after Archiver base URL (closes: #350388)
   * Updated debconf template translations:
     - it (closes: #345234)
     - fr (closes: #346297)
@@ -24,7 +23,7 @@
   * Tweak mailman/update_passwords debconf note to address ambiguity in
     English version discovered by French translation.
 
- -- Lionel Elie Mamane <lmamane at debian.org>  Sun, 29 Jan 2006 21:20:17 +0100
+ -- Lionel Elie Mamane <lmamane at debian.org>  Sun, 29 Jan 2006 21:52:38 +0100
 
 mailman (2.1.6-2) UNRELEASED; urgency=low
 

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2006-01-29 20:43:56 UTC (rev 278)
+++ trunk/debian/patches/00list	2006-01-29 20:53:09 UTC (rev 279)
@@ -33,5 +33,4 @@
 74_admin_non-ascii_emails.dpatch
 77_header_folding_in_attachments
 78_DeprecationWarning
-79_archiver_base_no_slash
 99_js_templates

Deleted: trunk/debian/patches/79_archiver_base_no_slash.dpatch
===================================================================
--- trunk/debian/patches/79_archiver_base_no_slash.dpatch	2006-01-29 20:43:56 UTC (rev 278)
+++ trunk/debian/patches/79_archiver_base_no_slash.dpatch	2006-01-29 20:53:09 UTC (rev 279)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 79_archiver_base_no_slash.dpatch by  <lionel at mamane.lu>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mailman-2.1.7~/Mailman/Archiver/Archiver.py mailman-2.1.7/Mailman/Archiver/Archiver.py
---- mailman-2.1.7~/Mailman/Archiver/Archiver.py	2005-08-27 03:40:15.000000000 +0200
-+++ mailman-2.1.7/Mailman/Archiver/Archiver.py	2006-01-29 20:47:53.718046842 +0100
-@@ -146,9 +146,10 @@
-                 'listname': self.internal_name(),
-                 'hostname': hostname
-                 }
--            if not url.endswith('/'):
--                url += '/'
--            return url
-+#             Disabled by Debian: bug #350388
-+#             if not url.endswith('/'):
-+#                 url += '/'
-+#             return url
- 
-     def __archive_file(self, afn):
-         """Open (creating, if necessary) the named archive file."""