[linux] 01/02: Update build dependencies on libbabeltrace[, -ctf}-dev (fixes FTBFS)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit fcbe5c22b15e6cf4a742a219306b56d4fa9c3260
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Oct 19 11:35:53 2017 +0100

    Update build dependencies on libbabeltrace[,-ctf}-dev (fixes FTBFS)
    
    libbabeltrace-ctf-dev was merged into libbabeltrace-dev, so the
    build dependencies are unsatisfiable in unstable.  For stretch-
    backports we will still want both of them.  So add a suitably
    versioned dependency on libbabeltrace-dev as a preferred
    alternative to libbabeltrace-ctf-dev.
---
 debian/changelog                   | 1 +
 debian/templates/control.source.in | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8ad7269..d82a408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 linux (4.13.4-3) UNRELEASED; urgency=medium
 
   * [arm64] brcmfmac: Enable BRCMFMAC_SDIO (Closes: #877911)
+  * Update build dependencies on libbabeltrace[,-ctf}-dev (fixes FTBFS)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 18 Oct 2017 20:03:01 +0100
 
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 1b6bb02..d186aba 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -35,7 +35,8 @@ Build-Depends-Arch:
  gcc-multilib [amd64 ppc64 s390x sparc64] <!stage1 !pkg.linux.notools !nopython>,
  libaudit-dev <!stage1 !pkg.linux.notools !nopython>,
  libbabeltrace-dev (>= 1.5.0) <!stage1 !pkg.linux.notools !nopython>,
- libbabeltrace-ctf-dev (>= 1.5.0) <!stage1 !pkg.linux.notools !nopython>,
+# - libbabeltrace-ctf-dev may or may not be needed as well
+ libbabeltrace-dev (>= 1.5.3-2~) <!stage1 !pkg.linux.notools !nopython> | libbabeltrace-ctf-dev (>= 1.5.0) <!stage1 !pkg.linux.notools !nopython>,
  libdw-dev <!stage1 !pkg.linux.notools !nopython>,
  libelf-dev <!stage1 !pkg.linux.notools !nopython>,
  libiberty-dev <!stage1 !pkg.linux.notools !nopython>,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git