summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/NEWS.Debian12
-rw-r--r--debian/changelog7
-rw-r--r--debian/control12
3 files changed, 13 insertions, 18 deletions
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index c187248..cd82bd8 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -1,14 +1,3 @@
-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
@@ -53,3 +42,4 @@ 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 7329458..fa71bc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+flex (2.6.0-6) unstable; urgency=low
+
+ * Back out the changes made to the experimental branch
+ * Set the libfl-dev package to be MA: same
+
+ -- Manoj Srivastava <srivasta@debian.org> Tue, 09 Feb 2016 19:46:02 -0800
+
flex (2.6.0-5) experimental; urgency=low
* First cut at correcting multi-arch support. flex is MA: foreign, and
diff --git a/debian/control b/debian/control
index 0970d68..e6d3967 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, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Depends: ${shlibs:Depends}, m4, libfl-dev (= ${binary:Version}),
+ dpkg (>= 1.15.4) | install-info, ${misc:Depends}
Recommends: gcc | c-compiler
-Suggests: bison, build-essential, libfl-dev
+Suggests: bison, build-essential
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
@@ -46,9 +46,8 @@ Description: Documentation for flex (a fast lexical analyzer generator)
Package: libfl-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
Multi-Arch: same
-Recommends: flex (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}
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)
@@ -61,5 +60,4 @@ 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, and the header files
- for C++ lexers.
+ This package contains the static library for flex.