From: David Bremner <david@tethera.net>
Date: Wed, 1 Jan 2014 11:53:25 +0000 (-0400)
Subject: Merge tag 'debian/0.17-2'
X-Git-Tag: 0.18_rc0~208
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/notmuch.git/commitdiff_plain/39408d0f7d71334c539327db5bbfe248cbab8e82?hp=c734dd75344ea0d1701969a8ecb9ff00d2bd5531

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 0663f1d8..0f2b69b8 100644
--- 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