debian: Incorporate changelog entries from post 0.5 uploads

These uploads added the timeout to the tests to fix build failures.
(cherry picked from commit 0901faabd90a689728d8079b3163bd76b29d29aa)

diff --git a/debian/changelog b/debian/changelog
index cc758b99fb54d8e982c560f51809720a2231fb7b..d8c823089c72114ecb432a39bab2b43751528c9d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+notmuch (0.5+nmu3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Upload to unstable.
+
+ -- David Bremner <bremner@debian.org>  Sun, 01 May 2011 15:09:09 -0300
+
+notmuch (0.5+nmu2) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Second try at timeout for test. Put timeouts at top level.
+
+ -- David Bremner <bremner@debian.org>  Sun, 19 Dec 2010 21:40:08 -0400
+
+notmuch (0.5+nmu1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Add a timeout to emacs tests to hopefully work around build failures.
+
+ -- David Bremner <bremner@debian.org>  Tue, 14 Dec 2010 22:23:51 -0400
+
 notmuch (0.5) unstable; urgency=low
 
   * new: maildir-flag synchronization