diff options
author | Manoj Srivastava <srivasta@debian.org> | 2016-01-25 16:37:57 -0800 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-25 17:55:22 -0800 |
commit | 65e118250752da4f02b0e7fd3c8ca0dd48851385 (patch) | |
tree | 854344ded7868d5d13f0ae359cba3740aa7c8d72 | |
parent | a23a4523ef7367eeb79ce6e720a4825c7a20cee8 (diff) |
A bug fixing point release
Drop patch from upstream about line numbering that is not working
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | debian/changelog | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 076ccad..86a894f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,7 @@ SUBDIRS = \ doc \ examples \ po \ - tests \ + tests \ tools # Create the ChangeLog, but only if we're inside a git working directory diff --git a/debian/changelog b/debian/changelog index 2737ae8..030edb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +flex (2.6.0-2) unstable; urgency=low + + * Revert "[fix-off-by-one-error]: generatred line numbers are off by + one". This brings us in line with upstream; and our fix was not + working anyway. Unfortunately, this still does not resolve #729927. + + -- Manoj Srivastava <srivasta@debian.org> Mon, 25 Jan 2016 16:40:12 -0800 + flex (2.6.0-1) unstable; urgency=low * New upstream version i |