Merge branch 'debian/bullseye' into debian/buster-backports

Update to current Debian stable

diff --git a/debian/changelog b/debian/changelog
index ebfd92097823e18640f6dc0b059045ddbbbabe1f..85263214c839cd79ac168dc2ee237a35a94d5f8d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,21 @@ notmuch (0.31.2-4) unstable; urgency=medium
 
  -- David Bremner <bremner@debian.org>  Thu, 10 Dec 2020 21:02:20 -0400
 
+notmuch (0.31.2-3~bpo10+2) buster-backports; urgency=medium
+
+  * Re-upload with binaries for NEW package.
+
+ -- David Bremner <bremner@debian.org>  Sun, 13 Dec 2020 13:23:57 -0400
+
+notmuch (0.31.2-3~bpo10+1) buster-backports; urgency=medium
+
+  * Rebuild for buster-backports.
+  * Require dh-elpa >= 2.0.6~
+  * Disable dwz for ruby extension (work-around bug in binutils default
+    dwarf level).
+
+ -- David Bremner <bremner@debian.org>  Sun, 13 Dec 2020 10:56:52 -0400
+
 notmuch (0.31.2-3) unstable; urgency=medium
 
   * Switch to debhelper compat level 13
@@ -140,6 +155,12 @@ notmuch (0.30~rc0-2) experimental; urgency=medium
 
  -- David Bremner <bremner@debian.org>  Mon, 01 Jun 2020 21:01:27 -0300
 
+notmuch (0.29.3-1~bpo10+1) buster-backports; urgency=medium
+
+  * Rebuild for buster-backports.
+
+ -- David Bremner <bremner@debian.org>  Wed, 27 May 2020 11:49:20 -0300
+
 notmuch (0.29.3-1) unstable; urgency=medium
 
   * New upstream bugfix release.
@@ -163,6 +184,12 @@ notmuch (0.29.2-1) unstable; urgency=medium
 
  -- David Bremner <bremner@debian.org>  Sat, 19 Oct 2019 07:23:21 -0300
 
+notmuch (0.29.1-2~bpo10+1) buster-backports; urgency=medium
+
+  * Rebuild for buster-backports.
+
+ -- David Bremner <bremner@debian.org>  Mon, 19 Aug 2019 16:51:11 -0300
+
 notmuch (0.29.1-2) unstable; urgency=medium
 
   * Re-upload to unstable

diff --git a/debian/control b/debian/control
index 633d0be8bd5c72b30321255ec2a36ac4d7420669..19e669b0cd7fb94c077b525f2ad52e397a6308f8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Conflicts:
 Build-Depends:
  bash-completion (>=1.9.0~),
  debhelper-compat (= 13),
- dh-elpa (>= 1.3),
+ dh-elpa (>= 2.0.6~),
  dh-python,
  desktop-file-utils,
  doxygen,

diff --git a/debian/rules b/debian/rules
index fa0551a951906e686860d08a78c615f24af6e3b0..bc90d200e53b4ebf8e0991878cc5a8853e0f4055 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,9 @@ override_dh_auto_configure:
 override_dh_auto_test:
        dh_auto_test -- V=1
 
+override_dh_dwz:
+       dh_dwz -Xruby
+
 override_dh_auto_build:
        dh_auto_build -- V=1
        PYBUILD_NAME=notmuch dh_auto_build --buildsystem=pybuild --sourcedirectory bindings/python