[Python-apps-commits] r3997 - in packages/archivemail/trunk/debian (12 files)

sez-guest at users.alioth.debian.org sez-guest at users.alioth.debian.org
Mon Oct 19 17:14:58 UTC 2009 

    Date: Monday, October 19, 2009 @ 17:14:57
  Author: sez-guest
Revision: 3997

Maintenance release of archivemail 0.7.2-7:

* Relax the precision of comparisons of mailbox timestamps in test suite.
  Closes: #549736.
* Bump up Standards-Version to 3.8.3
  - skip tests when nocheck is in DEB_BUILD_OPTIONS
  - add debian/README.source
  - add headers in quilt patches

Added:
  packages/archivemail/trunk/debian/patches/relax-timestamps-test.diff
Modified:
  packages/archivemail/trunk/debian/changelog
  packages/archivemail/trunk/debian/clean
  packages/archivemail/trunk/debian/control
  packages/archivemail/trunk/debian/patches/add-archive-all-switch.diff
  packages/archivemail/trunk/debian/patches/add-archive-name-switch.diff
  packages/archivemail/trunk/debian/patches/add-prefix-switch.diff
  packages/archivemail/trunk/debian/patches/empty-mailbox-objects-fix.diff
  packages/archivemail/trunk/debian/patches/fix-path-in-example.diff
  packages/archivemail/trunk/debian/patches/preserve-symlinks.diff
  packages/archivemail/trunk/debian/patches/series
  packages/archivemail/trunk/debian/rules

Modified: packages/archivemail/trunk/debian/changelog
===================================================================
--- packages/archivemail/trunk/debian/changelog	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/changelog	2009-10-19 17:14:57 UTC (rev 3997)
@@ -1,3 +1,14 @@
+archivemail (0.7.2-7) unstable; urgency=low
+
+  * Relax the precision of comparisons of mailbox timestamps in test suite.
+    Closes: #549736.
+  * Bump up Standards-Version to 3.8.3
+    - skip tests when nocheck is in DEB_BUILD_OPTIONS
+    - add debian/README.source
+    - add headers in quilt patches
+
+ -- Serafeim Zanikolas <serzan at hellug.gr>  Sat, 10 Oct 2009 18:33:29 +0200
+
 archivemail (0.7.2-6) unstable; urgency=low
 
   [ Serafeim Zanikolas ]

Modified: packages/archivemail/trunk/debian/clean
===================================================================
--- packages/archivemail/trunk/debian/clean	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/clean	2009-10-19 17:14:57 UTC (rev 3997)
@@ -1,3 +1,4 @@
 archivemail.py
 archivemail.pyc
 debian/manpage.refs
+debian/manpage.links

Modified: packages/archivemail/trunk/debian/control
===================================================================
--- packages/archivemail/trunk/debian/control	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/control	2009-10-19 17:14:57 UTC (rev 3997)
@@ -4,7 +4,7 @@
 Maintainer: Serafeim Zanikolas <serzan at hellug.gr>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.2), python, python-dev, docbook, docbook-utils, python-support (>= 0.4), quilt
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/archivemail/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/archivemail/trunk/
 Homepage: http://archivemail.sourceforge.net/

Modified: packages/archivemail/trunk/debian/patches/add-archive-all-switch.diff
===================================================================
--- packages/archivemail/trunk/debian/patches/add-archive-all-switch.diff	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/patches/add-archive-all-switch.diff	2009-10-19 17:14:57 UTC (rev 3997)
@@ -1,3 +1,7 @@
+# Description: add, document and test --all option
+# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=470675
+# Author: Serafeim Zanikolas <serzan at hellug.gr>
+# Last-Update: 2009-02-22
 Index: archivemail/archivemail
 ===================================================================
 --- archivemail.orig/archivemail	2008-09-06 15:11:32.000000000 +0100

Modified: packages/archivemail/trunk/debian/patches/add-archive-name-switch.diff
===================================================================
--- packages/archivemail/trunk/debian/patches/add-archive-name-switch.diff	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/patches/add-archive-name-switch.diff	2009-10-19 17:14:57 UTC (rev 3997)
@@ -1,3 +1,7 @@
+# Description: add and document --archive-name option
+# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=247340
+# Author: Serafeim Zanikolas <serzan at hellug.gr>
+# Last-Update: 2008-08-15
 Index: archivemail/archivemail
 ===================================================================
 --- archivemail.orig/archivemail	2008-08-15 20:38:03.000000000 +0100

Modified: packages/archivemail/trunk/debian/patches/add-prefix-switch.diff
===================================================================
--- packages/archivemail/trunk/debian/patches/add-prefix-switch.diff	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/patches/add-prefix-switch.diff	2009-10-19 17:14:57 UTC (rev 3997)
@@ -1,3 +1,7 @@
+# Description: add, document and test --prefix option for archive name
+# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=247340
+# Author: Serafeim Zanikolas <serzan at hellug.gr>
+# Last-Update: 2009-02-22
 Index: archivemail/archivemail
 ===================================================================
 --- archivemail.orig/archivemail	2008-08-15 21:40:17.000000000 +0100

Modified: packages/archivemail/trunk/debian/patches/empty-mailbox-objects-fix.diff
===================================================================
--- packages/archivemail/trunk/debian/patches/empty-mailbox-objects-fix.diff	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/patches/empty-mailbox-objects-fix.diff	2009-10-19 17:14:57 UTC (rev 3997)
@@ -1,3 +1,7 @@
+# Description: add, document and test --all option
+# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=476806
+# Author: Joey Hess <joeyh at debian.org>
+# Last-Update: 2008-08-14
 Index: archivemail/archivemail
 ===================================================================
 --- archivemail.orig/archivemail	2008-08-14 21:24:03.000000000 +0100

