Merge commit 'debian/0.10.2-1' into squeeze-backports

Conflicts:
	debian/changelog

8 files changed, 156 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index 8964fe03..d30e6451 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,122 @@
+notmuch (0.10.2-1) unstable; urgency=low
+
+  * Upstream bug fix release
+    - Fix segfault in python bindings due to missing g_type_init call.
+
+ -- David Bremner <bremner@debian.org>  Sun, 04 Dec 2011 22:06:46 -0400
+
+notmuch (0.10.1-1) unstable; urgency=low
+
+  * Upstream bug fix release.
+    - Fix segfault on "notmuch --help"
+
+ -- David Bremner <bremner@debian.org>  Fri, 25 Nov 2011 12:11:30 -0500
+
+notmuch (0.10-1) unstable; urgency=low
+
+  * New upstream release
+    - search performance improvements
+    - emacs UI improvements
+    - new dump/restore features
+    - new script contrib/nmbug for sharing tags
+    - see /usr/share/doc/notmuch/NEWS for details
+
+ -- David Bremner <bremner@debian.org>  Wed, 23 Nov 2011 07:44:01 -0400
+
+notmuch (0.10~rc2-1) experimental; urgency=low
+
+  * New upstream release candidate
+    - includes patch to avoid long unix domain socket paths in tests
+
+ -- David Bremner <bremner@debian.org>  Sat, 19 Nov 2011 08:21:39 -0400
+
+notmuch (0.10~rc1-1) experimental; urgency=low
+
+  * New upstream release candidate.
+
+ -- David Bremner <bremner@debian.org>  Tue, 15 Nov 2011 19:46:55 -0400
+
+notmuch (0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Only doc changes since last release candidate.
+  * Upload to unstable.
+
+ -- David Bremner <bremner@debian.org>  Tue, 11 Oct 2011 21:51:29 -0300
+
+notmuch (0.9~rc2-1) experimental; urgency=low
+
+  * Upstream release candidate
+  * API changes for n_d_find_message and n_d_find_message_by_filename.
+    - New SONAME for libnotmuch
+    - bindings changes for ruby and python
+  * Less non-text parts reported in replies.
+  * emacs: provide button action to fetch unknown gpg keys 
+
+ -- David Bremner <bremner@debian.org>  Fri, 07 Oct 2011 18:53:04 -0300
+
+notmuch (0.9~rc1-1) experimental; urgency=low
+
+  * Upstream release candidate
+    - Atomicity improvements, thanks to Austin Clements
+    - Add missing call to g_type_init, thanks to Aaron Ecay
+  * notmuch-emacs: add versioned dependency on notmuch.  
+    (Closes: #642240).
+
+ -- David Bremner <bremner@debian.org>  Sun, 25 Sep 2011 11:26:01 -0300
+
+notmuch (0.8-1) unstable; urgency=low
+
+  * New upstream version.
+    - Improved handling of message/rfc822 parts
+    - Improved Build system portability 
+    - Documentation update for Ruby bindings
+    - Unicode, iterator, PEP8 changes for python bindings
+
+ -- David Bremner <bremner@debian.org>  Sat, 10 Sep 2011 08:53:55 -0300
+
+notmuch (0.8~rc1-1) experimental; urgency=low
+
+  * Upstream release candidate.
+
+ -- David Bremner <bremner@debian.org>  Tue, 06 Sep 2011 22:24:24 -0300
+
+notmuch (0.7-1) unstable; urgency=low
+
+  * New upstream release (no changes since 0.7~rc1).
+  * Upload to unstable.
+
+ -- David Bremner <bremner@debian.org>  Mon, 01 Aug 2011 21:46:26 +0200
+
+notmuch (0.7~rc1-1) experimental; urgency=low
+
+  * Upstream release candidate.
+  * Fix for notmuch.sym and parallel build (Thanks to
+    Thomas Jost)
+  * Bug fixes from Jason Woofenden for vim interface:
+    -  Fix "space (in show mode) mostly adds tag:inbox and tag:unread
+       instead of removing them"  (Closes: #633009).
+    -  Fix "says press 's'; to toggle signatures, but it's
+       really 'i'",  (Closes: #633115).
+    -  Fix "fix for from list on search pages", (Closes: #633045).
+  * Bug fixes for vim interface from Uwe Kleine-König
+    - use full path for sendmail/doc fix
+    - fix compose temp file name
+  * Python tag encoding fixes from Sebastian Spaeth.
+
+ -- David Bremner <bremner@debian.org>  Fri, 29 Jul 2011 12:16:56 +0200
+
+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~bpo60+1) squeeze-backports; urgency=low
 
   * Rebuild for squeeze-backports.
diff --git a/debian/control b/debian/control
index 78c9849b..3252f32c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,21 @@ Source: notmuch
 Section: mail
 Priority: extra
 Maintainer: Carl Worth <cworth@debian.org>
-Uploaders: Jameson Graef Rollins <jrollins@finestructure.net>, martin f. krafft <madduck@debian.org>, 
-	   David Bremner <bremner@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), pkg-config, libxapian-dev, 
- libgmime-2.4-dev, libtalloc-dev, libz-dev,  python-all (>= 2.6.6-3~),
- emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~)
+Uploaders:
+ Jameson Graef Rollins <jrollins@finestructure.net>,
+ martin f. krafft <madduck@debian.org>,
+ David Bremner <bremner@debian.org>
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ pkg-config,
+ libxapian-dev,
+ libgmime-2.4-dev,
+ libtalloc-dev,
+ libz-dev,
+ python-all (>= 2.6.6-3~),
+ emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
+ gdb,
+ dtach
 Standards-Version: 3.9.2
 Homepage: http://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
