r11385 - in packages/trunk/gfpoken/debian: . patches

[Paul Wise]

Author: pabs
Date: 2010-09-27 06:53:31 +0000 (Mon, 27 Sep 2010)
New Revision: 11385

Added:
   packages/trunk/gfpoken/debian/patches/
   packages/trunk/gfpoken/debian/patches/fix-FTBFS-with-binutils-gold.patch
   packages/trunk/gfpoken/debian/patches/series
Modified:
   packages/trunk/gfpoken/debian/changelog
   packages/trunk/gfpoken/debian/control
   packages/trunk/gfpoken/debian/rules
Log:
Add patch to fix FTBFS with binutils-gold (Closes: #554543)

Modified: packages/trunk/gfpoken/debian/changelog
===================================================================
--- packages/trunk/gfpoken/debian/changelog	2010-09-27 06:23:20 UTC (rev 11384)
+++ packages/trunk/gfpoken/debian/changelog	2010-09-27 06:53:31 UTC (rev 11385)
@@ -6,6 +6,7 @@
   [ Paul Wise ]
   * Upgrade to new debhelper override_* rules
   * Use the dpkg-source v3 format
+  * Add patch to fix FTBFS with binutils-gold (Closes: #554543)
 
  -- Bas Wijnen <wijnen at debian.org>  Sat, 11 Apr 2009 12:39:52 +0200
 

Modified: packages/trunk/gfpoken/debian/control
===================================================================
--- packages/trunk/gfpoken/debian/control	2010-09-27 06:23:20 UTC (rev 11384)
+++ packages/trunk/gfpoken/debian/control	2010-09-27 06:53:31 UTC (rev 11385)
@@ -1,5 +1,5 @@
 Source: gfpoken
-Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, automake1.10, autoconf (>= 2.53), gimp, blender, imagemagick, netpbm, sharutils
+Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, dh-autoreconf, gimp, blender, imagemagick, netpbm, sharutils
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>

Added: packages/trunk/gfpoken/debian/patches/fix-FTBFS-with-binutils-gold.patch
===================================================================
--- packages/trunk/gfpoken/debian/patches/fix-FTBFS-with-binutils-gold.patch	                        (rev 0)
+++ packages/trunk/gfpoken/debian/patches/fix-FTBFS-with-binutils-gold.patch	2010-09-27 06:53:31 UTC (rev 11385)
@@ -0,0 +1,15 @@
+Description: fix FTBFS with binutils-gold
+Author: Paul Wise <pabs at debian.org>
+Bug-Debian: http://bugs.debian.org/554543
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,7 +27,7 @@
+ gfpoken_CFLAGS = $(GTK2_CFLAGS)
+ # Don't use autoconf substitution here, because it would include
+ # implicit dependencies.
+-gfpoken_LDFLAGS = -lgtk-x11-2.0
++gfpoken_LDFLAGS = -lgtk-x11-2.0 -lgdk-x11-2.0
+ 
+ gfpoken_SOURCES = \
+ 	convert.c \
+

Added: packages/trunk/gfpoken/debian/patches/series
===================================================================
--- packages/trunk/gfpoken/debian/patches/series	                        (rev 0)
+++ packages/trunk/gfpoken/debian/patches/series	2010-09-27 06:53:31 UTC (rev 11385)
@@ -0,0 +1 @@
+fix-FTBFS-with-binutils-gold.patch

Modified: packages/trunk/gfpoken/debian/rules
===================================================================
--- packages/trunk/gfpoken/debian/rules	2010-09-27 06:23:20 UTC (rev 11384)
+++ packages/trunk/gfpoken/debian/rules	2010-09-27 06:53:31 UTC (rev 11385)
@@ -3,7 +3,7 @@
 CFLAGS ?= -g -Wall -Wextra
 
 %:
-	dh $@ --parallel
+	dh --parallel --with autoreconf $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- --bindir=/usr/games