--- xmacro-0.3pre-20000911.orig/README
+++ xmacro-0.3pre-20000911/README
@@ -10,7 +10,7 @@
 
 xmacroplay:
  Reads lines from the standard input. It can understand the following lines:
-Delay <sec>		- delays the program with <sec> secundums
+Delay <sec>		- delays the program with <sec> seconds
 ButtonPress <n>		- sends a ButtonPress event with button <n>
 			  this emulates the pressing of the mouse button <n>
 ButtonRelease <n>	- sends a ButtonRelease event with button <n>
--- 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 @@
 	"ydiaeresis",	// 255 FF
 };
 
-char *chartbl_lat2[] =
+const char *chartbl_lat2[] =
 {
 	"",		//   0  0
 	"",		//   1  1
@@ -542,4 +542,4 @@
 	"abovedot",	// 255 FF
 };
 
-char **chartbl[]={ chartbl_lat1, chartbl_lat2 };
+const char **chartbl[]={ chartbl_lat1, chartbl_lat2 };
--- xmacro-0.3pre-20000911.orig/xmacrorec2.cpp
+++ xmacro-0.3pre-20000911/xmacrorec2.cpp
@@ -59,6 +59,8 @@
 #include <iomanip.h>
 #endif
 
+using namespace std;
+
 #define PROG "xmacrorec2"
 
 /***************************************************************************** 
@@ -177,7 +179,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], "%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/xmacroplay-keys
+++ xmacro-0.3pre-20000911/xmacroplay-keys
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo XX $* $#
+
+[ $# -lt 2 ] && { echo "Usage: test <display> <key> [<key> ...]"; exit 1; }
+
+display=$1
+
+shift
+
+{ 
+  for key in $*; do
+	  echo "KeyStrPress $key"
+		echo "KeyStrRelease $key"
+  done
+} | xmacroplay "$display"
--- xmacro-0.3pre-20000911.orig/xmacrorec.cpp
+++ xmacro-0.3pre-20000911/xmacrorec.cpp
@@ -57,6 +57,8 @@
 #include <iomanip.h>
 #endif
 
+using namespace std;
+
 #define PROG "xmacrorec"
 
 /***************************************************************************** 
@@ -187,7 +189,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], "%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/xmacroplay.cpp
+++ xmacro-0.3pre-20000911/xmacroplay.cpp
@@ -58,6 +58,8 @@
 #include <iomanip.h>
 #endif
 
+using namespace std;
+
 #define PROG "xmacroplay"
 
 /***************************************************************************** 
--- 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/run
+++ xmacro-0.3pre-20000911/run
@@ -8,7 +8,7 @@
 
 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
--- xmacro-0.3pre-20000911.orig/debian/docs
+++ xmacro-0.3pre-20000911/debian/docs
@@ -0,0 +1 @@
+README
--- xmacro-0.3pre-20000911.orig/debian/compat
+++ xmacro-0.3pre-20000911/debian/compat
@@ -0,0 +1 @@
+5
--- xmacro-0.3pre-20000911.orig/debian/dirs
+++ xmacro-0.3pre-20000911/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- xmacro-0.3pre-20000911.orig/debian/copyright
+++ xmacro-0.3pre-20000911/debian/copyright
@@ -0,0 +1,14 @@
+This package was debianized by Eduard Bloch <blade@debian.org> on Mon, 30 Dec
+2002 20:18:17 +0100 and Paul Hedderly <prh@debian.org> on Thu, 12 Sep 2002
+19:33:31 +0100.
+
+It was downloaded from http://prdownloads.sourceforge.net/xmacro/xmacro-pre0.3-20000911.tar.gz?download
+
+Upstream Authors: Gabor Keresztfalvi <keresztg@mail.com>
+                  Copyright (C) 2000 Jan Ekholm <chakie@infa.abo.fi>
+
+Copyright: 
+
+This software is copyright by the authors under the GPL license (Version 2)
+found on Debian systems in the file /usr/share/common-licenses/GPL .
+
--- xmacro-0.3pre-20000911.orig/debian/xmacro.examples
+++ xmacro-0.3pre-20000911/debian/xmacro.examples
@@ -0,0 +1,2 @@
+run
+example/test.icewm
--- xmacro-0.3pre-20000911.orig/debian/changelog
+++ xmacro-0.3pre-20000911/debian/changelog
@@ -0,0 +1,54 @@
+xmacro (0.3pre-20000911-6.4.201403152052) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Sat, 15 Mar 2014 20:52:31 +0100
+
+xmacro (0.3pre-20000911-6) unstable; urgency=low
+
+  * Proper build with original tarball
+
+ -- Eduard Bloch <blade@debian.org>  Sat, 12 Nov 2011 19:44:42 +0100
+
+xmacro (0.3pre-20000911-5) unstable; urgency=low
+
+  * Acknowledging NMU (closes: #461692)
+  * Fixing typo in README
+  * Fixing some compiler warning issues, Makefile improvements
+  * Policy and debhelper reference update, obligatory fixes, XZ usage enabled
+
+ -- Eduard Bloch <blade@debian.org>  Sat, 12 Nov 2011 15:54:22 +0100
+
+xmacro (0.3pre-20000911-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix GCC 4.3 compatibility, patch by Kumar Appaiah (Closes: #461692)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sun, 23 Mar 2008 00:32:43 +0100
+
+xmacro (0.3pre-20000911-4) unstable; urgency=low
+
+  * Trigger new build for the g++-4.0 transition
+  * formal updates: policy version, xlibs-dev changed to particular packages
+
+ -- Eduard Bloch <blade@debian.org>  Tue, 12 Jul 2005 22:37:08 +0200
+
+xmacro (0.3pre-20000911-3) unstable; urgency=low
+
+  * Trigger new build for the g++-3.2 transition
+
+ -- Eduard Bloch <blade@debian.org>  Fri, 17 Jan 2003 12:46:59 +0100
+
+xmacro (0.3pre-20000911-2) unstable; urgency=low
+
+  * merged changes from prh's inofficial xmacro package: control, copyright, 
+    a demo script
+
+ -- Eduard Bloch <blade@debian.org>  Tue,  7 Jan 2003 18:24:40 +0100
+
+xmacro (0.3pre-20000911-1) unstable; urgency=low
+
+  * Initial Release, closes: #174755
+
+ -- Eduard Bloch <blade@debian.org>  Mon, 30 Dec 2002 20:18:17 +0100
+
--- xmacro-0.3pre-20000911.orig/debian/control
+++ xmacro-0.3pre-20000911/debian/control
@@ -0,0 +1,23 @@
+Source: xmacro
+Section: utils
+Priority: optional
+Maintainer: Eduard Bloch <blade@debian.org>
+Build-Depends: debhelper (>> 5.0), libx11-dev, libxtst-dev
+Standards-Version: 3.9.2
+
+Package: xmacro
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: dpkg (>= 1.15.6)
+Description: Record / Play keystrokes and mouse movements in X displays
+ xmacrorec can be used to record mouse and keyboard events on any X11 display.
+ .
+ xmacroplay can be used to playback recorded events or send any other
+ mouse/keyboard events you choose. It is very handy for scripting an
+ X display - for example controlling a presentation in mgp or ultrapoint
+ from a script, network connection...
+ .
+ xmacroplay-keys is a script to help use the above.
+ .
+ Together these utils can be used to record and replay sessions
+ for demonstrations etc.
--- xmacro-0.3pre-20000911.orig/debian/rules
+++ xmacro-0.3pre-20000911/debian/rules
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+CXXFLAGS=-g -O2
+export CXXFLAGS
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#/usr/bin/docbook-to-man debian/xmacro-0.3pre.sgml > xmacro-0.3pre.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	$(MAKE) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/xmacro-0.3pre.
+	install -Dpv xmacroplay-keys xmacroplay xmacrorec xmacrorec2 $(CURDIR)/debian/xmacro/usr/bin
+
+build-arch: build
+
+build-indep: build
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installcron
+	dh_installman
+	dh_installinfo
+	dh_installchangelogs 
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	chmod -x $(CURDIR)/debian/xmacro/usr/share/doc/xmacro/examples/*
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb -- -Zxz
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
