summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--debian/changelog8
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