From a50ebecb6dba95392d00464ac54014de95ae6178 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 17 Jan 2017 17:35:42 +0200 Subject: Import Debian changes 20130704-1.1 fauhdlc (20130704-1.1) unstable; urgency=medium * Non-maintainer upload. * Switch to working maintainer address. * Remove the obsolete DM-Upload-Allowed. * Add libfl-dev to the build dependencies. (Closes: #846422) * Add FTBFS fix from Stefan Potyra. (Closes: #835106) --- debian/changelog | 10 ++++++++++ debian/control | 5 ++--- debian/patches/835106.patch | 13 +++++++++++++ debian/patches/series | 1 + 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 debian/patches/835106.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 0a29e93..7bc3d5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +fauhdlc (20130704-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Switch to working maintainer address. + * Remove the obsolete DM-Upload-Allowed. + * Add libfl-dev to the build dependencies. (Closes: #846422) + * Add FTBFS fix from Stefan Potyra. (Closes: #835106) + + -- Adrian Bunk Tue, 17 Jan 2017 17:35:42 +0200 + fauhdlc (20130704-1) unstable; urgency=low * New upstream bugfix release: diff --git a/debian/control b/debian/control index b14b083..fc0c7bf 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,18 @@ Source: fauhdlc Section: devel Priority: optional -Maintainer: FAUmachine Team +Maintainer: FAUmachine Team Uploaders: Volkmar Sieh , Stefan Potyra -DM-Upload-Allowed: yes Build-Depends: debhelper (>= 5.0.0), libgc-dev, automake, xmlto, bison (>= 1:2.1), flex, + libfl-dev, python Standards-Version: 3.9.4 -Homepage: http://www.faumachine.org Package: fauhdlc Architecture: any diff --git a/debian/patches/835106.patch b/debian/patches/835106.patch new file mode 100644 index 0000000..a1d7a08 --- /dev/null +++ b/debian/patches/835106.patch @@ -0,0 +1,13 @@ +--- fauhdlc-20130704.orig/frontend/newparser/FAUhdlScanner.hpp ++++ fauhdlc-20130704/frontend/newparser/FAUhdlScanner.hpp +@@ -23,8 +23,8 @@ public: + // arg_yyin and arg_yyout default to the cin and cout, but we + // only make that assignment when initializing in yylex(). + FAUhdlScanner( +- FLEX_STD istream* arg_yyin = 0, +- FLEX_STD ostream* arg_yyout = 0 ++ std::istream* arg_yyin = 0, ++ std::ostream* arg_yyout = 0 + ) : yyFlexLexer(arg_yyin, arg_yyout), + bracesCtr(0), + isAssociation(false), diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..99a0579 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +835106.patch -- cgit v1.2.3