Merge commit '0.6.1'

Conflicts:
	lib/Makefile.local

The conflicts are from three kinds of commits not merged into release:
    - typo fixes
    - removal of debug output
    - fix for CLEAN rule

That were never merged into the release branch.

6 files changed, 23 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 0fad868a..37a228c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+notmuch (0.6.1-1) unstable; urgency=low
+
+  * Properly install README.Debian in notmuch-vim (Closes: #632992).
+    Thanks to Jason Woofenden for the report.
+  * Force notmuch to depend on the same version of libnotmuch. Thanks to
+    Uwe Kleine-König for the patch.
+  * Export typeinfo for Xapian exceptions from libnotmuch. This fixes
+    certain mysterious uncaught exception problems.
+
+ -- David Bremner <bremner@debian.org>  Sun, 17 Jul 2011 10:20:42 -0300
+
 notmuch (0.6) unstable; urgency=low
 
   * New upstream release; see /usr/share/doc/notmuch/NEWS for
diff --git a/debian/control b/debian/control
index 78c9849b..03afdf44 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Dm-Upload-Allowed: yes
 
 Package: notmuch
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libnotmuch1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: notmuch-emacs | notmuch-vim
 Description: thread-based email index, search and tagging
  Notmuch is a system for indexing, searching, reading, and tagging
diff --git a/debian/libnotmuch1.symbols b/debian/libnotmuch1.symbols
index 8df6fec1..05d86e6d 100644
--- a/debian/libnotmuch1.symbols
+++ b/debian/libnotmuch1.symbols
@@ -70,3 +70,13 @@ libnotmuch.so.1 libnotmuch1 #MINVER#
  notmuch_threads_get@Base 0.3
  notmuch_threads_move_to_next@Base 0.3
  notmuch_threads_valid@Base 0.3
+ (c++)"typeinfo for Xapian::LogicError@Base" 0.6.1
+ (c++)"typeinfo for Xapian::RuntimeError@Base" 0.6.1
+ (c++)"typeinfo for Xapian::DocNotFoundError@Base" 0.6.1
+ (c++)"typeinfo for Xapian::InvalidArgumentError@Base" 0.6.1
+ (c++)"typeinfo for Xapian::Error@Base" 0.6.1
+ (c++)"typeinfo name for Xapian::LogicError@Base" 0.6.1
+ (c++)"typeinfo name for Xapian::RuntimeError@Base" 0.6.1
+ (c++)"typeinfo name for Xapian::DocNotFoundError@Base" 0.6.1
+ (c++)"typeinfo name for Xapian::InvalidArgumentError@Base" 0.6.1
+ (c++)"typeinfo name for Xapian::Error@Base" 0.6.1
diff --git a/debian/README.notmuch-emacs b/debian/notmuch-emacs.README.Debian
index 713523b4..713523b4 100644
--- a/debian/README.notmuch-emacs
+++ b/debian/notmuch-emacs.README.Debian
diff --git a/debian/README.notmuch-vim b/debian/notmuch-vim.README.Debian
index ec052eef..ec052eef 100644
--- a/debian/README.notmuch-vim
+++ b/debian/notmuch-vim.README.Debian
diff --git a/debian/source/format b/debian/source/format
index 89ae9db8..163aaf8d 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)