From: David Bremner <david@tethera.net>
Date: Sat, 29 Jul 2017 11:52:28 +0000 (-0400)
Subject: Merge tag 'debian/0.25-2'
X-Git-Tag: 0.26_rc0~223
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=4a101ec7aabef163ffbdafe1b0a732bb23b3b0bc;hp=d663706055a275ccf8e0098ef44c336d028b7e7f;p=notmuch

Merge tag 'debian/0.25-2'

uploaded to unstable
---

diff --git a/debian/changelog b/debian/changelog
index f29ac210..2c04cb3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+notmuch (0.25-2) unstable; urgency=medium
+
+  * Drop build-dep on libgmime-2.4-dev, long unsupported upstream
+  * Bug fix: "please transition to gmime 3.0", thanks to Daniel Kahn
+    Gillmor (Closes: #867353).
+
+ -- David Bremner <bremner@debian.org>  Wed, 26 Jul 2017 10:59:14 -0400
+
 notmuch (0.25-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 4360d001..25594496 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  debhelper (>= 9),
  pkg-config,
  libxapian-dev,
- libgmime-2.6-dev (>= 2.6.7~) | libgmime-2.4-dev,
+ libgmime-3.0-dev | libgmime-2.6-dev (>= 2.6.7~),
  libtalloc-dev,
  libz-dev,
  python-all (>= 2.6.6-3~),