r12194 - in packages/trunk/yabause/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2011-05-05 08:50:17 +0000 (Thu, 05 May 2011)
New Revision: 12194

Added:
   packages/trunk/yabause/debian/patches/01_link_with_pthread.patch
Modified:
   packages/trunk/yabause/debian/changelog
   packages/trunk/yabause/debian/control
   packages/trunk/yabause/debian/patches/series
   packages/trunk/yabause/debian/rules
Log:
Fix building with binutils-gold by linking pthread

 * patch by upstream
 * use dh_autoreconf to regenerate configure for that



Modified: packages/trunk/yabause/debian/changelog
===================================================================
--- packages/trunk/yabause/debian/changelog	2011-05-04 22:16:17 UTC (rev 12193)
+++ packages/trunk/yabause/debian/changelog	2011-05-05 08:50:17 UTC (rev 12194)
@@ -3,8 +3,13 @@
   * debian/control:
     + Really remove DM-Upload-allowed.
     + Section: otherosfs as suggested by the ftp-masters.
+    + Add dh-autoreconf build-dep.
+  * Add 01_link_with_pthread.patch to fix FTBFS with binutils-gold.
+    Closes: #556767
+  * debian/rules:
+    + Call dh_autoreconf(_clean) where needed.
 
- -- Evgeni Golov <evgeni at debian.org>  Thu, 04 Jun 2009 12:17:01 +0200
+ -- Evgeni Golov <evgeni at debian.org>  Thu, 05 May 2011 10:48:25 +0200
 
 yabause (0.9.10-1) unstable; urgency=low
 

Modified: packages/trunk/yabause/debian/control
===================================================================
--- packages/trunk/yabause/debian/control	2011-05-04 22:16:17 UTC (rev 12193)
+++ packages/trunk/yabause/debian/control	2011-05-05 08:50:17 UTC (rev 12194)
@@ -6,7 +6,8 @@
 Build-Depends: debhelper (>= 7), autotools-dev, pkg-config, quilt (>= 0.40),
  libgl1-mesa-dev | libgl-dev, freeglut3-dev | libglut-dev, libglu1-mesa-dev | libglu-dev,
  libsdl1.2-dev, libglib2.0-dev, libgtk2.0-dev, libgtkglext1-dev,
- libqt4-dev, libqt4-opengl-dev, libmini18n-dev, libopenal-dev
+ libqt4-dev, libqt4-opengl-dev, libmini18n-dev, libopenal-dev,
+ dh-autoreconf
 Standards-Version: 3.8.1
 Homepage: http://yabause.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/yabause/

Added: packages/trunk/yabause/debian/patches/01_link_with_pthread.patch
===================================================================
--- packages/trunk/yabause/debian/patches/01_link_with_pthread.patch	                        (rev 0)
+++ packages/trunk/yabause/debian/patches/01_link_with_pthread.patch	2011-05-05 08:50:17 UTC (rev 12194)
@@ -0,0 +1,24 @@
+From: Guillaume Duhamel <guillaume.duhamel at gmail.com>
+Subject: Fix building with binutils-gold by linking pthread
+Origin: upstream, http://yabause.svn.sourceforge.net/viewvc/yabause/branches/branch_0_9_10/yabause/configure.in?view=patch&r1=2055&r2=2441&pathrev=2441
+Bug-Debian: http://bugs.debian.org/556767
+
+--- yabause/configure.in	2009/05/18 03:55:53	2055
++++ yabause/configure.in	2009/11/18 23:57:34	2441
+@@ -185,7 +185,7 @@
+ 
+ # checking for OpenAL (can be used for sound)
+ use_openal=yes
+-AC_ARG_WITH(openal, AC_HELP_STRING(--without-openal, don't use OpenAL), [use_openal=$withval])
++AC_ARG_WITH(openal, AC_HELP_STRING(--without-openal, "don't use OpenAL"), [use_openal=$withval])
+ 
+ if test x$use_openal = xyes ; then
+ 	case $host in
+@@ -198,6 +198,7 @@
+ 			# won't work right now.
+ 			;;
+ 		*)
++			AC_CHECK_LIB(pthread, main)
+ 			AC_CHECK_LIB(openal, alBufferData, [
+ 				LIBS="$LIBS -lopenal"
+ 				AC_DEFINE(HAVE_LIBAL)

Modified: packages/trunk/yabause/debian/patches/series
===================================================================
--- packages/trunk/yabause/debian/patches/series	2011-05-04 22:16:17 UTC (rev 12193)
+++ packages/trunk/yabause/debian/patches/series	2011-05-05 08:50:17 UTC (rev 12194)
@@ -1 +1 @@
-#
+01_link_with_pthread.patch

Modified: packages/trunk/yabause/debian/rules
===================================================================
--- packages/trunk/yabause/debian/rules	2011-05-04 22:16:17 UTC (rev 12193)
+++ packages/trunk/yabause/debian/rules	2011-05-05 08:50:17 UTC (rev 12194)
@@ -27,6 +27,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
+	dh_autoreconf
 	touch $@
 
 build-%/config-stamp: config-common
@@ -51,6 +52,7 @@
 
 	$(RM) -r build-gtk build-qt
 
+	dh_autoreconf_clean
 	dh_clean config-common config.sub config.guess
 
 install: build