From 273029bfc5ab1e141520fce5735a3bc23b9757eb Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 15 Oct 2010 13:44:58 -0400
Subject: [PATCH] closing debian #591118

---
 debian/changelog           |  8 ++++++++
 debian/control             |  2 +-
 debian/patches/591118.diff | 17 +++++++++++++++++
 debian/patches/series      |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/591118.diff
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index a3cc235..aa9b05a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+monkeysphere (0.31-2) unstable; urgency=low
+
+  * sleep a bit in keytrans suite to ensure that at least a full second
+    passes before using $keytrans + 1 (Closes: #591118)
+  * bumped Standards-Version to 3.9.1 (no changes needed)
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Fri, 15 Oct 2010 13:42:18 -0400
+
 monkeysphere (0.31-1) unstable; urgency=low
 
   * New Upstream Release
diff --git a/debian/control b/debian/control
index 1c3e347..d604c16 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~),
  lockfile-progs | procmail,
  openssl,
  bash (>= 3.2)
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://web.monkeysphere.info/
 Vcs-Git: git://git.monkeysphere.info/monkeysphere
 Dm-Upload-Allowed: yes
diff --git a/debian/patches/591118.diff b/debian/patches/591118.diff
new file mode 100644
index 0000000..4550990
--- /dev/null
+++ b/debian/patches/591118.diff
@@ -0,0 +1,17 @@
+diff --git a/tests/keytrans b/tests/keytrans
+index 411b42e..3aaed50 100755
+--- a/tests/keytrans
++++ b/tests/keytrans
+@@ -138,6 +138,12 @@ EOF
+ diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons --fixed-list-mode | grep -v ^tru)
+ 
+ echo "##################################################"
++echo "### sleeping to avoid test suite breakage on fast"
++echo "### processors (see http://bugs.debian.org/591118)"
++
++sleep 2
++
++echo "##################################################"
+ echo "### test User ID revocation ... "
+ 
+ revtime=$(($timestamp + 1))
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..101870b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+591118.diff
-- 
2.26.2