Merge tag 'debian/0.17-3' into wheezy-backports

uploaded to Debian unstable

Conflicts:
	debian/changelog

13 files changed, 85 insertions, 15 deletions

diff --git a/debian/NEWS.Debian b/debian/NEWS
index e57b4d41..8049a933 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS
@@ -1,3 +1,20 @@
+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
diff --git a/debian/changelog b/debian/changelog
index ed004999..6edafe06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,58 @@
+notmuch (0.17-3) unstable; urgency=medium
+
+  * update notmuch-emacs for debian emacs policy 2.0.6
+  * Update emacs test suite for Hurd compatibility
+
+ -- David Bremner <bremner@debian.org>  Sun, 12 Jan 2014 17:07:16 -0400
+
+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
+    for details.  Highlights include:
+    - notmuch compact command (Closes: #720543).
+    - emacs "tree" view
+  * Remove madduck from uploaders (Closes: #719100).
+
+ -- David Bremner <bremner@debian.org>  Mon, 30 Dec 2013 20:28:20 -0400
+
+notmuch (0.17~rc4-1) experimental; urgency=low
+
+  * New upstream release candidate
+
+ -- David Bremner <bremner@debian.org>  Sat, 28 Dec 2013 18:30:06 -0400
+
+notmuch (0.17~rc3-1) experimental; urgency=low
+
+  * New upstream release candidate
+
+ -- David Bremner <bremner@debian.org>  Sat, 07 Dec 2013 17:05:11 +0800
+
+notmuch (0.17~rc2-1) experimental; urgency=low
+
+  * New upstream release candidate
+  * Remove gdb as build-dep on s390x. This implicitly disables failing
+    atomicity test.  For more information, see #728705
+
+ -- David Bremner <bremner@debian.org>  Sun, 24 Nov 2013 19:34:28 -0400
+
+notmuch (0.17~rc1-1) experimental; urgency=low
+
+  * New upstream release candidate
+
+ -- David Bremner <bremner@debian.org>  Wed, 20 Nov 2013 19:27:48 -0400
+
 notmuch (0.16-1~bpo70+1) wheezy-backports; urgency=low
 
   * Rebuild for wheezy-backports.
 
  -- David Bremner <bremner@debian.org>  Sun, 01 Sep 2013 19:04:32 -0300
-
 notmuch (0.16-1) unstable; urgency=low
 
   * New upstream feature release
diff --git a/debian/control b/debian/control
index 74a51614..a887263c 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  ruby, ruby-dev (>>1:1.9.3~),
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
- gdb,
+ gdb [!s390x !ia64],
  dtach (>= 0.8)
 Standards-Version: 3.9.4
 Homepage: http://notmuchmail.org/
@@ -108,6 +108,7 @@ Architecture: all
 Section: mail
 Breaks: notmuch (<<0.6~254~)
 Replaces: notmuch (<<0.6~254~)
+Conflicts: emacsen-common (<< 2.0.0)
 Depends: ${misc:Depends}, notmuch (>= ${source:Version}),
  emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) |
  emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~)
@@ -142,9 +143,8 @@ Depends:
  notmuch (>= 0.4),
  libmail-box-perl, libmailtools-perl,
  libstring-shellquote-perl, libterm-readline-gnu-perl,
- libfile-which-perl,
  ${misc:Depends}
-Recommends: mutt, fdupes
+Recommends: mutt
 Enhances: notmuch, mutt
 Description: thread-based email index, search and tagging (Mutt interface)
  notmuch-mutt provides integration among the Mutt mail user agent and
diff --git a/debian/libnotmuch3.symbols b/debian/libnotmuch3.symbols
index 17946db3..ef6ae9db 100644
--- a/debian/libnotmuch3.symbols
+++ b/debian/libnotmuch3.symbols
@@ -2,6 +2,7 @@ libnotmuch.so.3 libnotmuch3 #MINVER#
  notmuch_database_add_message@Base 0.3
  notmuch_database_begin_atomic@Base 0.9~rc1
  notmuch_database_close@Base 0.13~rc1
