diff options
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index d8d232b..c88eb35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,19 @@ -flex (2.6.0-3) unstable; urgency=low - +flex (2.6.0-4) unstable; urgency=low + * Bug fix: "C++ style comment in C output", thanks to Tim Rühsen + There is a fix uploaded to deferred by Salvatore Bonaccorso + <carnil@debian.org>. I am uploading this fix instead, since this + variant has the same fix applied by a signed cherry pick from + upstream, which will make the upgrade to the next version somewhat + simpler. (Closes: #813256). + * Bug fix: "wrongly declares Multi-Arch:foreign", thanks to Helmut + Grohne. While we discuss the correct solution for this, I have removed + the MA package tags. I am not quite happy with the proposed solution + (swapping names of the packages seems icky, but I'll defer to the + experts if there is no better way) (Closes: #761449). + + -- Manoj Srivastava <srivasta@debian.org> Fri, 05 Feb 2016 15:41:03 -0800 + +flex (2.6.0-3) unstable; urgency=high * Revert the help2man fix; it was creating errors in the diff.gz file. We are now back to being mostly in sync with upstream. diff --git a/debian/control b/debian/control index d3a9855..ccc5fea 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,6 @@ Depends: ${shlibs:Depends}, m4, libfl-dev (= ${binary:Version}), dpkg (>= 1.15.4) | install-info, ${misc:Depends} Recommends: gcc | c-compiler Suggests: bison, build-essential -Multi-Arch: foreign Description: fast lexical analyzer generator Flex is a tool for generating scanners: programs which recognized lexical patterns in text. It reads the given input files for a description of a @@ -47,7 +46,6 @@ Description: Documentation for flex (a fast lexical analyzer generator) Package: libfl-dev Section: libdevel Architecture: any -Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: flex (<< 2.5.39), flex-old (<= 2.5.4a-10) Breaks: flex (<< 2.5.39), flex-old (<= 2.5.4a-10) |