Potential fix for the multi-arch issuedebian/2.6.0-5

 Flex no longer automatically pulls in libfl-dev, so at the very least
 packages using C++ lexers will need to pull in libfl-dev in build
 depends. libfl-dev is now demoted to a suggestion. This will impact
 compilation where there was an implicit dependency on the C++ header
 files provided by libfl-dev; please install libfl-dev explicitly if that
 is the case.

Signed-off-by: Manoj Srivastava <srivasta@debian.org>

3 files changed, 29 insertions, 7 deletions

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index c9e757c..c187248 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -1,3 +1,14 @@
+flex (2.6.0-5) experimental; urgency=low
+
+ Flex no longer automatically pulls in libfl-dev, so at the very least
+ packages using C++ lexers will need to pull in libfl-dev in build
+ depends. libfl-dev is now demoted to a suggestion. This will impact
+ compilation where there was an implicit dependency on the C++ header
+ files provided by libfl-dev; please install libfl-dev explicitly if that
+ is the case.
+
+ -- Manoj Srivastava <srivasta@debian.org>  Mon, 08 Feb 2016 08:27:57 -0800
+
 flex (2.5.33-7) unstable; urgency=low
 
    This version of Flex is a major upgrade from previous versions. There
@@ -33,8 +44,8 @@ flex (2.5.33-7) unstable; urgency=low
    behaviour, and the scanners require conforming implementations when
    flex is used in ANSI C mode. Flex has broken backwards
    compatibility. This is not a bug, but done deliberately, by
-   design. 
- 
+   design.
+
    The package flex-old provides the same behaviour as version 2.5.4a of
    Flex.
 
@@ -42,4 +53,3 @@ flex (2.5.33-7) unstable; urgency=low
    before continuing with its upgrade.
 
  -- Manoj Srivastava <srivasta@debian.org>  Fri, 31 Oct 2003 21:53:16 -0600
-
diff --git a/debian/changelog b/debian/changelog
index c88eb35..7329458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+flex (2.6.0-5) experimental; urgency=low
+
+  * First cut at correcting multi-arch support. flex is MA: foreign, and
+    libfl-dev is MA: same. flex no longer automatically pulls in
+    libfl-dev, so at the very least packages using C++ lexers will need to
+    pull in libfl-dev in build depends.
+
+ -- Manoj Srivastava <srivasta@debian.org>  Mon, 08 Feb 2016 08:26:24 -0800
+
 flex (2.6.0-4) unstable; urgency=low
   * Bug fix: "C++ style comment in C output", thanks to Tim Rühsen
     There is a fix uploaded to deferred by Salvatore Bonaccorso
diff --git a/debian/control b/debian/control
index ccc5fea..0970d68 100644
--- a/debian/control
+++ b/debian/control
@@ -12,11 +12,11 @@ Standards-Version: 3.9.6
 
 Package: flex
 Architecture: any
+Multi-Arch: foreign
 Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, m4, libfl-dev (= ${binary:Version}),
-         dpkg (>= 1.15.4) |  install-info, ${misc:Depends}
+Depends: ${shlibs:Depends}, m4, dpkg (>= 1.15.4) |  install-info, ${misc:Depends}
 Recommends: gcc | c-compiler
-Suggests: bison, build-essential
+Suggests: bison, build-essential, libfl-dev
 Description: fast lexical analyzer generator
  Flex is a tool for generating scanners: programs which recognized lexical
  patterns in text. It reads the given input files for a description of a
@@ -47,6 +47,8 @@ Package: libfl-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
+Recommends: flex (= ${binary:Version})
 Replaces: flex (<< 2.5.39), flex-old (<= 2.5.4a-10)
 Breaks: flex (<< 2.5.39), flex-old (<= 2.5.4a-10)
 Description: static library for flex (a fast lexical analyzer generator)
@@ -59,4 +61,5 @@ Description: static library for flex (a fast lexical analyzer generator)
  executable is run, it analyzes its input for occurrences of the regular
  expressions. Whenever it finds one, it executes the corresponding C code.
  .
- This package contains the static library for flex.
+ This package contains the static library for flex, and the header files
+ for C++ lexers.