Merge branch 'release'

merge back debian-only release into master

diff --git a/debian/changelog b/debian/changelog
index e9b1a8bb6e531eae32d9c6e114d0fff1c231645d..a7a091ffcf6c57312638ef2ebadf453bc4c2f8f2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
+notmuch (0.15.2-2) unstable; urgency=low
+
+  * Bug fix: tighten dependence of notmuch-mutt on notmuch,
+    thanks to Philippe Gimmel and Jameson Rollins (Closes: #703608).
+  * Bump Standards-Version to 3.9.4; no changes.
+
+ -- David Bremner <bremner@debian.org>  Sat, 25 May 2013 18:37:23 -0300
+
 notmuch (0.15.2-1) experimental; urgency=low
 
   * Upstream bug fix release.
     - Improve support for parallel building
     - Update Emacs tests for portability, fix FTBFS on hurd-i386
 
- -- David Bremner <bremner@debian.org>  Tue, 29 Jan 2013 19:19:25 -0400
+ -- David Bremner <bremner@debian.org>  Fri, 22 Mar 2013 20:42:42 -0400
 
 notmuch (0.15.1-1) experimental; urgency=low
 

diff --git a/debian/control b/debian/control
index c59d3ead5f6783f5bfe31137a6de9340aa6de3e0..08071bee6fbf8177182adeb520f566e8b43191e7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
  gdb,
  dtach (>= 0.8)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
 Vcs-Browser: http://git.notmuchmail.org/git/notmuch