From fcbe5c22b15e6cf4a742a219306b56d4fa9c3260 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 19 Oct 2017 11:35:53 +0100 Subject: [PATCH] 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 8ad7269c5..d82a4088f 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 Wed, 18 Oct 2017 20:03:01 +0100 diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index 1b6bb02a9..d186aba1a 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] , libaudit-dev , libbabeltrace-dev (>= 1.5.0) , - libbabeltrace-ctf-dev (>= 1.5.0) , +# - libbabeltrace-ctf-dev may or may not be needed as well + libbabeltrace-dev (>= 1.5.3-2~) | libbabeltrace-ctf-dev (>= 1.5.0) , libdw-dev , libelf-dev , libiberty-dev ,