@@ -15,7 +25,7 @@ Dm-Upload-Allowed: yes
 
 Package: notmuch
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libnotmuch2 (= ${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
@@ -25,7 +35,7 @@ Description: thread-based email index, search and tagging
  .
  This package contains the notmuch command-line interface
 
-Package: libnotmuch1
+Package: libnotmuch2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -41,7 +51,7 @@ Description: thread-based email index, search and tagging (runtime)
 Package: libnotmuch-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libnotmuch1 (= ${binary:Version})
+Depends: ${misc:Depends}, libnotmuch2 (= ${binary:Version})
 Description: thread-based email index, search and tagging (development)
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
@@ -54,7 +64,7 @@ Description: thread-based email index, search and tagging (development)
 Package: python-notmuch
 Architecture: all
 Section: python
-Depends: ${misc:Depends}, ${python:Depends}, libnotmuch1
+Depends: ${misc:Depends}, ${python:Depends}, libnotmuch2
 Description: python interface to the notmuch mail search and index library
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
@@ -69,7 +79,7 @@ Architecture: all
 Section: mail
 Breaks: notmuch (<<0.6~254~)
 Replaces: notmuch (<<0.6~254~)
-Depends: ${misc:Depends}, notmuch,
+Depends: ${misc:Depends}, notmuch (>= ${source:Version}),
  emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~)
 Description: thread-based email index, search and tagging (emacs interface)
  Notmuch is a system for indexing, searching, reading, and tagging
diff --git a/debian/libnotmuch1.install b/debian/libnotmuch2.install
index da4fc25b..da4fc25b 100644
--- a/debian/libnotmuch1.install
+++ b/debian/libnotmuch2.install
diff --git a/debian/libnotmuch1.symbols b/debian/libnotmuch2.symbols
index 8df6fec1..507600c8 100644
--- a/debian/libnotmuch1.symbols
+++ b/debian/libnotmuch2.symbols
@@ -1,8 +1,11 @@
-libnotmuch.so.1 libnotmuch1 #MINVER#
+libnotmuch.so.2 libnotmuch2 #MINVER#
  notmuch_database_add_message@Base 0.3
+ notmuch_database_begin_atomic@Base 0.9~rc1
  notmuch_database_close@Base 0.3
  notmuch_database_create@Base 0.3
- notmuch_database_find_message@Base 0.3
+ notmuch_database_end_atomic@Base 0.9~rc1
+ notmuch_database_find_message@Base 0.9~rc2
+ notmuch_database_find_message_by_filename@Base 0.9~rc2
  notmuch_database_get_all_tags@Base 0.3
  notmuch_database_get_directory@Base 0.3
  notmuch_database_get_path@Base 0.3
@@ -44,6 +47,7 @@ libnotmuch.so.1 libnotmuch1 #MINVER#
  notmuch_messages_move_to_next@Base 0.3
  notmuch_messages_valid@Base 0.3
  notmuch_query_count_messages@Base 0.3
+ notmuch_query_count_threads@Base 0.10~rc1
  notmuch_query_create@Base 0.3
  notmuch_query_destroy@Base 0.3
  notmuch_query_get_query_string@Base 0.4
@@ -70,3 +74,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/rules b/debian/rules
index 169a8050..956f3f2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,9 @@
 #!/usr/bin/make -f
 
-VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version:\([^-]*\)/\1/p')
-
 %:
 	dh --with python2 $@
 
 override_dh_auto_configure:
-	cp version debian/version.pre-build
-	echo $(VERSION) > version
 	dh_auto_configure -- --emacslispdir=/usr/share/emacs/site-lisp/notmuch
 
 override_dh_auto_build:
@@ -15,7 +11,6 @@ override_dh_auto_build:
 	dh_auto_build --sourcedirectory bindings/python
 
 override_dh_auto_clean:
-	-mv debian/version.pre-build version
 	dh_auto_clean
 	dh_auto_clean --sourcedirectory bindings/python
 
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)