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

Sat Feb 21 15:07:04 UTC 2009

Author: thijs
Date: 2009-02-21 15:07:03 +0000 (Sat, 21 Feb 2009)
New Revision: 605

Removed:
   trunk/debian/patches/67_update_handle_old_versions.patch
Modified:
   trunk/debian/README.Debian
   trunk/debian/control
   trunk/debian/patches/series
Log:
post lenny cleanup; remove some old things that are not relevant anymore


Modified: trunk/debian/README.Debian
===================================================================

--- trunk/debian/README.Debian	2009-02-20 08:57:30 UTC (rev 604)
+++ trunk/debian/README.Debian	2009-02-21 15:07:03 UTC (rev 605)
@@ -18,15 +18,11 @@
 aliases, you'll need to specify a user=list line or something like that in
 the system_aliases director.
 
-As of 2.0.6-1, gate-news is commented out in the default crontab,
-since most people will be less interested in gating news-to-mail and
-vice versa.  This is asked by a low priority debconf question, so you
-can change it through debconf or by editing the crontab by hand.
+gate-news is commented out in the default crontab, since most people will be
+less interested in gating news-to-mail and vice versa.  This is asked by a
+low priority debconf question, so you can change it through debconf or by
+editing the crontab by hand.
 
-As of 2.1.4-2 a debconf question has been added allowing for
-installing only templates for languages used at your site in
-/etc/mailman (mailman/site_languages).
-
 An example Apache configuration is included in /etc/mailman/apache.conf.
 It can be copied to or symlinked from e.g. the /etc/apache2/conf.d/ directory.
 
@@ -64,23 +60,4 @@
 The current version of this handler used in this package is released on
 2003 May 6 by James Henstridge <james at daa.com.au>.
 
-Upgrading from Mailman 2.x (where x < 1)
-----------------------------------------
-
-Mailman 2.1 has some new aliases which you might want to add, namely
-admin, bounces, confirm, join, leave, owner, request, subscribe and
-unsubscribe.
-
-Also, /var/lib/mailman/mail/wrapper was changed to
-/var/lib/mailman/mail/mailman.  A compatilbility symlink has been
-added, but it will be removed in some future version, so please update
-your alias files.
-
-You must create a "mailman" list on your system, until it is added,
-mailman will not start.  (It will yell at you, so you should notice.)
-
-List admin and moderator passwords will be broken. Use
-/var/lib/mailman/bin/change_pw to generate new ones and email them to
-the admins and moderators.
-
  -- Lionel Elie Mamane <lmamane at debian.org>, dim, 27 aoû 2006 19:08:42 +0200

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2009-02-20 08:57:30 UTC (rev 604)
+++ trunk/debian/control	2009-02-21 15:07:03 UTC (rev 605)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Mailman for Debian <pkg-mailman-hackers at lists.alioth.debian.org>
 Uploaders: Lionel Elie Mamane <lmamane at debian.org>, Thijs Kinkhorst <thijs at debian.org>, Hector Garcia <hector at debian.org>
-Build-Depends: debhelper (>= 6), autoconf, python-dev, python-support, quilt (>= 0.40)
+Build-Depends: debhelper (>= 6), autoconf, python-dev, python-support, quilt
 Standards-Version: 3.8.0
 Homepage: http://www.list.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-mailman/trunk
@@ -13,7 +13,7 @@
 Package: mailman
 Architecture: any
 Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, ${python:Depends}, logrotate, cron, exim4 | mail-transport-agent, apache2 | httpd, ucf, pwgen, adduser, lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${python:Depends}, logrotate, cron, exim4 | mail-transport-agent, apache2 | httpd, ucf, pwgen, adduser, lsb-base
 Suggests: spamassassin, lynx, listadmin
 XB-Python-Version: ${python:Versions}
 Description: Powerful, web-based mailing list manager

Deleted: trunk/debian/patches/67_update_handle_old_versions.patch
===================================================================
--- trunk/debian/patches/67_update_handle_old_versions.patch	2009-02-20 08:57:30 UTC (rev 604)
+++ trunk/debian/patches/67_update_handle_old_versions.patch	2009-02-21 15:07:03 UTC (rev 605)
@@ -1,43 +0,0 @@
-Patch: 67_update_handle_old_versions.patch
-Author: Bastian Kleineidam <calvin at debian.org>
-Handle the case of upgrading from Mailman 2.0 where we have
-pending subscriptions (Closes: #280529)
-Index: mailman-2.1.10/bin/update
-===================================================================
---- mailman-2.1.10.orig/bin/update	2008-06-15 18:49:52.000000000 +0200
-+++ mailman-2.1.10/bin/update	2008-06-15 18:49:53.000000000 +0200
-@@ -514,9 +514,11 @@
-     file20 = os.path.join(mm_cfg.DATA_DIR, 'pending_subscriptions.db')
-     file214 = os.path.join(mm_cfg.DATA_DIR, 'pending.pck')
-     db = None
-+    ver = None
-     # Try to load the Mailman 2.0 file
-     try:
-         fp = open(file20)
-+        ver = "20"
-     except IOError, e:
-         if e.errno <> errno.ENOENT: raise
-     else:
-@@ -528,6 +530,7 @@
-         # Try to load the Mailman 2.1.x where x < 5, file
-         try:
-             fp = open(file214)
-+            ver = "214"
-         except IOError, e:
-             if e.errno <> errno.ENOENT: raise
-         else:
-@@ -561,8 +564,12 @@
-             # data[0] is the address being unsubscribed
-             addrops_by_address.setdefault(data[0], []).append((key, val))
-         elif op == Pending.SUBSCRIPTION:
--            # data[0] is a UserDesc object
--            addr = data[0].address
-+            if ver == "20":
-+                # data is tuple (emailaddr, password, digest)
-+                addr = data[0]
-+            else:
-+                # data[0] is a UserDesc object
-+                addr = data[0].address
-             subs_by_address.setdefault(addr, []).append((key, val))
-         elif op == Pending.RE_ENABLE:
-             # data[0] is the mailing list's internal name

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-02-20 08:57:30 UTC (rev 604)
+++ trunk/debian/patches/series	2009-02-21 15:07:03 UTC (rev 605)
@@ -19,7 +19,6 @@
 64_correct_html_nesting.patch
 65_handle_templates_directories.patch
 66_donot_let_cache_html_pages.patch
-67_update_handle_old_versions.patch
 68_update_catalan.patch
 70_invalid_utf8_dos.patch
 71_date_overflows.patch


