Control: tags 831195 +patch While this problem can be easily patched, I have no motivation to work on this package anymore. RFH will be opened soon.
Regards, Eduard.
>From b1bf5f03735b5a0310698ac5143a1397dc8c0cca Mon Sep 17 00:00:00 2001 From: Eduard Bloch <bl...@debian.org> Date: Fri, 22 Jul 2016 22:26:31 +0200 Subject: [PATCH] Working around FTBFS, #831195 --- debian/changelog | 7 +++++++ debian/source/format | 1 + debian/source/options | 3 +++ xmacroplay.cpp | 18 +++++++----------- xmacrorec.cpp | 15 ++++----------- xmacrorec2.cpp | 12 ++---------- 6 files changed, 24 insertions(+), 32 deletions(-) create mode 100644 debian/source/format create mode 100644 debian/source/options diff --git a/debian/changelog b/debian/changelog index a400044..b599bbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xmacro (0.3pre-20000911-7) UNRELEASED; urgency=low + + * Fixing build failure with GCC-6 via rearanging the header order + (closes: #831195) + + -- Eduard Bloch <bl...@debian.org> Fri, 22 Jul 2016 22:26:14 +0200 + xmacro (0.3pre-20000911-6) unstable; urgency=low * Proper build with original tarball diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..4332117 --- /dev/null +++ b/debian/source/options @@ -0,0 +1,3 @@ +compression=xz +single-debian-patch +auto-commit diff --git a/xmacroplay.cpp b/xmacroplay.cpp index c48f6c7..8eb206c 100644 --- a/xmacroplay.cpp +++ b/xmacroplay.cpp @@ -34,7 +34,13 @@ /***************************************************************************** * Includes ****************************************************************************/ -#include <stdio.h> +/***************************************************************************** + * What iostream do we have? + ****************************************************************************/ +#include <iostream> +#include <iomanip> + +#include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <ctype.h> @@ -47,16 +53,6 @@ #include <X11/extensions/XTest.h> #include "chartbl.h" -/***************************************************************************** - * What iostream do we have? - ****************************************************************************/ -#ifdef HAVE_IOSTREAM -#include <iostream> -#include <iomanip> -#else -#include <iostream.h> -#include <iomanip.h> -#endif using namespace std; diff --git a/xmacrorec.cpp b/xmacrorec.cpp index 7526eb1..64090bf 100644 --- a/xmacrorec.cpp +++ b/xmacrorec.cpp @@ -36,6 +36,10 @@ /***************************************************************************** * Includes ****************************************************************************/ + +#include <iostream> +#include <iomanip> + #include <stdio.h> #include <stdlib.h> #include <X11/Xlibint.h> @@ -46,17 +50,6 @@ #include <X11/keysym.h> #include <X11/extensions/XTest.h> -/***************************************************************************** - * What iostream do we have? - ****************************************************************************/ -#ifdef HAVE_IOSTREAM -#include <iostream> -#include <iomanip> -#else -#include <iostream.h> -#include <iomanip.h> -#endif - using namespace std; #define PROG "xmacrorec" diff --git a/xmacrorec2.cpp b/xmacrorec2.cpp index 09e10bb..7f5c437 100644 --- a/xmacrorec2.cpp +++ b/xmacrorec2.cpp @@ -38,6 +38,8 @@ /***************************************************************************** * Includes ****************************************************************************/ +#include <iostream> +#include <iomanip> #include <stdio.h> #include <stdlib.h> #include <X11/Xlibint.h> @@ -48,16 +50,6 @@ #include <X11/keysym.h> #include <X11/extensions/record.h> -/***************************************************************************** - * What iostream do we have? - ****************************************************************************/ -#ifdef HAVE_IOSTREAM -#include <iostream> -#include <iomanip> -#else -#include <iostream.h> -#include <iomanip.h> -#endif using namespace std; -- 2.8.1
