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

Thijs Kinkhorst thijs at alioth.debian.org
Tue Jun 24 20:34:20 UTC 2008 

Author: thijs
Date: 2008-06-24 20:34:20 +0000 (Tue, 24 Jun 2008)
New Revision: 544

Removed:
   trunk/debian/patches/58_fix_es_translation.patch
   trunk/debian/patches/61_fix_ru_siteowner.patch
   trunk/debian/patches/72_fblast_add_shebang.patch
   trunk/debian/patches/81_fix_subscribe_2.1.10.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/16_update_debian.patch
   trunk/debian/patches/64_correct_html_nesting.patch
   trunk/debian/patches/series
Log:
start packaging on 2.1.11, based on rc2. not releasing yet because
it needs more work & upstream plans to release 2.1.11 final next week


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-15 17:07:36 UTC (rev 543)
+++ trunk/debian/changelog	2008-06-24 20:34:20 UTC (rev 544)
@@ -1,5 +1,12 @@
-mailman (1:2.1.10-3) UNRELEASED; urgency=low
+mailman (1:2.1.11~rc2-1) UNRELEASED; urgency=low
 
+  * New upstream release candidate. Incorporates the following
+    Debian patches:
+    - 81_fix_subscribe_2.1.10.patch
+    - 61_fix_ru_siteowner.patch
+    - 72_fblast_add_shebang.patch
+    - 58_fix_es_translation.patch
+
   * Update Galician debconf translation, thanks
     Jacobo Tarrio (Closes: #482137).
   * Some tweaks to newlist.8 (Closes: #485382).
@@ -7,7 +14,7 @@
     and refresh all patches (Closes: #485253).
   * Checked for policy 3.8.0, no changes necessary.
 
- -- Thijs Kinkhorst <thijs at debian.org>  Sat, 14 Jun 2008 12:37:04 +0200
+ -- Thijs Kinkhorst <thijs at debian.org>  Tue, 24 Jun 2008 21:58:40 +0200
 
 mailman (1:2.1.10-2) unstable; urgency=low
 

Modified: trunk/debian/patches/16_update_debian.patch
===================================================================
--- trunk/debian/patches/16_update_debian.patch	2008-06-15 17:07:36 UTC (rev 543)
+++ trunk/debian/patches/16_update_debian.patch	2008-06-24 20:34:20 UTC (rev 544)
@@ -26,7 +26,7 @@
  
      #
      # move the html archives there
-@@ -338,31 +336,6 @@
+@@ -338,37 +338,6 @@
      # BAW: Is this still necessary?!
      mlist.Save()
      #
@@ -34,30 +34,36 @@
 -    # and move them to the new place if there's not already
 -    # a new one there
 -    #
--    tmpl_dir = os.path.join(mm_cfg.PREFIX, "templates")
--    list_dir = os.path.join(mm_cfg.PREFIX, "lists")
--    b4_tmpl_dir = os.path.join(tmpl_dir, mlist._internal_name)
--    new_tmpl_dir = os.path.join(list_dir, mlist._internal_name)
--    if os.path.exists(b4_tmpl_dir):
--        print _("""\
+-    # There is a problem with the following if the list name is equal
+-    # to a language code. All the templates get moved from templates/xx
+-    # to lists/xx. To avoid this, test the list name, and if it is 'en'
+-    # or matches a name in the messages directory, just skip this step.
+-    if (mlist._internal_name <> 'en' and
+-        mlist._internal_name not in os.listdir(mm_cfg.MESSAGES_DIR)):
+-        # It's okay to move the templates.
+-        tmpl_dir = os.path.join(mm_cfg.PREFIX, "templates")
+-        list_dir = mm_cfg.LIST_DATA_DIR
+-        b4_tmpl_dir = os.path.join(tmpl_dir, mlist._internal_name)
+-        new_tmpl_dir = os.path.join(list_dir, mlist._internal_name)
+-        if os.path.exists(b4_tmpl_dir):
+-            print _("""\
 -- This list looks like it might have <= b4 list templates around""")
--        for f in os.listdir(b4_tmpl_dir):
--            o_tmpl = os.path.join(b4_tmpl_dir, f)
--            n_tmpl = os.path.join(new_tmpl_dir, f)
--            if os.path.exists(o_tmpl):
--                if not os.path.exists(n_tmpl):
--                    os.rename(o_tmpl, n_tmpl)
--                    print _('- moved %(o_tmpl)s to %(n_tmpl)s')
+-            for f in os.listdir(b4_tmpl_dir):
+-                o_tmpl = os.path.join(b4_tmpl_dir, f)
+-                n_tmpl = os.path.join(new_tmpl_dir, f)
+-                if os.path.exists(o_tmpl):
+-                    if not os.path.exists(n_tmpl):
+-                        os.rename(o_tmpl, n_tmpl)
+-                        print _('- moved %(o_tmpl)s to %(n_tmpl)s')
+-                    else:
+-                        print _("""\
+-- both %(o_tmpl)s and %(n_tmpl)s exist, leaving untouched""")
 -                else:
 -                    print _("""\
--- both %(o_tmpl)s and %(n_tmpl)s exist, leaving untouched""")
--            else:
--                print _("""\
 -- %(o_tmpl)s doesn't exist, leaving untouched""")
--    #
+     #
      # Move all the templates to the en language subdirectory as required for
      # Mailman 2.1
-     #
 @@ -656,12 +629,12 @@
                  'Mailman/HyperDatabase.py', 'Mailman/pipermail.py',
                  'Mailman/smtplib.py', 'Mailman/Cookie.py',

Deleted: trunk/debian/patches/58_fix_es_translation.patch
===================================================================
--- trunk/debian/patches/58_fix_es_translation.patch	2008-06-15 17:07:36 UTC (rev 543)
+++ trunk/debian/patches/58_fix_es_translation.patch	2008-06-24 20:34:20 UTC (rev 544)
@@ -1,16 +0,0 @@
-Patch: 58_fix_translations.patch
-Author: Siggy Brentrup <bsb at debian.org>
-Fix translation errors
-Index: mailman-2.1.10/messages/es/LC_MESSAGES/mailman.po
-===================================================================
---- mailman-2.1.10.orig/messages/es/LC_MESSAGES/mailman.po	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/messages/es/LC_MESSAGES/mailman.po	2008-06-15 18:49:47.000000000 +0200
-@@ -2002,7 +2002,7 @@
- 
- #: Mailman/Cgi/create.py:212 bin/newlist:204
- msgid "Illegal list name: %(s)s"
--msgstr "Nombre de lista ilegal: %(opt)s"
-+msgstr "Nombre de lista ilegal: %(s)s"
- 
- #: Mailman/Cgi/create.py:217
- msgid ""

Deleted: trunk/debian/patches/61_fix_ru_siteowner.patch
===================================================================
--- trunk/debian/patches/61_fix_ru_siteowner.patch	2008-06-15 17:07:36 UTC (rev 543)
+++ trunk/debian/patches/61_fix_ru_siteowner.patch	2008-06-24 20:34:20 UTC (rev 544)
@@ -1,14 +0,0 @@
-Patch: 61_fix_ru_siteowner.patch
-Author: László 'GCS' Böszörményi <gcs at lsc.hu>
-Submitted upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1578766&group_id=103&atid=300103
-Correct siteowner variable in ru template for newer Mailman versions.
-Index: mailman-2.1.10/templates/ru/newlist.txt
-===================================================================
---- mailman-2.1.10.orig/templates/ru/newlist.txt	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/templates/ru/newlist.txt	2008-06-15 18:49:48.000000000 +0200
-@@ -37,4 +37,4 @@
- ÐÏÌØÚÏ×ÁÔÅÌÑ.
- 
- ÷ÓÅ ×ÏÐÒÏÓÙ Ï ÓÉÓÔÅÍÅ ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ, ÏÔÐÒÁ×É× ÐÉÓØÍÏ ÐÏ ÁÄÒÅÓÕ
--mailman-owner@%(hostname)s.
-+    %(siteowner)s.

Modified: trunk/debian/patches/64_correct_html_nesting.patch
===================================================================
--- trunk/debian/patches/64_correct_html_nesting.patch	2008-06-15 17:07:36 UTC (rev 543)
+++ trunk/debian/patches/64_correct_html_nesting.patch	2008-06-24 20:34:20 UTC (rev 544)
@@ -6,18 +6,16 @@
 ===================================================================
 --- mailman-2.1.10.orig/templates/ca/listinfo.html	2008-04-21 20:28:22.000000000 +0200
 +++ mailman-2.1.10/templates/ca/listinfo.html	2008-06-15 18:49:50.000000000 +0200
-@@ -53,8 +53,9 @@
-       </TR>
-       
-   <tr> 
--    <td colspan="2">Per subscriure's ompli el seg&uuml;ent formulari. <MM-List-Subscription-Msg> 
--      <ul>
-+    <td colspan="2">Per subscriure's ompli el seg&uuml;ent formulari.
-+	  <ul>
-+	    <MM-List-Subscription-Msg>
-         <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
+@@ -62,8 +62,8 @@
+ 	  <P>
+ 	    Ompliu el formulari seg&uuml;ent per a
+ 	      subscriure-us a <MM-List-Name>.
+-	  <MM-List-Subscription-Msg>
+       <ul>
++	  <MM-List-Subscription-Msg>
+ 
+ 	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
  		WIDTH="70%" HEIGHT= "112">
-           <TR> 
 Index: mailman-2.1.10/templates/cs/listinfo.html
 ===================================================================
 --- mailman-2.1.10.orig/templates/cs/listinfo.html	2008-04-21 20:28:22.000000000 +0200

Deleted: trunk/debian/patches/72_fblast_add_shebang.patch
===================================================================
--- trunk/debian/patches/72_fblast_add_shebang.patch	2008-06-15 17:07:36 UTC (rev 543)
+++ trunk/debian/patches/72_fblast_add_shebang.patch	2008-06-24 20:34:20 UTC (rev 544)
@@ -1,14 +0,0 @@
-Patch: 72_fblast_add_shebang.patch
-Author: Thijs Kinkhorst <thijs at debian.org>
-Submitted upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1578740&group_id=103&atid=300103
-This script may be called directly from the command line, is set as executable,
-thus needs a shebang line.
-Index: mailman-2.1.10/tests/fblast.py
-===================================================================
---- mailman-2.1.10.orig/tests/fblast.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/tests/fblast.py	2008-06-15 18:49:55.000000000 +0200
-@@ -1,3 +1,4 @@
-+#! /usr/bin/env python
- """Throw email at Mailman as fast as you can.
- 
- This is not a unit test, it's a functional test, so you can't run it within

Deleted: trunk/debian/patches/81_fix_subscribe_2.1.10.patch
===================================================================
--- trunk/debian/patches/81_fix_subscribe_2.1.10.patch	2008-06-15 17:07:36 UTC (rev 543)
+++ trunk/debian/patches/81_fix_subscribe_2.1.10.patch	2008-06-24 20:34:20 UTC (rev 544)
@@ -1,21 +0,0 @@
-Patch: 81_fix_subscribe_2.1.10
-Author: Mark Sapiro (Mailman upstream)
-2.1.10 caused a regression in cmd_subscribe so that email subscribe to the
--subscribe or -join address or the -request address with a bare 'subscribe'
-command results in the message being shunted. Will be fixed in the next
-upstream release.
-
-Index: mailman-2.1.10/Mailman/Commands/cmd_subscribe.py
-===================================================================
---- mailman-2.1.10.orig/Mailman/Commands/cmd_subscribe.py	2008-04-21 20:28:22.000000000 +0200
-+++ mailman-2.1.10/Mailman/Commands/cmd_subscribe.py	2008-06-15 18:49:58.000000000 +0200
-@@ -71,7 +71,8 @@
-             return STOP
-         argnum += 1
-     # Fix the password/digest issue
--    if digest is None and password.lower() in ('digest', 'nodigest'):
-+    if (digest is None
-+            and password and password.lower() in ('digest', 'nodigest')):
-         if password.lower() == 'digest':
-             digest = 1
-         else:

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2008-06-15 17:07:36 UTC (rev 543)
+++ trunk/debian/patches/series	2008-06-24 20:34:20 UTC (rev 544)
@@ -13,9 +13,7 @@
 51_nocompile.pyc.patch
 52_check_perms_lstat.patch
 53_disable_addons.patch
-58_fix_es_translation.patch
 59_fix_missing_language_crash.patch
-61_fix_ru_siteowner.patch
 62_new_list_bad_pending_requests.patch
 63_update_default_server_language.patch
 64_correct_html_nesting.patch
@@ -24,11 +22,9 @@
 67_update_handle_old_versions.patch
 70_invalid_utf8_dos.patch
 71_date_overflows.patch
-72_fblast_add_shebang.patch
 74_admin_non-ascii_emails.patch
 77_header_folding_in_attachments.patch
 78_DeprecationWarning.patch
 79_archiver_slash.patch
 80_fix_string_search.patch
-81_fix_subscribe_2.1.10.patch
 99_js_templates.patch

More information about the Pkg-mailman-hackers mailing list