debian: rename NEWS.Debian to NEWS

Apparently I had it backwards: NEWS is installed as NEWS.Debian, not
vice-versa.

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644 (file)
index 0000000..8049a93
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,44 @@
+notmuch (0.17-1) unstable; urgency=low
+
+  * Previously on big endian architectures like sparc and powerpc the
+    computation of SHA1 hashes was incorrect. This meant that messages
+    with overlong or missing message-ids were given different computed
+    message-ids than on more common little endian architectures like
+    i386 and amd64.  If you use notmuch on a big endian architecture,
+    you are strongly advised to make a backup of your tags using
+    `notmuch dump` before this upgrade.  You can locate the affected
+    files using something like:
+
+    notmuch dump | \
+      awk '/^notmuch-sha1-[0-9a-f]{40} / \
+        {system("notmuch search --exclude=false --output=files id:" $1)}'
+
+ -- David Bremner <bremner@debian.org>  Mon, 30 Dec 2013 20:31:16 -0400
+
+notmuch (0.16-1) unstable; urgency=low
+
+  * The vim interface has been rewritten from scratch. In particular
+    it requires a version of vim with ruby support.
+
+ -- David Bremner <bremner@debian.org>  Sat, 16 Feb 2013 08:12:02 -0400
+
+notmuch (0.14-1) unstable; urgency=low
+
+  There is an incompatible change in option syntax for dump and restore
+  in this release. Please update your scripts.
+
+  From upstream NEWS:
+
+  The deprecated positional output file argument to notmuch dump has
+  been replaced with an --output option. The input file positional
+  argument for restore has been replaced with an --input option for
+  consistency with dump.
+
+ -- David Bremner <bremner@debian.org>  Sun, 05 Aug 2012 11:52:49 -0300
+
+notmuch (0.6~238) unstable; urgency=low
+
+  The emacs user interface to notmuch is now contained in a separate
+  package called notmuch-emacs.
+
+ -- David Bremner <bremner@debian.org>  Mon, 20 Jun 2011 23:57:55 -0300

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
deleted file mode 100644 (file)
index 8049a93..0000000
--- a/debian/NEWS.Debian
+++ /dev/null
@@ -1,44 +0,0 @@
-notmuch (0.17-1) unstable; urgency=low
-
-  * Previously on big endian architectures like sparc and powerpc the
-    computation of SHA1 hashes was incorrect. This meant that messages
-    with overlong or missing message-ids were given different computed
-    message-ids than on more common little endian architectures like
-    i386 and amd64.  If you use notmuch on a big endian architecture,
-    you are strongly advised to make a backup of your tags using
-    `notmuch dump` before this upgrade.  You can locate the affected
-    files using something like:
-
-    notmuch dump | \
-      awk '/^notmuch-sha1-[0-9a-f]{40} / \
-        {system("notmuch search --exclude=false --output=files id:" $1)}'
-
- -- David Bremner <bremner@debian.org>  Mon, 30 Dec 2013 20:31:16 -0400
-
-notmuch (0.16-1) unstable; urgency=low
-
-  * The vim interface has been rewritten from scratch. In particular
-    it requires a version of vim with ruby support.
-
- -- David Bremner <bremner@debian.org>  Sat, 16 Feb 2013 08:12:02 -0400
-
-notmuch (0.14-1) unstable; urgency=low
-
-  There is an incompatible change in option syntax for dump and restore
-  in this release. Please update your scripts.
-
-  From upstream NEWS:
-
-  The deprecated positional output file argument to notmuch dump has
-  been replaced with an --output option. The input file positional
-  argument for restore has been replaced with an --input option for
-  consistency with dump.
-
- -- David Bremner <bremner@debian.org>  Sun, 05 Aug 2012 11:52:49 -0300
-
-notmuch (0.6~238) unstable; urgency=low
-
-  The emacs user interface to notmuch is now contained in a separate
-  package called notmuch-emacs.
-
- -- David Bremner <bremner@debian.org>  Mon, 20 Jun 2011 23:57:55 -0300

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