tests/test-bison-nr/Makefile.am | 4 2 + 2 - 0 !
tests/test-bison-yylloc/Makefile.am | 4 2 + 2 - 0 !
tests/test-bison-yylval/Makefile.am | 4 2 + 2 - 0 !
3 files changed, 6 insertions(+), 6 deletions(-)

 [patch 1/5] debcherry fixup patch

61112fc [topic--autoconf0files] Delete files create by autoconf
	 - extra changes or conflicts
91d57d4 Correct a few dependencies in Makefiles
	 - extra changes or conflicts

flex.skl | 8 8 + 0 - 0 !
scan.c | 8 8 + 0 - 0 !
skel.c | 8 8 + 0 - 0 !
3 files changed, 24 insertions(+)

 [patch 2/5] finish fixing the ia64 buffer issue.

Previous commits increased YY_READ_BUF_SIZE (where __ia64__ is defined) but
left YY_BUF_SIZE unchanged, so that didn't fix the problem in the end. In the
general case, the latter is twice the former. Therefore set it to the same
ratio in the ia64 case.

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

flex.skl | 5 5 + 0 - 0 !
scan.c | 8 7 + 1 - 0 !
skel.c | 5 5 + 0 - 0 !
3 files changed, 17 insertions(+), 1 deletion(-)

 [patch 3/5] [ia64-buffer-fix]]: some more fixes for the ia64 buffer
 issue.

Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>

tests/test-bison-yylloc/parser.y | 4 2 + 2 - 0 !
tests/test-bison-yylval/parser.y | 4 2 + 2 - 0 !
2 files changed, 4 insertions(+), 4 deletions(-)

 [patch 4/5] [bison-test-fixes] do not use obsolete bison constructs
 in tests.

In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been
removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or
%param. This commit fixes the tests so they still work.

Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>

gen.c | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

 [patch 5/5] [fix-off-by-one-error]: generatred line numbers are off
 by one

The code that is generated by flex has an off-by-one error in the
generated #line pragmas that occur after the second %% line in the
source file (that is, the one that is used after the token patterns). As
a result, gdb will think we're, e.g., on line 46 when in reality we're
on line 45.

Marcus Rausch  supplied the patch in this commit

Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>