summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog10
-rw-r--r--debian/clean21
-rw-r--r--debian/control6
-rw-r--r--debian/copyright150
-rw-r--r--[-rwxr-xr-x]debian/flex-doc.postinst0
-rw-r--r--[-rwxr-xr-x]debian/flex-doc.postrm0
-rw-r--r--[-rwxr-xr-x]debian/flex-doc.prerm0
-rw-r--r--[-rwxr-xr-x]debian/flex.postinst0
-rw-r--r--[-rwxr-xr-x]debian/flex.prerm0
-rw-r--r--debian/patches/0001-debcherry-fixup-patch.patch75
-rw-r--r--debian/patches/0002-Finish-fixing-the-ia64-buffer-issue.patch81
-rw-r--r--debian/patches/0003-ia64-buffer-fix-Some-more-fixes-for-the-ia64-buffer-.patch75
-rw-r--r--debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch77
-rw-r--r--debian/patches/0005-fix-off-by-one-error-generatred-line-numbers-are-off.patch53
-rw-r--r--debian/patches/series6
-rw-r--r--debian/source/format2
16 files changed, 107 insertions, 449 deletions
diff --git a/debian/changelog b/debian/changelog
index c0f8d12..2737ae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+flex (2.6.0-1) unstable; urgency=low
+
+ * New upstream version i
+ * Updated Standards version to 3.9.6. No changes needed.
+ * Updated the VCS-Git field of the control file to use HTTPS transport
+ * Updated the copyright file to DEP-5 format.
+ * Reverted to source format 1.0 , and use dgit
+
+ -- Manoj Srivastava <srivasta@debian.org> Sat, 23 Jan 2016 20:11:32 -0800
+
flex (2.5.39-8) unstable; urgency=low
* Added a missing build depends on vm-super-minimal, reuired fro
diff --git a/debian/clean b/debian/clean
index 70a380f..bfd04fd 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,6 +1,23 @@
+INSTALL
+Makefile.in
+aclocal.m4
+build-aux/compile
+build-aux/config.guess
+build-aux/config.sub
+build-aux/depcomp
+build-aux/install-sh
+build-aux/mdate-sh
+build-aux/texinfo.tex
+configure
+doc/Makefile.in
+doc/flex.1
doc/flex.info
doc/flex.info-1
-doc/flex.info-2
-doc/flex.1
doc/stamp-vti
doc/version.texi
+examples/Makefile.in
+examples/fastwc/Makefile.in
+examples/manual/Makefile.in
+src/config.h.in
+tests/Makefile.in
+tools/Makefile.in
diff --git a/debian/control b/debian/control
index a6e8bf1..d3a9855 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
Source: flex
-VCS-Git: git://anonscm.debian.org/users/srivasta/debian/flex.git
-VCS-Browser: http://anonscm.debian.org/gitweb/?p=users/srivasta/debian/flex.git
+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/
Priority: optional
@@ -8,7 +8,7 @@ Build-Depends: bison, gettext, texinfo, help2man, file, po-debconf,
debhelper (>= 9.0.0), dh-autoreconf, dpkg-dev (>= 1.16.0)
Build-Depends-Indep: texlive-latex-base, texlive-fonts-recommended, cm-super-minimal
Maintainer: Manoj Srivastava <srivasta@debian.org>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Package: flex
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index ccf3347..8f58e3b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,76 +1,74 @@
-This is the Debian prepackaged version of flex, the fast lexical
-analyzer generator.
-
-This package was first put together by Robert Leslie <rob@mars.org>.
-It is currently maintained by Manoj Srivastava <srivasta@debian.org>,
-who took over from Santiago Vila <sanvila@debian.org>,
-and it is built from sources obtained from:
-
-http://flex.sourceforge.net/
-
-Copyright:
- Flex carries the copyright used for BSD software, slightly modified
- because it originated at the Lawrence Berkeley (not Livermore!) Laboratory,
- which operates under a contract with the Department of Energy:
-
- Copyrig © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The Flex Project.
-
- Copyright © 1990, 1993, 1997 The Regents of the University of California.
- All rights reserved.
-
-
- This code is derived from software contributed to Berkeley by
- Vern Paxson.
-
- The United States Government has rights in this work pursuant
- to contract no. DE-AC03-76SF00098 between the United States
- Department of Energy and the University of California.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE.
-
- This basically says "do whatever you please with this software except
- remove this notice or take advantage of the University's (or the flex
- authors') name".
-
- Note that the "flex.skl" scanner skeleton carries no copyright notice.
- You are free to do whatever you please with scanners generated using flex;
- for them, you are not even bound by the above copyright.
-
-Parts of the code are
- Copyright © 1999 Karl Fogel <kfogel@red-bean.com>
- Copyright © 2001,2002,2003 Martyn J. Pearce <fluffy@cpan.org>
-and distributed under the terms of the GNU General Public License,
-version 2.
-
-The Debian specific changes are © 2003, 2004, 2005, 2006, 2008 Manoj
-Srivastava <srivasta@debian.org>, and distributed under the terms of
-the GNU General Public License, version 2.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
- A copy of the GNU General Public License is also available at
- <URL:http://www.gnu.org/copyleft/gpl.html>. You may also obtain
- it by writing to the Free Software Foundation, Inc., 51 Franklin
- St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Manoj Srivastava <srivasta@debian.org>
-arch-tag: d4250e44-a0e0-4ee0-adb9-2bd74f6eeb27
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: flex
+Upstream-Contact: flex-help@lists.sourceforge.net
+Source: git://git.code.sf.net/p/flex/flex
+Comment: This is the Debian prepackaged version of flex, the fast lexical
+ analyzer generator. This package was first put together by
+ Robert Leslie <rob@mars.org>. It is currently maintained by
+ Manoj Srivastava <srivasta@debian.org>, who took over from
+ Santiago Vila <sanvila@debian.org>, and it is built from
+ sources obtained from: http://flex.sourceforge.net/
+
+Files: *
+Copyright: 2001-2008 The Flex Project.
+ 1990, 1993, 1997 The Regents of the University of California.
+ All rights reserved.
+License: FLEX
+ Flex carries the copyright used for BSD software, slightly modified
+ because it originated at the Lawrence Berkeley (not Livermore!) Laboratory,
+ which operates under a contract with the Department of Energy:
+ .
+ This code is derived from software contributed to Berkeley by
+ Vern Paxson.
+ .
+ The United States Government has rights in this work pursuant
+ to contract no. DE-AC03-76SF00098 between the United States
+ Department of Energy and the University of California.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE.
+ .
+ This basically says "do whatever you please with this software except
+ remove this notice or take advantage of the University's (or the flex
+ authors') name".
+ .
+ Note that the "flex.skl" scanner skeleton carries no copyright notice.
+ You are free to do whatever you please with scanners generated using flex;
+ for them, you are not even bound by the above copyright.
+
+Files: debian/*
+Copyright: 2003-2009, 2014-2016 Manoj Srivastava <srivasta@debian.org>
+License: GPL-3+
+
+License: GPL-3+
+ This package is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/flex-doc.postinst b/debian/flex-doc.postinst
index 4ef68d2..4ef68d2 100755..100644
--- a/debian/flex-doc.postinst
+++ b/debian/flex-doc.postinst
diff --git a/debian/flex-doc.postrm b/debian/flex-doc.postrm
index 4d37c96..4d37c96 100755..100644
--- a/debian/flex-doc.postrm
+++ b/debian/flex-doc.postrm
diff --git a/debian/flex-doc.prerm b/debian/flex-doc.prerm
index fbf4c6c..fbf4c6c 100755..100644
--- a/debian/flex-doc.prerm
+++ b/debian/flex-doc.prerm
diff --git a/debian/flex.postinst b/debian/flex.postinst
index 362562e..362562e 100755..100644
--- a/debian/flex.postinst
+++ b/debian/flex.postinst
diff --git a/debian/flex.prerm b/debian/flex.prerm
index 927cc3e..927cc3e 100755..100644
--- a/debian/flex.prerm
+++ b/debian/flex.prerm
diff --git a/debian/patches/0001-debcherry-fixup-patch.patch b/debian/patches/0001-debcherry-fixup-patch.patch
deleted file mode 100644
index f7c0c6a..0000000
--- a/debian/patches/0001-debcherry-fixup-patch.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 5976487aeeaf3321d938ed450d8767f434f6b1e9 Mon Sep 17 00:00:00 2001
-From: Manoj Srivastava <srivasta@golden-gryphon.com>
-Date: Tue, 6 May 2014 23:53:47 -0700
-Subject: [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
----
- tests/test-bison-nr/Makefile.am | 4 ++--
- tests/test-bison-yylloc/Makefile.am | 4 ++--
- tests/test-bison-yylval/Makefile.am | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test-bison-nr/Makefile.am b/tests/test-bison-nr/Makefile.am
-index 9bc8af3..f6e6de9 100644
---- a/tests/test-bison-nr/Makefile.am
-+++ b/tests/test-bison-nr/Makefile.am
-@@ -29,12 +29,12 @@ CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) $(OBJS)
- OBJS = scanner.o parser.o main.o
-
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
--#LDFLAGS = $(top_srcdir)/libfl.a
-+#LDFLAGS = $(top_srcdir)/libfl.a
- YFLAGS = --defines --output=parser.c --name-prefix="test"
-
- testname = test-bison-nr
-
--scanner.c: $(srcdir)/scanner.l
-+scanner.c scanner.h: $(srcdir)/scanner.l
- $(FLEX) $<
- scanner.h: scanner.c
- scanner.o: parser.h
-diff --git a/tests/test-bison-yylloc/Makefile.am b/tests/test-bison-yylloc/Makefile.am
-index dc41b0f..0070991 100644
---- a/tests/test-bison-yylloc/Makefile.am
-+++ b/tests/test-bison-yylloc/Makefile.am
-@@ -29,12 +29,12 @@ CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) $(OBJS)
- OBJS = scanner.o parser.o main.o
-
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
--#LDFLAGS = $(top_srcdir)/libfl.a
-+#LDFLAGS = $(top_srcdir)/libfl.a
- YFLAGS = --defines --output=parser.c --name-prefix="test"
-
- testname = test-bison-yylloc
-
--scanner.c: $(srcdir)/scanner.l
-+scanner.c scanner.h: $(srcdir)/scanner.l
- $(FLEX) $<
- scanner.h: scanner.c
- scanner.o: parser.h
-diff --git a/tests/test-bison-yylval/Makefile.am b/tests/test-bison-yylval/Makefile.am
-index d8e27f7..1937b34 100644
---- a/tests/test-bison-yylval/Makefile.am
-+++ b/tests/test-bison-yylval/Makefile.am
-@@ -29,12 +29,12 @@ CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) $(OBJS)
- OBJS = parser.o scanner.o main.o
-
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
--#LDFLAGS = $(top_srcdir)/libfl.a
-+#LDFLAGS = $(top_srcdir)/libfl.a
- YFLAGS = --defines --output=parser.c --name-prefix="test"
-
- testname = test-bison-yylval
-
--scanner.c: $(srcdir)/scanner.l
-+scanner.c scanner.h: $(srcdir)/scanner.l
- $(FLEX) $<
- scanner.h: scanner.c
- scanner.o: parser.h
---
-2.0.0.rc0
-
diff --git a/debian/patches/0002-Finish-fixing-the-ia64-buffer-issue.patch b/debian/patches/0002-Finish-fixing-the-ia64-buffer-issue.patch
deleted file mode 100644
index 472a158..0000000
--- a/debian/patches/0002-Finish-fixing-the-ia64-buffer-issue.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 028b2841cadc8abddfa1a8907b5b7b3ed31dbd0c Mon Sep 17 00:00:00 2001
-From: Cyril Brulebois <kibi@debian.org>
-Date: Fri, 2 Jan 2009 06:53:39 +0100
-Subject: [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 | 8 ++++++++
- scan.c | 8 ++++++++
- skel.c | 8 ++++++++
- 3 files changed, 24 insertions(+)
-
-diff --git a/flex.skl b/flex.skl
-index f878ff0..460cbf4 100644
---- a/flex.skl
-+++ b/flex.skl
-@@ -447,7 +447,15 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
-
- /* Size of default input buffer. */
- #ifndef YY_BUF_SIZE
-+#ifdef __ia64__
-+/* On IA-64, the buffer size is 16k, not 8k.
-+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
-+ * Ditto for the __ia64__ case accordingly.
-+ */
-+#define YY_BUF_SIZE 32768
-+#else
- #define YY_BUF_SIZE 16384
-+#endif /* __ia64__ */
- #endif
-
- m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
-diff --git a/scan.c b/scan.c
-index 4bbbdcc..83bb6aa 100644
---- a/scan.c
-+++ b/scan.c
-@@ -141,7 +141,15 @@ typedef unsigned int flex_uint32_t;
-
- /* Size of default input buffer. */
- #ifndef YY_BUF_SIZE
-+#ifdef __ia64__
-+/* On IA-64, the buffer size is 16k, not 8k.
-+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
-+ * Ditto for the __ia64__ case accordingly.
-+ */
-+#define YY_BUF_SIZE 32768
-+#else
- #define YY_BUF_SIZE 16384
-+#endif /* __ia64__ */
- #endif
-
- /* The state buf must be large enough to hold one state per character in the main buffer.
-diff --git a/skel.c b/skel.c
-index 6dc7644..128cdb3 100644
---- a/skel.c
-+++ b/skel.c
-@@ -514,7 +514,15 @@ const char *skel[] = {
- "",
- "/* Size of default input buffer. */",
- "#ifndef YY_BUF_SIZE",
-+ "#ifdef __ia64__",
-+ "/* On IA-64, the buffer size is 16k, not 8k.",
-+ " * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.",
-+ " * Ditto for the __ia64__ case accordingly.",
-+ " */",
-+ "#define YY_BUF_SIZE 32768",
-+ "#else",
- "#define YY_BUF_SIZE 16384",
-+ "#endif /* __ia64__ */",
- "#endif",
- "",
- "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
---
-2.0.0.rc0
-
diff --git a/debian/patches/0003-ia64-buffer-fix-Some-more-fixes-for-the-ia64-buffer-.patch b/debian/patches/0003-ia64-buffer-fix-Some-more-fixes-for-the-ia64-buffer-.patch
deleted file mode 100644
index 754b69d..0000000
--- a/debian/patches/0003-ia64-buffer-fix-Some-more-fixes-for-the-ia64-buffer-.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2cd06e17a6500865438007bd7983c9823269cb99 Mon Sep 17 00:00:00 2001
-From: Manoj Srivastava <srivasta@golden-gryphon.com>
-Date: Fri, 2 Jan 2009 07:23:39 +0100
-Subject: [PATCH 3/5] [ia64-buffer-fix]]: Some more fixes for the ia64 buffer
- issue.
-
-Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>
----
- flex.skl | 5 +++++
- scan.c | 8 +++++++-
- skel.c | 5 +++++
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/flex.skl b/flex.skl
-index 460cbf4..85eea18 100644
---- a/flex.skl
-+++ b/flex.skl
-@@ -1104,7 +1104,12 @@ m4_define( [[M4_YY_NO_TOP_STATE]])
-
- /* Amount of stuff to slurp up with each read. */
- #ifndef YY_READ_BUF_SIZE
-+#ifdef __ia64__
-+/* On IA-64, the buffer size is 16k, not 8k */
-+#define YY_READ_BUF_SIZE 16384
-+#else
- #define YY_READ_BUF_SIZE 8192
-+#endif /* __ia64__ */
- #endif
-
- m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
-diff --git a/scan.c b/scan.c
-index 83bb6aa..30b4bf2 100644
---- a/scan.c
-+++ b/scan.c
-@@ -1,5 +1,6 @@
-+#line 2 "scan.c"
-
--#line 3 "scan.c"
-+#line 4 "scan.c"
-
- #define YY_INT_ALIGNED short int
-
-@@ -2095,7 +2096,12 @@ static int input (void );
-
- /* Amount of stuff to slurp up with each read. */
- #ifndef YY_READ_BUF_SIZE
-+#ifdef __ia64__
-+/* On IA-64, the buffer size is 16k, not 8k */
-+#define YY_READ_BUF_SIZE 16384
-+#else
- #define YY_READ_BUF_SIZE 8192
-+#endif /* __ia64__ */
- #endif
-
- /* Copy whatever the last rule matched to the standard output. */
-diff --git a/skel.c b/skel.c
-index 128cdb3..4ef6e3a 100644
---- a/skel.c
-+++ b/skel.c
-@@ -1171,7 +1171,12 @@ const char *skel[] = {
- "",
- "/* Amount of stuff to slurp up with each read. */",
- "#ifndef YY_READ_BUF_SIZE",
-+ "#ifdef __ia64__",
-+ "/* On IA-64, the buffer size is 16k, not 8k */",
-+ "#define YY_READ_BUF_SIZE 16384",
-+ "#else",
- "#define YY_READ_BUF_SIZE 8192",
-+ "#endif /* __ia64__ */",
- "#endif",
- "",
- "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
---
-2.0.0.rc0
-
diff --git a/debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch b/debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
deleted file mode 100644
index 729571f..0000000
--- a/debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d3d8bc98898f2b917062d8ef935de9bb0a50b540 Mon Sep 17 00:00:00 2001
-From: Manoj Srivastava <srivasta@golden-gryphon.com>
-Date: Wed, 9 Apr 2014 00:23:07 -0700
-Subject: [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>
----
- tests/test-bison-yylloc/parser.y | 4 ++--
- tests/test-bison-yylval/parser.y | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/test-bison-yylloc/parser.y b/tests/test-bison-yylloc/parser.y
-index e8f4e56..224d252 100644
---- a/tests/test-bison-yylloc/parser.y
-+++ b/tests/test-bison-yylloc/parser.y
-@@ -22,6 +22,7 @@
- */
-
- %parse-param { void* scanner }
-+%lex-param { void* scanner }
-
- /*
- How to compile:
-@@ -34,7 +35,6 @@
- #include "config.h"
-
- #define YYERROR_VERBOSE 1
--#define YYLEX_PARAM scanner
-
- extern int testget_lineno(void*);
-
-@@ -52,7 +52,7 @@ int process_text(char* s) {
-
- %}
-
--%pure_parser
-+%pure-parser
-
- %union {
- int lineno;
-diff --git a/tests/test-bison-yylval/parser.y b/tests/test-bison-yylval/parser.y
-index 0ffdb89..626c5e7 100644
---- a/tests/test-bison-yylval/parser.y
-+++ b/tests/test-bison-yylval/parser.y
-@@ -26,6 +26,7 @@
- bison --defines --output-file="parser.c" --name-prefix="test" parser.y
- */
- %parse-param { void* scanner }
-+%lex-param { void* scanner }
- %{
- #include <stdio.h>
- #include <stdlib.h>
-@@ -33,7 +34,6 @@
- #include "config.h"
-
- #define YYERROR_VERBOSE 1
--#define YYLEX_PARAM scanner
-
-
- /* A dummy function. A check against seg-faults in yylval->str. */
-@@ -49,7 +49,7 @@ int process_text(char* s) {
-
- %}
-
--%pure_parser
-+%pure-parser
-
- %union {
- long unused;
---
-2.0.0.rc0
-
diff --git a/debian/patches/0005-fix-off-by-one-error-generatred-line-numbers-are-off.patch b/debian/patches/0005-fix-off-by-one-error-generatred-line-numbers-are-off.patch
deleted file mode 100644
index 280d392..0000000
--- a/debian/patches/0005-fix-off-by-one-error-generatred-line-numbers-are-off.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0784556690a1f33ea44a03d20312ef439ae5cc32 Mon Sep 17 00:00:00 2001
-From: Manoj Srivastava <srivasta@golden-gryphon.com>
-Date: Tue, 6 May 2014 23:50:05 -0700
-Subject: [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>
----
- gen.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gen.c b/gen.c
-index 8261951..1594dcf 100644
---- a/gen.c
-+++ b/gen.c
-@@ -1084,7 +1084,7 @@ void gentabs ()
- out_str_dec (long_align ? get_int32_decl () :
- get_int16_decl (), "yy_acclist", MAX (numas,
- 1) + 1);
--
-+
- buf_prints (&yydmap_buf,
- "\t{YYTD_ID_ACCLIST, (void**)&yy_acclist, sizeof(%s)},\n",
- long_align ? "flex_int32_t" : "flex_int16_t");
-@@ -1092,7 +1092,7 @@ void gentabs ()
- yyacclist_tbl = (struct yytbl_data*)calloc(1,sizeof(struct yytbl_data));
- yytbl_data_init (yyacclist_tbl, YYTD_ID_ACCLIST);
- yyacclist_tbl->td_lolen = MAX(numas,1) + 1;
-- yyacclist_tbl->td_data = yyacclist_data =
-+ yyacclist_tbl->td_data = yyacclist_data =
- (flex_int32_t *) calloc (yyacclist_tbl->td_lolen, sizeof (flex_int32_t));
- yyacclist_curr = 1;
-
-@@ -2158,7 +2158,7 @@ void make_tables ()
- skelout ();
-
- /* Copy remainder of input to output. */
--
-+ linenum--;
- line_directive_out (stdout, 1);
-
- if (sectnum == 3) {
---
-2.0.0.rc0
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ddba361..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# exported from git by git-debcherry
-0001-debcherry-fixup-patch.patch
-0002-Finish-fixing-the-ia64-buffer-issue.patch
-0003-ia64-buffer-fix-Some-more-fixes-for-the-ia64-buffer-.patch
-0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
-0005-fix-off-by-one-error-generatred-line-numbers-are-off.patch
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..d3827e7 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+1.0