From: David Bremner <david@tethera.net>
Date: Tue, 19 Jun 2018 00:18:58 +0000 (-0300)
Subject: Merge tag 'debian/0.27-1' into debian/stretch-backports
X-Git-Tag: debian/0.27-1_bpo9+1~2
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=698415201715497bdf9d5f53aac0d58f65f86dd9;hp=079826f124823f134e5877173e9380edc2eeb3dc;p=notmuch

Merge tag 'debian/0.27-1' into debian/stretch-backports

notmuch Debian 0.27-1 upload (same as 0.27)
---

diff --git a/debian/changelog b/debian/changelog
index 8bac8a3d..873e3b5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,15 @@ notmuch (0.26.1-1) unstable; urgency=medium
 
  -- David Bremner <bremner@debian.org>  Mon, 02 Apr 2018 08:08:01 -0300
 
+notmuch (0.26-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+  * add myself to uploaders
+  * drop dependency on libgmime-3.0, not yet in backports
+  * note the debian/stretch-backports branch
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sun, 04 Feb 2018 15:21:54 -0500
+
 notmuch (0.26-1) unstable; urgency=medium
 
   [ Daniel Kahn Gillmor ]
@@ -177,6 +186,12 @@ notmuch (0.25~rc0-1) experimental; urgency=medium
 
  -- David Bremner <bremner@debian.org>  Sun, 16 Jul 2017 08:48:59 -0300
 
+notmuch (0.24.2-2~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- David Bremner <bremner@debian.org>  Fri, 14 Jul 2017 07:27:04 -0300
+
 notmuch (0.24.2-2) unstable; urgency=medium
 
   * rebuild for unstable
diff --git a/debian/control b/debian/control
index ae4e6f00..4c317c22 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: mail
 Priority: optional
 Maintainer: Carl Worth <cworth@debian.org>
 Uploaders:
+ Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
  Jameson Graef Rollins <jrollins@finestructure.net>,
  David Bremner <bremner@debian.org>
 Build-Conflicts: ruby1.8, gdb-minimal, gdb [ia64 mips mips64el]
@@ -11,7 +12,7 @@ Build-Depends:
  debhelper (>= 10~),
  pkg-config,
  libxapian-dev,
- libgmime-3.0-dev (>= 3.0.3~) | libgmime-2.6-dev (>= 2.6.7~),
+ libgmime-2.6-dev (>= 2.6.7~),
  libtalloc-dev,
  libz-dev,
  python-all (>= 2.6.6-3~),
@@ -30,7 +31,7 @@ Build-Depends:
  bash-completion (>=1.9.0~)
 Standards-Version: 4.1.3
 Homepage: https://notmuchmail.org/
-Vcs-Git: git://notmuchmail.org/git/notmuch
+Vcs-Git: git://notmuchmail.org/git/notmuch -b debian/stretch-backports
 Vcs-Browser: https://git.notmuchmail.org/git/notmuch
 
 Package: notmuch
diff --git a/debian/gbp.conf b/debian/gbp.conf
index a1c8735d..3950856f 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -5,7 +5,7 @@
 upstream-branch = master
 
 # The default branch for the debian patch (no patch in our case)
-debian-branch = master
+debian-branch = debian/stretch-backports
 
 # Format for upstream tags
 upstream-tag = %(version)s