tags 556688 + patch
tags 556688 + pending
thanks

Dear maintainer,

I've prepared an NMU for xautomation (versioned as 1.03-1.1) and
uploaded it to the archive. Find attached the patch with the changes.

Regards.
Ana
diff -u xautomation-1.03/debian/rules xautomation-1.03/debian/rules
--- xautomation-1.03/debian/rules
+++ xautomation-1.03/debian/rules
@@ -29,7 +29,9 @@
 	INSTALL_PROGRAM += -s
 endif
 
-configure: 
+include /usr/share/quilt/quilt.make
+
+configure: $(QUILT_STAMPFN)
 
 configure-stamp: configure
 	dh_testdir
@@ -47,10 +49,11 @@
 
 build-stamp:  configure-stamp
 	dh_testdir
+	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	$(MAKE)
 	touch build-stamp
 
-clean: 
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
diff -u xautomation-1.03/debian/changelog xautomation-1.03/debian/changelog
--- xautomation-1.03/debian/changelog
+++ xautomation-1.03/debian/changelog
@@ -1,3 +1,12 @@
+xautomation (1.03-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with binutils-gold. (Closes: #556688)
+  * Add build-depend on quilt and some small changes in debian/rules to enable
+    patching.
+
+ -- Ana Beatriz Guerrero Lopez <a...@debian.org>  Mon, 12 Sep 2011 21:17:26 +0200
+
 xautomation (1.03-1) unstable; urgency=low
 
   * New Upstream Release (1.03).
diff -u xautomation-1.03/debian/control xautomation-1.03/debian/control
--- xautomation-1.03/debian/control
+++ xautomation-1.03/debian/control
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Kapil Hari Paranjape <ka...@debian.org>
 Build-Depends: debhelper (>= 5.0.0), libxtst-dev, libx11-dev,
- libpng-dev, automake
+ libpng-dev, automake, quilt
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint
 Homepage: http://hoopajoo.net/projects/xautomation.html
only in patch2:
unchanged:
--- xautomation-1.03.orig/debian/patches/series
+++ xautomation-1.03/debian/patches/series
@@ -0,0 +1 @@
+fix-binutils-gold
only in patch2:
unchanged:
--- xautomation-1.03.orig/debian/patches/fix-binutils-gold
+++ xautomation-1.03/debian/patches/fix-binutils-gold
@@ -0,0 +1,13 @@
+From: Ana Guerrero <a...@debian.org>
+Subject: fix FTBFS with binutils-gold
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = xte rgb2pat png2pat visgrep pat2ppm patextract xmousepos
+ man_MANS = pat2ppm.1 patextract.1 png2pat.1 rgb2pat.1 visgrep.1 xautomation.7 xmousepos.1 xte.1
+ xte_SOURCES = xte.c debug.c kbd.h keysym_map.h multikey_map.h
+-xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst
++xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst  -lX11
+ rgb2pat_SOURCES = rgb2pat.c image.c image.h debug.c debug.h
+ rgb2pat_LDADD = -lpng
+ png2pat_SOURCES = png2pat.c image.c image.h debug.c debug.h

Reply via email to