[Python-apps-commits] r2464 - in packages/archivemail/trunk/debian (3 files)

[sez-guest at users.alioth.debian.org]

    Date: Sunday, February 22, 2009 @ 18:38:05
  Author: sez-guest
Revision: 2464

debian/0.7.2-6 for archivemail

Modified:
  packages/archivemail/trunk/debian/changelog
  packages/archivemail/trunk/debian/copyright
  packages/archivemail/trunk/debian/patches/add-archive-all-switch.diff

Modified: packages/archivemail/trunk/debian/changelog
===================================================================
--- packages/archivemail/trunk/debian/changelog	2009-02-22 14:04:24 UTC (rev 2463)
+++ packages/archivemail/trunk/debian/changelog	2009-02-22 18:38:05 UTC (rev 2464)
@@ -1,10 +1,10 @@
-archivemail (0.7.2-6) UNRELEASED; urgency=low
+archivemail (0.7.2-6) unstable; urgency=low
 
   [ Serafeim Zanikolas ]
   * Do not overwrite <mailbox>_archive.gz when it is a symbolic link.
     Closes: #349068.
-  * Add, document and test --archive-all option. Closes: #470675.
   * Add, document and test --prefix option for archive name. Closes: #247340.
+  * Add, document and test --all option. Closes: #470675.
   * Switch patch management from dpatch to quilt.
   * Re-add ${misc:Depends} in control file.
   * Add Uploaders and Vcs-* fields as it is now maintained as part of the
@@ -14,7 +14,7 @@
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Serafeim Zanikolas <serzan at hellug.gr>  Sun, 07 Sep 2008 23:15:47 +0100
+ -- Serafeim Zanikolas <serzan at hellug.gr>  Sun, 22 Feb 2009 02:10:50 +0000
 
 archivemail (0.7.2-5) unstable; urgency=low
 

Modified: packages/archivemail/trunk/debian/copyright
===================================================================
--- packages/archivemail/trunk/debian/copyright	2009-02-22 14:04:24 UTC (rev 2463)
+++ packages/archivemail/trunk/debian/copyright	2009-02-22 18:38:05 UTC (rev 2464)
@@ -6,7 +6,7 @@
 
 The following copyright applies to this package:
 
-# Copyright (C) 2002  Paul Rodger <paul at paulrodger.com>
+# Copyright © 2002  Paul Rodger <paul at paulrodger.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,4 +23,4 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 On Debian systems, the complete text of the GPL is in
-/usr/share/common-licenses/GPL.
+/usr/share/common-licenses/GPL-2.

Modified: packages/archivemail/trunk/debian/patches/add-archive-all-switch.diff
===================================================================
--- packages/archivemail/trunk/debian/patches/add-archive-all-switch.diff	2009-02-22 14:04:24 UTC (rev 2463)
+++ packages/archivemail/trunk/debian/patches/add-archive-all-switch.diff	2009-02-22 18:38:05 UTC (rev 2464)
@@ -23,7 +23,7 @@
                               "preserve-unread", "quiet", "size=", "suffix=",
                               "verbose", "version", "warn-duplicate", "copy",
 -                             "prefix="])
-+                             "prefix=", "archive-all"])
++                             "prefix=", "all"])
          except getopt.error, msg:
              user_error(msg)
  
@@ -31,7 +31,7 @@
                  if self.copy_old_mail: 
                      user_error("found conflicting options --copy and --delete")
                  self.delete_old_mail = 1
-+            if o == ('--archive-all'):
++            if o == ('--all'):
 +                self.archive_all = 1
              if o == '--include-flagged':
                  self.include_flagged = 1
@@ -41,7 +41,7 @@
                  print __version__ + "\n\n" + __copyright__
                  sys.exit(0)
 +        if self.archive_all and archive_by:
-+            user_error("--archive-all must not be used with other " +
++            user_error("--all must not be used with other " +
 +                       "filtering options")
          return args
  
@@ -50,7 +50,7 @@
  mailbox compressed with gzip. 
  
  Options are as follows:
-+      --archive-all     archive all messages (not to be used along with other
++      --all             archive all messages (not to be used along with other
 +                        filter switches; use with caution)
    -d, --days=NUM        archive messages older than NUM days (default: %d)
    -D, --date=DATE       archive messages older than DATE
@@ -72,7 +72,7 @@
  
  <VarListEntry>
  <Term>
-+    <Option>--archive-all</Option>
++    <Option>--all</Option>
 +</Term>
 +<ListItem><Para>
 +Archive _all_ messages. Not to be combined with other filter switches.
@@ -93,7 +93,7 @@
  
  
 +class TestArchiveAll(TestCaseInTempdir):
-+    """make sure the 'archive-all' option works"""
++    """make sure the 'all' option works"""
 +    def setUp(self):
 +        super(TestArchiveAll, self).setUp()
 +        archivemail.options.quiet = 1
@@ -108,7 +108,7 @@
 +                archivemail.options.archive_all = 1
 +                archivemail.archive(self.mbox_name)
 +            elif execute == "system_long":
-+                run = "./archivemail.py --archive-all --quiet "\
++                run = "./archivemail.py --all --quiet "\
 +                        + "%s 2>&1 >/dev/null" % self.mbox_name
 +                self.assertEqual(os.system(run), 0)
 +            else:
@@ -121,7 +121,7 @@
 +        """test that it gives up with invoked with either -d or -D"""
 +        for arg in ["-d 30", "--days=30",\
 +                    "-D 2008-07-30", "--date=2008-07-30"]:
-+            run = ("./archivemail.py --archive-all %s --quiet "\
++            run = ("./archivemail.py --all %s --quiet "\
 +                    + "whatever >/dev/null 2>&1") % arg
 +            self.assertEqual(os.system(run), 256)
 +