Merge tag 'debian/0.28-2' into debian/stretch-backports

notmuch release 0.28-2 for unstable (sid) [dgit]
[dgit distro=debian]

diff --git a/debian/changelog b/debian/changelog
index 8f37ef3abaff0245a488909ec640fef7d3d44341..c1a2e530328d0cf66cfd7681171065e3c54abd90 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,21 @@ notmuch (0.27-2) unstable; urgency=medium
 
  -- David Bremner <bremner@debian.org>  Thu, 28 Jun 2018 21:01:29 -0300
 
+notmuch (0.27-1~bpo9+2) stretch-backports; urgency=medium
+
+  * Disable test T460-emacs-tree on arm64. The failures seems to be an upstream
+    emacs heisenbug fixed in unstable.
+
+ -- David Bremner <bremner@debian.org>  Fri, 22 Jun 2018 21:02:14 -0300
+
+notmuch (0.27-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+  * Restore libgmime-3.0 build dependency, preferred upstream, now
+    available in backports.
+
+ -- David Bremner <bremner@debian.org>  Mon, 18 Jun 2018 21:23:26 -0300
+
 notmuch (0.27-1) unstable; urgency=medium
 
   * New upstream feature release
@@ -77,6 +92,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 ]
@@ -211,6 +235,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 922f6d8c847a9488ce6ca5cfc409f95c33e3950e..e3e7ef70dd7becd013c039c444ecea429b1fe6ae 100644 (file)
--- 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]

diff --git a/debian/gbp.conf b/debian/gbp.conf
index a1c8735d82da6b2caea1269f10a78e9427404aaf..3950856fda8bacffcbbb57e3dca9e7fe26e97d58 100644 (file)
--- 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

diff --git a/debian/rules b/debian/rules
index c8ecb1ac4e890ee4c83ffb4a27d603cb13fa7ce5..4979ec3f659c4317c766312aee6c1a75f350e770 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,11 @@
 
 python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
 
+ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),arm64)
+       NOTMUCH_SKIP_TESTS=T460-emacs-tree
+       export NOTMUCH_SKIP_TESTS
+endif
+
 %:
        dh $@ --with python2,python3,elpa