Merge tag 'v2.6.0' into upstream

flex v2.6.0 release

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

# gpg: Signature made Sat 05 Dec 2015 11:42:31 AM PST using RSA key ID 4F8BC9A4
# gpg: requesting key 4F8BC9A4 from hkp server pool.sks-keyservers.net
# gpg: no valid OpenPGP data found.
# gpg: Total number processed: 0
# gpg: keyserver communications error: key not found
# gpg: keyserver communications error: bad public key
# gpg: Can't check signature: public key not found

# Conflicts:
#	Makefile.am
#	NEWS
#	autogen.sh
#	configure.ac
#	doc/Makefile.am
#	doc/flex.texi
#	examples/fastwc/mywc.c
#	lib/Makefile.am
#	lib/malloc.c
#	lib/realloc.c
#	po/POTFILES.in
#	po/ca.po
#	po/da.po
#	po/de.po
#	po/eo.po
#	po/es.po
#	po/fi.po
#	po/fr.po
#	po/ga.po
#	po/hr.po
#	po/ko.po
#	po/nl.po
#	po/pl.po
#	po/pt_BR.po
#	po/ro.po
#	po/ru.po
#	po/sr.po
#	po/sv.po
#	po/tr.po
#	po/vi.po
#	po/zh_CN.po
#	po/zh_TW.po
#	tests/Makefile.am
#	tests/README

1 files changed, 39 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index aa30e43..cfb0c7a 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,43 @@ changes between releases of flex.
 
 See the file COPYING for copying conditions.
 
-* flex version  2.5.39
+* version 2.6.0 released 2015-11-17
+
+** User Visible Changes
+
+*** C++ scanners now use references instead of pointers. See the manual for details.
+
+*** A number of compiler warnings were addressed, so flex generated scanners should be quieter under compiler warning scenarios.
+
+*** Allow error reporting routines to accept varying number of arguments
+
+*** Removed deprecated 'register' storage class specifier
+
+*** Changeed output formats from octal to hexadecimal
+
+*** check limits before using array index cclp; resolves sf-166
+
+*** Suppress clang warning about empty @param paragraph; resolves sf#158
+
+*** Fixed malloc/realloc replacement, resolves sf bug#151.
+
+*** Adjusted buffer sizes on ia64.
+
+*** various documentation and code clean up fixes: resolves sf bugs #167, #168, among other patches.
+
+** Flex Internals
+
+*** flex is now organized into subdirectories. This keeps the tree neater at the top level and puts like things near each other and unlike things away from each other.
+
+*** The test suite has been reorganized and is now run with the parallel test suite harness from automake.
+
+*** Cleaned up the automake parts of the build system to better reflect what automake does on its own. Also added a call to libtoolize in autogen.sh because autoreconf gets confused without a prior run of libtoolize.
+
+*** po/Makefile now includes a rule to fetch the latest translations from the translation project. "make -f po/Makefile getpo" from the top level of the flex tree will fetch the files.
+
+*** New da translation from the translation project
+
+* flex version  2.5.39 released 2014-03-26
 
 ** no user visible changes in this release
 
@@ -475,7 +511,7 @@ options, see accompanying documentation
 
 *** Updated the manual with the new reentrant API
 
-*** Two new options %option reentrant (-R) and 
+*** Two new options %option reentrant (-R) and
 %option reentrant-bison (-Rb)
 
 *** All globals optionally placed into struct yyglobals_t
@@ -505,7 +541,7 @@ But the inverse is still true
 
 ** Developer test suite added
 
-*** TESTS/ directory has been added. Users can 
+*** TESTS/ directory has been added. Users can
 'make test' in the TESTS directory to execute the test suite
 
 ** Support for bison variables yylval and yylloc added