Merge tag '0.20_rc1'

notmuch 0.20~rc1 release

6 files changed, 22 insertions, 4 deletions

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 35744d34..4d5230f4 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.19'
+__VERSION__ = '0.20~rc1'
 SOVERSION = '4'
diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmuch-mutt
index 126cbf44..b47b3651 100755
--- a/contrib/notmuch-mutt/notmuch-mutt
+++ b/contrib/notmuch-mutt/notmuch-mutt
@@ -50,7 +50,7 @@ sub search($$$) {
     empty_maildir($maildir);
     system("notmuch search --output=files $dup_option $query"
 	   . " | sed -e 's: :\\\\ :g'"
-	   . " | xargs --no-run-if-empty ln -s -t $maildir/cur/");
+	   . " | xargs -r -I searchoutput ln -s searchoutput $maildir/cur/");
 }
 
 sub prompt($$) {
diff --git a/debian/changelog b/debian/changelog
index fbd15b81..3edff946 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.20~rc1-1) experimental; urgency=medium
+
+  * New upstream release candidate
+
+ -- David Bremner <bremner@debian.org>  Mon, 04 May 2015 08:08:00 +0200
+
 notmuch (0.19-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/libnotmuch4.symbols b/debian/libnotmuch4.symbols
index e127c0ce..ec46aa9b 100644
--- a/debian/libnotmuch4.symbols
+++ b/debian/libnotmuch4.symbols
@@ -4,6 +4,7 @@ libnotmuch.so.4 libnotmuch4 #MINVER#
  notmuch_database_close@Base 0.13~rc1
  notmuch_database_compact@Base 0.17~rc1
  notmuch_database_create@Base 0.3
+ notmuch_database_create_verbose@Base 0.20~rc1
  notmuch_database_destroy@Base 0.13~rc1
  notmuch_database_end_atomic@Base 0.9~rc1
  notmuch_database_find_message@Base 0.9~rc2
@@ -14,7 +15,9 @@ libnotmuch.so.4 libnotmuch4 #MINVER#
  notmuch_database_get_version@Base 0.3
  notmuch_database_needs_upgrade@Base 0.3
  notmuch_database_open@Base 0.3
+ notmuch_database_open_verbose@Base 0.20~rc1
  notmuch_database_remove_message@Base 0.3
+ notmuch_database_status_string@Base 0.20~rc1
  notmuch_database_upgrade@Base 0.3
  notmuch_directory_destroy@Base 0.3
  notmuch_directory_get_child_directories@Base 0.3
@@ -56,7 +59,9 @@ libnotmuch.so.4 libnotmuch4 #MINVER#
  notmuch_query_get_query_string@Base 0.4
  notmuch_query_get_sort@Base 0.4
  notmuch_query_search_messages@Base 0.3
+ notmuch_query_search_messages_st@Base 0.20~rc1
  notmuch_query_search_threads@Base 0.3
+ notmuch_query_search_threads_st@Base 0.20~rc1
  notmuch_query_set_omit_excluded@Base 0.13~rc1
  notmuch_query_set_sort@Base 0.3
  notmuch_status_to_string@Base 0.3
diff --git a/debian/rules b/debian/rules
index 7a19445e..56378ecd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,14 @@ python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
 	dh $@ --with python2,python3
 
 override_dh_auto_configure:
-	dh_auto_configure -- --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+	./configure --prefix=/usr \
+		--libdir=/usr/lib/$$(dpkg-architecture -q DEB_TARGET_MULTIARCH) \
+		--includedir=/usr/include \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--emacslispdir=/usr/share/emacs/site-lisp/notmuch
 
 override_dh_auto_build:
 	dh_auto_build -- V=1
diff --git a/version b/version
index caa4836d..97e69085 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.19
+0.20~rc1