Record flex (2.6.4-6.2) in archive suite sid

3 files changed, 32 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index c677692..a99d649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+flex (2.6.4-6.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Ruben Undheim ]
+  * debian/rules:
+    - Fix build with "dpkg-buildpackage -A" by checking if directory exists
+      first (Closes: #898725)
+
+  [ Niels Thykier ]
+  * debian/control:
+    - Set Rules-Requires-Root (R³) to no as flex does not need/require
+      (fake)root during package build.
+
+ -- Niels Thykier <niels@thykier.net>  Mon, 06 Aug 2018 19:40:25 +0000
+
+flex (2.6.4-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Bug fix: "removal of libfl2 makes files disappear from libfl-dev" (Closes:
+    #891525), add missing Breaks to match the list of packages in the Replaces
+    field and remove flex-old Breaks, that package never contained a shared
+    library.
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 23 Apr 2018 11:53:14 +0200
+
 flex (2.6.4-6) unstable; urgency=medium
 
   * Rolled back the feature test POSIX_C_SOURCE changes.
diff --git a/debian/control b/debian/control
index 53e18ff..b50c08e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: bison, gettext, texinfo, help2man, file, po-debconf,
 Build-Depends-Indep: texlive-latex-base, texlive-fonts-recommended, cm-super-minimal
 Maintainer: Manoj Srivastava <srivasta@debian.org>
 Standards-Version: 4.1.3
+Rules-Requires-Root: no
 
 Package: flex
 Architecture: any
@@ -50,8 +51,8 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: flex (<< 2.5.39), flex-old (<= 2.5.4a-10),
-          libfl-dev  (<= 2.6.4-4)
+Replaces: flex (<< 2.5.39), libfl-dev (<= 2.6.4-4)
+Breaks: flex (<< 2.5.39), libfl-dev (<= 2.6.4-4)
 Description: SHARED 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/rules b/debian/rules
index e676497..f8ee94e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,9 @@ override_dh_install:
 	rm -f debian/flex/usr/share/doc/flex/flex.pdf
 	test ! -f debian/flex/usr/share/doc/flex/COPYING ||              \
             rm -f debian/flex/usr/share/doc/flex/COPYING
-	find debian/flex/usr/share/locale  -type d -empty -delete
+	if [ -d debian/flex/usr/share/locale ] ; then \
+	  find debian/flex/usr/share/locale  -type d -empty -delete ; \
+	fi
 	dh_link