Merge tag 'debian/0.17-2'

uploaded to unstable

diff --git a/debian/NEWS.Debian b/debian/NEWS
similarity index 100%
rename from debian/NEWS.Debian
rename to debian/NEWS

diff --git a/debian/changelog b/debian/changelog
index 0663f1d81c268945845b43b7d546a18aaf88bea0..0f2b69b8ba21b178d9b9b28214d28593082e24d3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.17-2) unstable; urgency=medium
+
+  * Bug fix: "package should warn in a NEWS.Debian file about possible
+    pre-upgrade action", thanks to Jonas Smedegaard (Closes: #733853).
+
+ -- David Bremner <bremner@debian.org>  Wed, 01 Jan 2014 07:44:25 -0400
+
 notmuch (0.17-1) unstable; urgency=low
 
   * New upstream feature release. See /usr/share/doc/notmuch/NEWS.gz