Modified: packages/archivemail/trunk/debian/patches/fix-path-in-example.diff
===================================================================
--- packages/archivemail/trunk/debian/patches/fix-path-in-example.diff	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/patches/fix-path-in-example.diff	2009-10-19 17:14:57 UTC (rev 3997)
@@ -1,3 +1,5 @@
+# Description: correct example invocation
+# Author: Serafeim Zanikolas <serzan at hellug.gr>
 --- archivemail-0.7.2.orig/examples/archivemail_all
 +++ archivemail-0.7.2/examples/archivemail_all
 @@ -10,7 +10,7 @@

Modified: packages/archivemail/trunk/debian/patches/preserve-symlinks.diff
===================================================================
--- packages/archivemail/trunk/debian/patches/preserve-symlinks.diff	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/patches/preserve-symlinks.diff	2009-10-19 17:14:57 UTC (rev 3997)
@@ -1,3 +1,7 @@
+# Description: do not overwrite <mailbox>_archive.gz when it is a symbolic link
+# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=349068
+# Author: Serafeim Zanikolas <serzan at hellug.gr>
+# Last-Update: 2009-02-22
 Index: archivemail/archivemail
 ===================================================================
 --- archivemail.orig/archivemail	2008-08-15 21:41:37.000000000 +0100

Added: packages/archivemail/trunk/debian/patches/relax-timestamps-test.diff
===================================================================
--- packages/archivemail/trunk/debian/patches/relax-timestamps-test.diff	                        (rev 0)
+++ packages/archivemail/trunk/debian/patches/relax-timestamps-test.diff	2009-10-19 17:14:57 UTC (rev 3997)
@@ -0,0 +1,48 @@
+# Description: add, document and test --all option
+# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549736
+# Author: Nikolaus Schulz <microschulz at web.de>
+# Last-Update: 2009-10-10
+--- a/test_archivemail.py
++++ b/test_archivemail.py
+@@ -69,6 +69,8 @@
+         print "Try renaming it from 'archivemail' to 'archivemail.py'."
+     sys.exit(1)
+ 
++# precision of os.utime() when restoring mbox timestamps
++utimes_precision = 5
+ 
+ class TestCaseInTempdir(unittest.TestCase):
+     """Base class for testcases that need to create temporary files. 
+@@ -718,8 +720,8 @@
+             assert(os.path.exists(self.mbox_name))
+             new_atime = os.path.getatime(self.mbox_name)
+             new_mtime = os.path.getmtime(self.mbox_name)
+-            self.assertEqual(self.mtime, new_mtime)
+-            self.assertEqual(self.atime, new_atime)
++            self.assertAlmostEqual(self.mtime, new_mtime, utimes_precision)
++            self.assertAlmostEqual(self.atime, new_atime, utimes_precision)
+             self.tearDown()
+ 
+     def testMixed(self):
+@@ -741,8 +743,8 @@
+             assert(os.path.exists(self.mbox_name))
+             new_atime = os.path.getatime(self.mbox_name)
+             new_mtime = os.path.getmtime(self.mbox_name)
+-            self.assertEqual(self.mtime, new_mtime)
+-            self.assertEqual(self.atime, new_atime)
++            self.assertAlmostEqual(self.mtime, new_mtime, utimes_precision)
++            self.assertAlmostEqual(self.atime, new_atime, utimes_precision)
+             self.tearDown()
+ 
+     def testOld(self):
+@@ -764,8 +766,8 @@
+             assert(os.path.exists(self.mbox_name))
+             new_atime = os.path.getatime(self.mbox_name)
+             new_mtime = os.path.getmtime(self.mbox_name)
+-            self.assertEqual(self.mtime, new_mtime)
+-            self.assertEqual(self.atime, new_atime)
++            self.assertAlmostEqual(self.mtime, new_mtime, utimes_precision)
++            self.assertAlmostEqual(self.atime, new_atime, utimes_precision)
+             self.tearDown()
+ 
+     def tearDown(self):

Modified: packages/archivemail/trunk/debian/patches/series
===================================================================
--- packages/archivemail/trunk/debian/patches/series	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/patches/series	2009-10-19 17:14:57 UTC (rev 3997)
@@ -4,3 +4,4 @@
 preserve-symlinks.diff
 add-prefix-switch.diff
 add-archive-all-switch.diff
+relax-timestamps-test.diff

Modified: packages/archivemail/trunk/debian/rules
===================================================================
--- packages/archivemail/trunk/debian/rules	2009-10-19 17:03:41 UTC (rev 3996)
+++ packages/archivemail/trunk/debian/rules	2009-10-19 17:14:57 UTC (rev 3997)
@@ -2,17 +2,25 @@
 
 include /usr/share/quilt/quilt.make
 
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+TESTS_TARGET = check
+else
+TESTS_TARGET =
+endif
+
 %:
 	dh $@
 
 clean: unpatch
 	dh clean
 
+check:
+	ln -sf archivemail archivemail.py
+	./test_archivemail.py
+
 build: build-stamp
-build-stamp: patch
+build-stamp: patch $(TESTS_TARGET)
 	dh build
-	ln -sf archivemail archivemail.py
-	./test_archivemail.py
 	docbook2man archivemail.sgml -o debian/
 	touch build-stamp

More information about the Python-apps-commits mailing list