[master]: New upstream release, closes some bugs

Ack NMUs made earlier.

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

6 files changed, 72 insertions, 6 deletions

diff --git a/.travis/install-automake.sh b/.travis/install-automake.sh
index 8de30b5..8de30b5 100755..100644
--- a/.travis/install-automake.sh
+++ b/.travis/install-automake.sh
diff --git a/.travis/install-gettext.sh b/.travis/install-gettext.sh
index ffa8652..ffa8652 100755..100644
--- a/.travis/install-gettext.sh
+++ b/.travis/install-gettext.sh
diff --git a/debian/changelog b/debian/changelog
index e158dc6..fd932c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+flex (2.6.4-1) unstable; urgency=medium
+
+  * New upstream version. Notable changes
+    + a segfalt involving yyrestart(NULL) has been fixed
+    + flex should now handle quoting when mixed with m4 processing correctly
+    + flex handles `[[' and `]]' correctly
+    + flex no longer generates non-ANSI code
+    + more compilation warnings were squashed in generated scanners
+    + prevented a buffer overflow that could occur when input buffers were
+      the exact wrong size
+    + several bug fixes resolved problems introduced in recent flex
+      versions regarding processing of comments, literals and various
+      quoting scenarios.
+    +  If the path to m4 was sufficiently long, a buffer overflow could
+       occur. This has been resolved. The fix also removes dependence on
+       the constant PATH_MAX.
+    + Some minor performance enhancements.
+    +  We honor user defined yy_* macros again. We are also more careful
+       to not leak macro definitions into header files.
+    + A number of portability fixes were introduced so building flex is
+      more reliable on more platforms. Additionally, outdated function
+      calls were removed.
+    + When building the flex executable itself, %# comments from
+      flex.skl are removed when generating the C source code array. This
+      reduces the size of flex.
+    + Flex can be cross compiled.
+  * Bug fix: "comparison between signed and unsigned integer expressions",
+    thanks to Frank Heckenbach. This should be fixed now. (Closes: #835542).
+  * Bug fix: "Please update homepage in package description", thanks to
+    Tim Ruehsen (Closes: #851675).
+  * Bug fix: "Should Suggest: flex-doc", thanks to Yuri D'Elia
+    (Closes: #856956).
+  * Stole some commits from 2.6.5 to fix FTBS issues in 2.6.4 release.
+
+ -- Manoj Srivastava <srivasta@debian.org>  Mon, 12 Feb 2018 11:19:29 -0800
+
 flex (2.6.1-1.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 354f33e..11f11c2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: flex
 VCS-Git: https://anonscm.debian.org/git/users/srivasta/debian/flex.git
 VCS-Browser: https://anonscm.debian.org/gitweb/?p=users/srivasta/debian/flex.git
 Section: devel
-Homepage: http://flex.sf.net/
+Homepage: https://github.com/westes/flex
 Priority: optional
 Build-Depends: bison, gettext, texinfo, help2man, file, po-debconf,
                debhelper (>= 9.20141010), dh-autoreconf, dpkg-dev (>= 1.17.14),
                flex <cross>
 Build-Depends-Indep: texlive-latex-base, texlive-fonts-recommended, cm-super-minimal
 Maintainer: Manoj Srivastava <srivasta@debian.org>
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
 
 Package: flex
 Architecture: any
@@ -17,7 +17,7 @@ Pre-Depends: debconf | debconf-2.0
 Depends: ${shlibs:Depends}, m4,
          dpkg (>= 1.15.4) |  install-info, ${misc:Depends}
 Recommends: gcc | c-compiler, libfl-dev
-Suggests: bison, build-essential
+Suggests: bison, build-essential, flex-doc
 Multi-Arch: foreign
 Description: fast lexical analyzer generator
  Flex is a tool for generating scanners: programs which recognized lexical
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..634139c
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFgOn9QBCADZ9CRkdha3rhcVvCNJkWC/qAEapo4HOW1LrtOx9qL83XRXx5uW
+GKaPJrAoKojWjVk4bslPmzG40dbMBvCe5L1/xklncM0do+54cQhny7G9O6EeZJ+R
+9wPoaKEiu49NQLbISYp3rL5onaIucZ+3z7ZWJw0RBc0vHC4UNPw00DPTPPUFUm8/
+C+IrLB6gVErzjAwHerHm0mwlJSpE1OfaQnhANzO2++epbdaw3P9SZz1u0Ci2oh4b
+qM+7tWGiLdK5AeOSvj3Bv4M+MgKdVAd+ghmdlxsgIzXkvEsjyIigD+j9YRm1UMTt
+JxVtQ4QuI4WahBQoWeGUcKpwF3Jfh2rd9YFLABEBAAG0IFdpbGwgRXN0ZXMgPHdl
+c3RlczU3NUBnbWFpbC5jb20+iQE3BBMBCAAhBQJYDp/UAhsDBQsJCAcCBhUICQoL
+AgQWAgMBAh4BAheAAAoJEOSynI1kiFMHMJkH/0hcQxQlWMwfFx2xW9xqTphmq94y
+SLsnCvlj+4JN7EefN1MZaF/bu2QhH+R8EIEkr+YToSheYPw01eAjy/1M60Pb57Ue
+tW3R4NywwjK5RWbhGQMtVI5feQZ2rYTcjOWzZyfZsypCwjWds5nRs+nv9lhf7/iF
+02IOIUGOt2RBif9wU9IEdvC0Ri4kUMtlhAc/VyiSgKwRott411TTPqi9maJZS/8I
+Xe74Nba2AGx74UoJ9OT/wUIpiUhqHUSt6HjtYz9YAuvCvtenMStomjxOm8LsibTb
+XslmE474byhofPH872rGAt12hTo67i0DGF+IohNWPInZCpR0ARdRn4huoPS5AQ0E
+WA6f1AEIAM9UTG3KMZ2VwNn60OCqi7HOQahtbf9TSBdxQjtyPaRIwSU+xNTC84Y5
+iTjQV3hksWKNlYUZy+il+Fl3EXDEZMzY1R7lRWZ87s9AhYf/eBVadELceDW7Wn41
+od5O8D7U0A8/UnSjwOuy/0bmi835d9kd2mqjWScxQJ4ZozzdJ2HseihDG6LrdT3b
+fIii5UoVlbFUF+HNQ7fwHR2zRYHA9MiEmgAtRMiEIIAshU9wmZKr5kJ1ItVW0yqk
+rmIIOWT6m6BydSoXpnxwh5hGiJtJ2pZtCvn8SzY6ExWPnXBp35oYqkRZOeNiOuMe
+L0NZe3pROsj2MESuc0WSbDGyoLaWft8AEQEAAYkBHwQYAQgACQUCWA6f1AIbDAAK
+CRDkspyNZIhTB4TaCACjUCbag/zB7t/IsiFW051Vtwu1hy1q6rqaFKExMMzFcR2T
+0ipbW/ajhpaY4bid0N9GXahoe6EZSZ5yo7kvXDr3ZYKE2WxcLZR5YJkfYdfTv5Bu
+ltFVXKZvMgkgyBS3mUH7q4kxnZ/1IXZ9VobttbV9NvP2XykzpdZAnIqYXTw3Ijq1
+Q+QFfLc3RRQIc+vKNcGuwlJS6Y5tlZWyU1krGNeQgZig+19Uyco0nmFEtEQuia03
+oyqLbzE5jxydbT++1yDKzIEj4Icr1cS0tySj+N7ldojE0riHvPZrXxWN/nrq2F6f
+yfhTmQ5JoGQXbLli52HReeTxHc05I0LlFYTS2Gba
+=nWYe
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 992fa96..3b66e2b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,6 @@
 # format version number, currently 2; this line is compulsory!
 version=4
-
-https://github.com/westes/@PACKAGE@/releases \
- /westes/@PACKAGE@/releases/download/v[\d\.]*/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate
+opt="pgpmode=next" https://github.com/westes/@PACKAGE@/releases \
+ /westes/@PACKAGE@/releases/download/v[\d\.]*/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian
+opt="pgpmode=previous" https://github.com/westes/@PACKAGE@/releases \
+ /westes/@PACKAGE@/releases/download/v[\d\.]*/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@@SIGNATURE_EXT@ previous uupdate