+ notmuch_database_compact@Base 0.17~rc1
  notmuch_database_create@Base 0.3
  notmuch_database_destroy@Base 0.13~rc1
  notmuch_database_end_atomic@Base 0.9~rc1
diff --git a/debian/notmuch-emacs.README.Debian b/debian/notmuch-emacs.README.Debian
index 713523b4..33f2d993 100644
--- a/debian/notmuch-emacs.README.Debian
+++ b/debian/notmuch-emacs.README.Debian
@@ -1,8 +1,4 @@
-
-* This package currently works only with emacs 23.  Users of 
-  pre-release snapshots of emacs 24 can expect problems.
-
 * For help in getting started with notmuch and the emacs interface,
   see /usr/share/doc/notmuch/README.
 
- -- David Bremner <bremner@debian.org>, Fri,  1 Jul 2011 11:41:26 -0300
+ -- David Bremner <bremner@debian.org>, Wed, 27 Nov 2013 08:17:11 -0400
diff --git a/debian/notmuch-emacs.emacsen-compat b/debian/notmuch-emacs.emacsen-compat
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/debian/notmuch-emacs.emacsen-compat
@@ -0,0 +1 @@
+0
diff --git a/debian/notmuch-emacs.emacsen-install b/debian/notmuch-emacs.emacsen-install
index 8fd30276..dfd8fda9 100755
--- a/debian/notmuch-emacs.emacsen-install
+++ b/debian/notmuch-emacs.emacsen-install
@@ -8,8 +8,6 @@
 FLAVOR=$1
 PACKAGE=notmuch
 
-if [ ${FLAVOR} = emacs ]; then exit 0; fi
-
 # We know that the notmuch emacs code doesn't work with emacs before emacs23
 if [ ${FLAVOR} = emacs21 ]; then exit 0; fi
 if [ ${FLAVOR} = emacs22 ]; then exit 0; fi
diff --git a/debian/notmuch-emacs.emacsen-remove b/debian/notmuch-emacs.emacsen-remove
index 184c2b60..3b433ae2 100755
--- a/debian/notmuch-emacs.emacsen-remove
+++ b/debian/notmuch-emacs.emacsen-remove
@@ -4,7 +4,5 @@
 FLAVOR=$1
 PACKAGE=notmuch
 
-if [ ${FLAVOR} != emacs ]; then
-    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
-    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
+echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
diff --git a/debian/notmuch-emacs.postinst b/debian/notmuch-emacs.postinst
new file mode 100644
index 00000000..48ecf231
--- /dev/null
+++ b/debian/notmuch-emacs.postinst
@@ -0,0 +1,4 @@
+dir="/var/lib/emacsen-common/state/package/installed"
+mkdir -p 0755 ${dir}
+touch ${dir}/notmuch-emacs
+#DEBHELPER#
diff --git a/debian/notmuch-emacs.prerm b/debian/notmuch-emacs.prerm
new file mode 100644
index 00000000..5e2758d3
--- /dev/null
+++ b/debian/notmuch-emacs.prerm
@@ -0,0 +1,3 @@
+#DEBHELPER#
+dir="/var/lib/emacsen-common/state/package/installed"
+rm -f ${dir}/notmuch-emacs
diff --git a/debian/notmuch-vim.dirs b/debian/notmuch-vim.dirs
index c978ac11..c6373e42 100644
--- a/debian/notmuch-vim.dirs
+++ b/debian/notmuch-vim.dirs
@@ -1,3 +1,4 @@
 usr/share/vim/registry
 usr/share/vim/addons/plugin
+usr/share/vim/addons/doc
 usr/share/vim/addons/syntax
diff --git a/debian/notmuch-vim.install b/debian/notmuch-vim.install
index d444fef7..a1af708d 100644
--- a/debian/notmuch-vim.install
+++ b/debian/notmuch-vim.install
@@ -1,3 +1,4 @@
 vim/notmuch.vim usr/share/vim/addons/plugin
+vim/notmuch.txt usr/share/vim/addons/doc
 vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax
 vim/notmuch.yaml usr/share/vim/registry
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 00000000..7423a2df
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+single-debian-patch