[linux] 01/01: debian/control: Fix build-dependency on flex to work with new versions that have M-A: foreign

[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 9768234db45c5238b62a6f3b1cc4a7525f07584f
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Dec 15 20:27:38 2016 +0000

    debian/control: Fix build-dependency on flex to work with new versions that have M-A: foreign
---
 debian/changelog                   | 2 ++
 debian/templates/control.source.in | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 14d85ab..ba0b981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -137,6 +137,8 @@ linux (4.8.14-1) UNRELEASED; urgency=medium
   * [amd64] Re-enable LEGACY_VSYSCALL_EMULATE instead of LEGACY_VSYSCALL_NONE.
     There are still binaries in stable that use vsyscall (via dietlibc).
   * debian/rules.real: Exclude *.pyc from featureset diffs
+  * debian/control: Fix build-dependency on flex to work with new versions that
+    have M-A: foreign
 
  -- Uwe Kleine-König <ukleinek at debian.org>  Sun, 04 Dec 2016 21:16:06 +0100
 
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 08969a3..063dfcd 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -30,7 +30,8 @@ Build-Depends:
  xmlto <!stage1 !nodoc !pkg.linux.notools>,
 # used by upstream to build perf
  bison <!stage1 !pkg.linux.notools !nopython>,
- flex:native <!stage1 !pkg.linux.notools !nopython>,
+# - flex needs to run on the host; same workaround as for openssl
+ flex (>= 2.6.1-1.1~) <!stage1 !pkg.linux.notools !nopython> | flex:native <!stage1 !pkg.linux.notools !nopython>,
  gcc-multilib [amd64 ppc64 s390x sparc64] <!stage1 !pkg.linux.notools !nopython>,
  libaudit-dev <!stage1 !pkg.linux.notools !nopython>,
  libdw-dev <!stage1 !pkg.linux.notools !nopython>,

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