[SCM] Packaging for sauerbraten game engine branch, master, updated. upstream/0.0.20090504.dfsg-24-gdd66996

[Bruno Kleinert]

The following commit has been merged in the master branch:
commit dd6699618f059e65a2352e44d289adce7773eeaa
Author: Bruno Kleinert <fuddl at tauware.de>
Date:   Wed Nov 18 13:07:38 2009 +0100

    Add 30-fix-indirect-linking-for-binutils-gold.diff
    
    Patch Makefile to add -lX11 to the linker flags. This solves indirect linking
    errors.
    
    FIXME/TODO Either the patch isn't complete or binutils-gold is broken: The
    -dbg package cannot be built because objcopy fails.

diff --git a/debian/changelog b/debian/changelog
index 6dff340..0d6a6e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ sauerbraten (0.0.20090504.dfsg-2) unstable; urgency=low
   [ Bruno "Fuddl" Kleinert ]
   * Drop code snippet in debian/rules to make parallel builds possible on SMP
     machines.
+  * Add 30-fix-indirect-linking-for-binutils-gold.diff. Link directly against
+    X11 so that ld as in binutils-gold is happy. Thanks to Peter Fritzsche for
+    reporting! (Closes: #556757)
 
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Wed, 09 Sep 2009 16:43:56 +0200
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Wed, 18 Nov 2009 13:02:17 +0100
 
 sauerbraten (0.0.20090504.dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/30-fix-indirect-linking-for-binutils-gold.diff b/debian/patches/30-fix-indirect-linking-for-binutils-gold.diff
new file mode 100644
index 0000000..c9d919c
--- /dev/null
+++ b/debian/patches/30-fix-indirect-linking-for-binutils-gold.diff
@@ -0,0 +1,13 @@
+Index: sauerbraten/Makefile
+===================================================================
+--- sauerbraten.orig/Makefile	2009-11-18 12:51:07.917729970 +0100
++++ sauerbraten/Makefile	2009-11-18 12:51:34.020735861 +0100
+@@ -19,7 +19,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 -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_LIBS= -Lenet -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 23399a9..f5cd2d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10-fix-clean-target.diff
 20-build-with-debug-symbols.diff
+30-fix-indirect-linking-for-binutils-gold.diff

-- 
Packaging for sauerbraten game engine