[SCM] Standalone 3D Game Maker and 3D Game Design program branch, master, updated. debian/2.6.1+dfsg-2-1-gabb0068

[Scott Howard]

The following commit has been merged in the master branch:
commit abb00683aa7f89221addca0055ea3ea0fb7f947a
Author: Scott Howard <showard314 at gmail.com>
Date:   Sun Nov 21 11:28:47 2010 -0500

    Fix a FTBFS with binutils-gold not implicitly linking to X11 (see LP bug 677934)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
index fe485b4..6338ef4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sandboxgamemaker (2.6.1+dfsg-3) experimental; urgency=low
+
+  * debian/patches/binutils-gold_X11.patch
+    - Fix a FTBFS with binutils-gold not implicitly linking to X11
+      (see LP bug 677934) Thanks to Artur Rona.
+
+ -- Scott Howard <showard314 at gmail.com>  Sun, 21 Nov 2010 11:26:10 -0500
+
 sandboxgamemaker (2.6.1+dfsg-2) experimental; urgency=low
 
   * debian/patches/fix_ftbfs_bigendian.patch
diff --git a/debian/patches/binutils-gold_X11.patch b/debian/patches/binutils-gold_X11.patch
new file mode 100644
index 0000000..bc352be
--- /dev/null
+++ b/debian/patches/binutils-gold_X11.patch
@@ -0,0 +1,17 @@
+Description: /usr/bin/ld: note: 'XFree' is defined in DSO /usr/lib/libX11.so.6 so try adding it to the linker command line
+Author: Scott Howard <showard314 at gmail.com>
+Bug: https://bugs.launchpad.net/bugs/677934
+
+Index: sandboxgamemaker/src/Makefile
+===================================================================
+--- sandboxgamemaker.orig/src/Makefile	2010-11-21 11:09:18.476962618 -0500
++++ sandboxgamemaker/src/Makefile	2010-11-21 11:09:41.155538442 -0500
+@@ -24,7 +24,7 @@
+ CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
+ else
+ CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
+-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
+ endif
+ ifeq ($(PLATFORM),Linux)
+ CLIENT_LIBS+= -lrt
diff --git a/debian/patches/series b/debian/patches/series
index 5de4ba6..a1e0f3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ debianizing_makefiles.patch
 linux_launcher.patch
 libenet_1.3_add.patch
 fix_ftbfs_bigendian.patch
+binutils-gold_X11.patch

-- 
Standalone 3D Game Maker and 3D Game Design program