diff -Nru xmacro-0.3pre-20000911/chartbl.h xmacro-0.3pre-20000911/chartbl.h --- xmacro-0.3pre-20000911/chartbl.h 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/chartbl.h 2000-09-05 20:21:23.000000000 +0000 @@ -22,7 +22,7 @@ /* Version 0.1 (20000817) probably still incomplete... */ -const char *chartbl_lat1[] = +char *chartbl_lat1[] = { "", // 0 0 "", // 1 1 @@ -282,7 +282,7 @@ "ydiaeresis", // 255 FF }; -const char *chartbl_lat2[] = +char *chartbl_lat2[] = { "", // 0 0 "", // 1 1 @@ -542,4 +542,4 @@ "abovedot", // 255 FF }; -const char **chartbl[]={ chartbl_lat1, chartbl_lat2 }; +char **chartbl[]={ chartbl_lat1, chartbl_lat2 }; diff -Nru xmacro-0.3pre-20000911/debian/changelog xmacro-0.3pre-20000911/debian/changelog --- xmacro-0.3pre-20000911/debian/changelog 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/debian/changelog 2017-01-05 12:50:50.000000000 +0000 @@ -1,3 +1,14 @@ +xmacro (0.3pre-20000911-7) unstable; urgency=low + + * QA upload. + * Set Maintainer to Debian QA Group. (See: #832150) + + [ Eduard Bloch ] + * Fixing build failure with GCC-6 via rearanging the header order + (closes: #831195) + + -- Andreas Beckmann Thu, 05 Jan 2017 13:50:50 +0100 + xmacro (0.3pre-20000911-6) unstable; urgency=low * Proper build with original tarball diff -Nru xmacro-0.3pre-20000911/debian/control xmacro-0.3pre-20000911/debian/control --- xmacro-0.3pre-20000911/debian/control 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/debian/control 2017-01-05 12:43:06.000000000 +0000 @@ -1,7 +1,7 @@ Source: xmacro Section: utils Priority: optional -Maintainer: Eduard Bloch +Maintainer: Debian QA Group Build-Depends: debhelper (>> 5.0), libx11-dev, libxtst-dev Standards-Version: 3.9.2 diff -Nru xmacro-0.3pre-20000911/debian/patches/series xmacro-0.3pre-20000911/debian/patches/series --- xmacro-0.3pre-20000911/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ xmacro-0.3pre-20000911/debian/patches/series 2017-01-05 12:44:20.000000000 +0000 @@ -0,0 +1 @@ +xmacro_0.3pre-20000911-7.patch diff -Nru xmacro-0.3pre-20000911/debian/patches/xmacro_0.3pre-20000911-7.patch xmacro-0.3pre-20000911/debian/patches/xmacro_0.3pre-20000911-7.patch --- xmacro-0.3pre-20000911/debian/patches/xmacro_0.3pre-20000911-7.patch 1970-01-01 00:00:00.000000000 +0000 +++ xmacro-0.3pre-20000911/debian/patches/xmacro_0.3pre-20000911-7.patch 2017-01-05 12:44:50.000000000 +0000 @@ -0,0 +1,210 @@ +Description: upstream changes found in xmacro 0.3pre-20000911-7 + +--- xmacro-0.3pre-20000911.orig/Makefile ++++ xmacro-0.3pre-20000911/Makefile +@@ -1,18 +1,19 @@ + VERSION=0.3 ++CXXFLAGS ?= -O2 + + all: xmacroplay xmacrorec xmacrorec2 + + xmacroplay: xmacroplay.cpp chartbl.h +- g++ -O2 -I/usr/X11R6/include -Wall -pedantic -DVERSION=$(VERSION) xmacroplay.cpp -o xmacroplay -L/usr/X11R6/lib -lXtst -lX11 ++ $(CXX) $(CXXFLAGS) -I/usr/X11R6/include -Wall -pedantic -DHAVE_IOSTREAM=1 -DVERSION=$(VERSION) xmacroplay.cpp -o xmacroplay -L/usr/X11R6/lib -lXtst -lX11 + + xmacrorec: xmacrorec.cpp +- g++ -O2 -I/usr/X11R6/include -Wall -pedantic -DVERSION=$(VERSION) xmacrorec.cpp -o xmacrorec -L/usr/X11R6/lib -lXtst -lX11 ++ $(CXX) $(CXXFLAGS) -I/usr/X11R6/include -Wall -pedantic -DHAVE_IOSTREAM=1 -DVERSION=$(VERSION) xmacrorec.cpp -o xmacrorec -L/usr/X11R6/lib -lXtst -lX11 + + xmacrorec2: xmacrorec2.cpp +- g++ -O2 -I/usr/X11R6/include -Wall -pedantic -DVERSION=$(VERSION) xmacrorec2.cpp -o xmacrorec2 -L/usr/X11R6/lib -lXtst -lX11 ++ $(CXX) $(CXXFLAGS) -I/usr/X11R6/include -Wall -pedantic -DHAVE_IOSTREAM=1 -DVERSION=$(VERSION) xmacrorec2.cpp -o xmacrorec2 -L/usr/X11R6/lib -lXtst -lX11 + + clean: +- rm xmacrorec xmacroplay xmacrorec2 ++ rm -f xmacrorec xmacroplay xmacrorec2 + + deb: + umask 022 && epm -f deb -nsm xmacro +--- xmacro-0.3pre-20000911.orig/README ++++ xmacro-0.3pre-20000911/README +@@ -10,7 +10,7 @@ recorded file! + + xmacroplay: + Reads lines from the standard input. It can understand the following lines: +-Delay - delays the program with secundums ++Delay - delays the program with seconds + ButtonPress - sends a ButtonPress event with button + this emulates the pressing of the mouse button + ButtonRelease - sends a ButtonRelease event with button +--- xmacro-0.3pre-20000911.orig/chartbl.h ++++ xmacro-0.3pre-20000911/chartbl.h +@@ -22,7 +22,7 @@ + + /* Version 0.1 (20000817) probably still incomplete... */ + +-char *chartbl_lat1[] = ++const char *chartbl_lat1[] = + { + "", // 0 0 + "", // 1 1 +@@ -282,7 +282,7 @@ char *chartbl_lat1[] = + "ydiaeresis", // 255 FF + }; + +-char *chartbl_lat2[] = ++const char *chartbl_lat2[] = + { + "", // 0 0 + "", // 1 1 +@@ -542,4 +542,4 @@ char *chartbl_lat2[] = + "abovedot", // 255 FF + }; + +-char **chartbl[]={ chartbl_lat1, chartbl_lat2 }; ++const char **chartbl[]={ chartbl_lat1, chartbl_lat2 }; +--- xmacro-0.3pre-20000911.orig/run ++++ xmacro-0.3pre-20000911/run +@@ -8,7 +8,7 @@ fi + + case $1 in + startvfb) +- Xvfb $mydisp -fbdir /tmp -screen 0 800x600x8 & ++ Xvfb $mydisp -ac -fbdir /tmp -screen 0 800x600x8 & + # Xvfb $mydisp -fbdir /tmp -screen 0 1024x768x8 & + icewm -display $mydisp & + # xmodmap -display $mydisp /usr/X11R6/lib/X11/xmodmap.std +--- /dev/null ++++ xmacro-0.3pre-20000911/xmacroplay-keys +@@ -0,0 +1,16 @@ ++#!/bin/sh ++ ++echo XX $* $# ++ ++[ $# -lt 2 ] && { echo "Usage: test [ ...]"; exit 1; } ++ ++display=$1 ++ ++shift ++ ++{ ++ for key in $*; do ++ echo "KeyStrPress $key" ++ echo "KeyStrRelease $key" ++ done ++} | xmacroplay "$display" +--- xmacro-0.3pre-20000911.orig/xmacroplay.cpp ++++ xmacro-0.3pre-20000911/xmacroplay.cpp +@@ -34,7 +34,13 @@ + /***************************************************************************** + * Includes + ****************************************************************************/ +-#include ++/***************************************************************************** ++ * What iostream do we have? ++ ****************************************************************************/ ++#include ++#include ++ ++#include + #include + #include + #include +@@ -47,16 +53,8 @@ + #include + + #include "chartbl.h" +-/***************************************************************************** +- * What iostream do we have? +- ****************************************************************************/ +-#ifdef HAVE_IOSTREAM +-#include +-#include +-#else +-#include +-#include +-#endif ++ ++using namespace std; + + #define PROG "xmacroplay" + +--- xmacro-0.3pre-20000911.orig/xmacrorec.cpp ++++ xmacro-0.3pre-20000911/xmacrorec.cpp +@@ -36,6 +36,10 @@ + /***************************************************************************** + * Includes + ****************************************************************************/ ++ ++#include ++#include ++ + #include + #include + #include +@@ -46,16 +50,7 @@ + #include + #include + +-/***************************************************************************** +- * What iostream do we have? +- ****************************************************************************/ +-#ifdef HAVE_IOSTREAM +-#include +-#include +-#else +-#include +-#include +-#endif ++using namespace std; + + #define PROG "xmacrorec" + +@@ -187,7 +182,7 @@ void parseCommandLine (int argc, char * + else if ( strcmp (argv[Index], "-k" ) == 0 && Index + 1 < argc ) { + // yep, and there seems to be a parameter too, interpret it as a + // number +- if ( sscanf ( argv[Index + 1], "%d", &QuitKey ) != 1 ) { ++ if ( sscanf ( argv[Index + 1], "%u", &QuitKey ) != 1 ) { + // oops, not a valid integer + cerr << "Invalid parameter for '-k'." << QuitKey << endl; + usage ( EXIT_FAILURE ); +--- xmacro-0.3pre-20000911.orig/xmacrorec2.cpp ++++ xmacro-0.3pre-20000911/xmacrorec2.cpp +@@ -38,6 +38,8 @@ + /***************************************************************************** + * Includes + ****************************************************************************/ ++#include ++#include + #include + #include + #include +@@ -48,16 +50,8 @@ + #include + #include + +-/***************************************************************************** +- * What iostream do we have? +- ****************************************************************************/ +-#ifdef HAVE_IOSTREAM +-#include +-#include +-#else +-#include +-#include +-#endif ++ ++using namespace std; + + #define PROG "xmacrorec2" + +@@ -177,7 +171,7 @@ void parseCommandLine (int argc, char * + else if ( strcmp (argv[Index], "-k" ) == 0 && Index + 1 < argc ) { + // yep, and there seems to be a parameter too, interpret it as a + // number +- if ( sscanf ( argv[Index + 1], "%d", &QuitKey ) != 1 ) { ++ if ( sscanf ( argv[Index + 1], "%u", &QuitKey ) != 1 ) { + // oops, not a valid integer + cerr << "Invalid parameter for '-k'." << QuitKey << endl; + usage ( EXIT_FAILURE ); diff -Nru xmacro-0.3pre-20000911/debian/rules xmacro-0.3pre-20000911/debian/rules --- xmacro-0.3pre-20000911/debian/rules 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/debian/rules 2017-01-05 12:50:37.000000000 +0000 @@ -47,7 +47,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/xmacro-0.3pre. diff -Nru xmacro-0.3pre-20000911/debian/source/format xmacro-0.3pre-20000911/debian/source/format --- xmacro-0.3pre-20000911/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ xmacro-0.3pre-20000911/debian/source/format 2017-01-05 12:41:06.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru xmacro-0.3pre-20000911/debian/source/options xmacro-0.3pre-20000911/debian/source/options --- xmacro-0.3pre-20000911/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ xmacro-0.3pre-20000911/debian/source/options 2017-01-05 12:41:06.000000000 +0000 @@ -0,0 +1,3 @@ +compression=xz +single-debian-patch +auto-commit diff -Nru xmacro-0.3pre-20000911/Makefile xmacro-0.3pre-20000911/Makefile --- xmacro-0.3pre-20000911/Makefile 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/Makefile 2000-09-11 18:25:10.000000000 +0000 @@ -1,19 +1,18 @@ VERSION=0.3 -CXXFLAGS ?= -O2 all: xmacroplay xmacrorec xmacrorec2 xmacroplay: xmacroplay.cpp chartbl.h - $(CXX) $(CXXFLAGS) -I/usr/X11R6/include -Wall -pedantic -DHAVE_IOSTREAM=1 -DVERSION=$(VERSION) xmacroplay.cpp -o xmacroplay -L/usr/X11R6/lib -lXtst -lX11 + g++ -O2 -I/usr/X11R6/include -Wall -pedantic -DVERSION=$(VERSION) xmacroplay.cpp -o xmacroplay -L/usr/X11R6/lib -lXtst -lX11 xmacrorec: xmacrorec.cpp - $(CXX) $(CXXFLAGS) -I/usr/X11R6/include -Wall -pedantic -DHAVE_IOSTREAM=1 -DVERSION=$(VERSION) xmacrorec.cpp -o xmacrorec -L/usr/X11R6/lib -lXtst -lX11 + g++ -O2 -I/usr/X11R6/include -Wall -pedantic -DVERSION=$(VERSION) xmacrorec.cpp -o xmacrorec -L/usr/X11R6/lib -lXtst -lX11 xmacrorec2: xmacrorec2.cpp - $(CXX) $(CXXFLAGS) -I/usr/X11R6/include -Wall -pedantic -DHAVE_IOSTREAM=1 -DVERSION=$(VERSION) xmacrorec2.cpp -o xmacrorec2 -L/usr/X11R6/lib -lXtst -lX11 + g++ -O2 -I/usr/X11R6/include -Wall -pedantic -DVERSION=$(VERSION) xmacrorec2.cpp -o xmacrorec2 -L/usr/X11R6/lib -lXtst -lX11 clean: - rm -f xmacrorec xmacroplay xmacrorec2 + rm xmacrorec xmacroplay xmacrorec2 deb: umask 022 && epm -f deb -nsm xmacro diff -Nru xmacro-0.3pre-20000911/README xmacro-0.3pre-20000911/README --- xmacro-0.3pre-20000911/README 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/README 2000-09-05 20:21:23.000000000 +0000 @@ -10,7 +10,7 @@ xmacroplay: Reads lines from the standard input. It can understand the following lines: -Delay - delays the program with seconds +Delay - delays the program with secundums ButtonPress - sends a ButtonPress event with button this emulates the pressing of the mouse button ButtonRelease - sends a ButtonRelease event with button diff -Nru xmacro-0.3pre-20000911/run xmacro-0.3pre-20000911/run --- xmacro-0.3pre-20000911/run 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/run 2000-09-05 20:21:23.000000000 +0000 @@ -8,7 +8,7 @@ case $1 in startvfb) - Xvfb $mydisp -ac -fbdir /tmp -screen 0 800x600x8 & + Xvfb $mydisp -fbdir /tmp -screen 0 800x600x8 & # Xvfb $mydisp -fbdir /tmp -screen 0 1024x768x8 & icewm -display $mydisp & # xmodmap -display $mydisp /usr/X11R6/lib/X11/xmodmap.std diff -Nru xmacro-0.3pre-20000911/xmacroplay.cpp xmacro-0.3pre-20000911/xmacroplay.cpp --- xmacro-0.3pre-20000911/xmacroplay.cpp 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/xmacroplay.cpp 2000-09-11 18:25:11.000000000 +0000 @@ -58,8 +58,6 @@ #include #endif -using namespace std; - #define PROG "xmacroplay" /***************************************************************************** diff -Nru xmacro-0.3pre-20000911/xmacroplay-keys xmacro-0.3pre-20000911/xmacroplay-keys --- xmacro-0.3pre-20000911/xmacroplay-keys 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/xmacroplay-keys 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -#!/bin/sh - -echo XX $* $# - -[ $# -lt 2 ] && { echo "Usage: test [ ...]"; exit 1; } - -display=$1 - -shift - -{ - for key in $*; do - echo "KeyStrPress $key" - echo "KeyStrRelease $key" - done -} | xmacroplay "$display" diff -Nru xmacro-0.3pre-20000911/xmacrorec2.cpp xmacro-0.3pre-20000911/xmacrorec2.cpp --- xmacro-0.3pre-20000911/xmacrorec2.cpp 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/xmacrorec2.cpp 2000-09-05 23:46:15.000000000 +0000 @@ -59,8 +59,6 @@ #include #endif -using namespace std; - #define PROG "xmacrorec2" /***************************************************************************** @@ -179,7 +177,7 @@ else if ( strcmp (argv[Index], "-k" ) == 0 && Index + 1 < argc ) { // yep, and there seems to be a parameter too, interpret it as a // number - if ( sscanf ( argv[Index + 1], "%u", &QuitKey ) != 1 ) { + if ( sscanf ( argv[Index + 1], "%d", &QuitKey ) != 1 ) { // oops, not a valid integer cerr << "Invalid parameter for '-k'." << QuitKey << endl; usage ( EXIT_FAILURE ); diff -Nru xmacro-0.3pre-20000911/xmacrorec.cpp xmacro-0.3pre-20000911/xmacrorec.cpp --- xmacro-0.3pre-20000911/xmacrorec.cpp 2017-01-05 18:01:37.000000000 +0000 +++ xmacro-0.3pre-20000911/xmacrorec.cpp 2000-09-05 20:21:23.000000000 +0000 @@ -57,8 +57,6 @@ #include #endif -using namespace std; - #define PROG "xmacrorec" /***************************************************************************** @@ -189,7 +187,7 @@ else if ( strcmp (argv[Index], "-k" ) == 0 && Index + 1 < argc ) { // yep, and there seems to be a parameter too, interpret it as a // number - if ( sscanf ( argv[Index + 1], "%u", &QuitKey ) != 1 ) { + if ( sscanf ( argv[Index + 1], "%d", &QuitKey ) != 1 ) { // oops, not a valid integer cerr << "Invalid parameter for '-k'." << QuitKey << endl; usage ( EXIT_FAILURE );