New bug fixing release

 Bug fix: "typo in README.Debian: libfla_pic.a -> libfl_pic.a",
 thanks to Jakub Wilk (Closes: #744853).

 Bug fix: "libfl-dev and flex-old: error when trying to install
 together", thanks to Ralf Treinen. The package libfl-dev needs to
 replace and Break the flex-old package too,  (Closes: #744833).

 Bug fix: "redundant redeclaration of ‘isatty’", thanks to Ludovic
 Rousseau. This duplication was removed in the last upstream release.
 (Closes: #488274).

 Bug fix: "flex-2.5.35 bug", thanks to Yuriy Z. scan.c now declares n
 as size_t, in the new upstream version.  (Closes: #633008).

 Bug fix: "make check failure", thanks to Sayre, Alan N. The new
 version of flex does succeed in running make check (it would not build
 otherwise) (Closes: #632095).

5 files changed, 31 insertions, 4 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 86ac37a..78daa5e 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -7,7 +7,7 @@
  libfl.a. However, since linking a shared library with a object
  containing non position independent code stopped working with gcc 4.1
  (apparently, it was sheer luck that it worked at all). So now we also
- provide libfla_pic.a for shared library packages to link with.
+ provide libfl_pic.a for shared library packages to link with.
 
 	An alternative would have been to provide a full fledged
  shared library, but that would have been a major break with upstream
@@ -19,3 +19,5 @@
  manoj
 
 arch-tag: 7421b315-d205-4e09-9a81-0fef07ba57b7
+
+ -- Manoj Srivastava <srivasta@debian.org>, Thu, 17 Apr 2014 01:11:31 -0700
diff --git a/debian/changelog b/debian/changelog
index ec4f36f..4ccfe9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+flex (2.5.39-2) unstable; urgency=low
+
+  * New bug fixing release
+  * Bug fix: "typo in README.Debian: libfla_pic.a -&gt; libfl_pic.a",
+    thanks to Jakub Wilk (Closes: #744853).
+  * Bug fix: "libfl-dev and flex-old: error when trying to install
+    together", thanks to Ralf Treinen. The package libfl-dev needs to
+    replace and Break the flex-old package too,  (Closes: #744833).
+  * Bug fix: "redundant redeclaration of ‘isatty’", thanks to Ludovic
+    Rousseau. This duplication was removed in the last upstream release.
+    (Closes: #488274).
+  * Bug fix: "flex-2.5.35 bug", thanks to Yuriy Z. scan.c now declares n
+    as size_t, in the new upstream version.  (Closes: #633008).
+  * Bug fix: "make check failure", thanks to Sayre, Alan N. The new
+    version of flex does succeed in running make check (it would not build
+    otherwise) (Closes: #632095).
+
+ -- Manoj Srivastava <srivasta@debian.org>  Thu, 17 Apr 2014 02:15:10 -0700
+
+
 flex (2.5.39-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 05f792d..09a99d4 100644
--- a/debian/control
+++ b/debian/control
@@ -50,8 +50,8 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: flex (<< 2.5.39)
-Breaks: flex (<< 2.5.39)
+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)
  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
diff --git a/debian/flex.links b/debian/flex.links
new file mode 100644
index 0000000..d0c4988
--- /dev/null
+++ b/debian/flex.links
@@ -0,0 +1 @@
+usr/bin/flex    usr/bin/lex
diff --git a/debian/rules b/debian/rules
index 1e411ce..9ee7e16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,11 @@ override_dh_install:
 	sed -e 's,#DEB_HOST_MULTIARCH#,$(DEB_HOST_MULTIARCH),'           \
            debian/libfl.shared_object > debian/libfl-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libfl.so
 	dh_link usr/lib/$(DEB_HOST_MULTIARCH)/libfl.a usr/lib/$(DEB_HOST_MULTIARCH)/libl.a
-	dh_link usr/bin/flex    usr/bin/lex
+	test ! -e debian/flex/usr/lib/$(DEB_HOST_MULTIARCH)/libf.a ||     \
+          mv debian/flex/usr/lib/$(DEB_HOST_MULTIARCH)/libf.a             \
+             debian/libfl-dev/usr/lib/$(DEB_HOST_MULTIARCH)/
+	test ! -d debian/flex/usr/lib/$(DEB_HOST_MULTIARCH) ||            \
+             rmdir debian/flex/usr/lib/$(DEB_HOST_MULTIARCH) || true
 
 
 override_dh_installdocs: