Merge tag '0.18_rc0'

notmuch 0.18~rc0 release

diff --git a/NEWS b/NEWS
index 39fa4475100d4ee53d113e682a8708209e1102b8..bcd311d4b11ba94c09421dfccfb4ae44ddf5a298 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-Notmuch 0.18 (UNRELEASED)
-=========================
+Notmuch 0.18~rc0 (2014-04-22)
+=============================
 
 Command-Line Interface
 ----------------------

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index fa3f93b817986559334d0aaff46ea0fa51e79b24..f15440d16319b42ec743fbcccaa90c13c31b7734 100644 (file)
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,2 +1,2 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.17'
+__VERSION__ = '0.18~rc0'

diff --git a/debian/NEWS b/debian/NEWS
index 8049a933e4afa1181d74dcb4404fc29218d89b5f..0ae08198060aad2e91260e561e7031dfe7792a48 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+notmuch (0.18~rc0-1) experimental; urgency=low
+
+  * This release of notmuch requires a non-reversable database upgrade
+    to support the new path: and updated folder: prefixes. Notmuch
+    will backup your tags for your before doing the upgrade, but it
+    never hurts to make your own backup with notmuch dump before
+    next running 'notmuch new'
+
+ -- David Bremner <bremner@debian.org>  Tue, 22 Apr 2014 09:32:11 +0900
+
 notmuch (0.17-1) unstable; urgency=low
 
   * Previously on big endian architectures like sparc and powerpc the

diff --git a/debian/changelog b/debian/changelog
index 057e6138b1afd3458f351fcc71da2f1917c0015e..72dbd45c46e4460bae09f22475149cbb9ca0f806 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,19 @@
-notmuch (0.18-1) unstable; urgency=medium
+notmuch (0.18~rc0-1) experimental; urgency=low
 
+  * Upstream release candidate.
   * Bug fix: "insufficient sanitization of arguments to notmuch CLI",
     thanks to Antoine Beaupré (Closes: #737496).
-  * Bug fix: "notmuch(1) manpage: typo: int -> in", thanks to Jakub
+  * Bug fix: "notmuch(1) manpage: typo: int -> in", thanks to Jakub
     Wilk (Closes: #739556).
   * Bug fix: "get a quiet option", thanks to Joerg Jaspert (Closes:
     #666027).
+  * Bug fix: "Please remove me from Uploaders", thanks to martin f
+    krafft (Closes: #719100).
+  * Bug fix: "M-x notmuch-show-reply on an encrypted message should
+    insert encryption tags into the mml buffer", thanks to Daniel Kahn
+    Gillmor (Closes: #704648).
 
- -- David Bremner <bremner@debian.org>  Mon, 03 Mar 2014 08:43:03 -0400
+ -- David Bremner <bremner@debian.org>  Tue, 22 Apr 2014 09:27:29 +0900
 
 notmuch (0.17-5) unstable; urgency=medium
 

diff --git a/doc/Makefile.local b/doc/Makefile.local
index d42079725e908b275460c1020c18bf79ea05bdc3..bbd46100dc2d011bf361ebdd92d7e66bf781c3a0 100644 (file)
--- a/doc/Makefile.local
+++ b/doc/Makefile.local
@@ -78,4 +78,4 @@ $(dir)/docdeps.mk: $(dir)/conf.py $(dir)/mkdocdeps.py
        $(mkdocdeps) $(srcdir)/doc $(DOCBUILDDIR) $@
 
 CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk $(DOCBUILDDIR)/.roff.stamp
-CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES)
+CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES) $(dir)/conf.pyc

diff --git a/version b/version
index 50653ad0a6e7db059c47d02e28d65c8e88ab4bd2..065d0c867b00dfd48670a61f71084855e54b2132 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.17
+0.18~rc0