[master]: NMU to help cross compilation.

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

3 files changed, 23 insertions, 3 deletions

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index cd82bd8..8e78c4e 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -1,3 +1,13 @@
+flex (2.6.1-1.1) UNRELEASED; urgency=medium
+
+   In this upload, the flex package drops its dependency on libfl-dev, because
+   it is impossible to forward the correct architecture constraint. It contains
+   the FlexLexer.h header and is thus required for using the FlexLexer C++
+   interface. Packages using this library need to add libfl-dev to their
+   Build-Depends.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Wed, 23 Nov 2016 13:18:32 +0100
+
 flex (2.5.33-7) unstable; urgency=low
 
    This version of Flex is a major upgrade from previous versions. There
diff --git a/debian/changelog b/debian/changelog
index 77442d7..df21c0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+flex (2.6.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Demote flex dependency on libfl-dev to Recommends.
+  * Have libfl-dev depend on flex to enforce the same-version constraint.
+  * Annotate flex Multi-Arch: foreign again (Closes: #840080).
+
+ -- Helmut Grohne <helmut@subdivi.de>  Thu, 24 Nov 2016 07:34:27 +0100
+
 flex (2.6.1-1) unstable; urgency=low
 
   * New upstream version. The development of flex ias transitionaing to
diff --git a/debian/control b/debian/control
index 049ed21..354f33e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,11 @@ Standards-Version: 3.9.8
 Package: flex
 Architecture: any
 Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, m4, libfl-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends}, m4,
          dpkg (>= 1.15.4) |  install-info, ${misc:Depends}
-Recommends: gcc | c-compiler
+Recommends: gcc | c-compiler, libfl-dev
 Suggests: bison, build-essential
+Multi-Arch: foreign
 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
@@ -48,7 +49,7 @@ Package: libfl-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, 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)