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

[Scott Howard]

The following commit has been merged in the master branch:
commit f72cf494327225b79c94abbb9d84bb096b92beb2
Author: Scott Howard <showard314 at gmail.com>
Date:   Sat Mar 19 10:26:06 2011 -0400

    'shm_open@@GLIBC_2.3' is defined in DSO //lib/librt.so.1 so try adding it to the linker command line. (Closes: #618785)

diff --git a/debian/changelog b/debian/changelog
index 7b7b5a0..37efe39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sandboxgamemaker (2.6.1+dfsg-5) sid; urgency=low
+
+  * debian/patches/librt_linking.patch
+    - 'shm_open@@GLIBC_2.3' is defined in DSO //lib/librt.so.1 so try adding
+      it to the linker command line. (Closes: #618785)
+ 
+ -- Scott Howard <showard at debian.org>  Sat, 19 Mar 2011 10:23:50 -0400
+
 sandboxgamemaker (2.6.1+dfsg-4) unstable; urgency=low
 
   * debian/control, debian/compat updated for debhelper version 8
diff --git a/debian/patches/librt_linking.patch b/debian/patches/librt_linking.patch
new file mode 100644
index 0000000..24b01c3
--- /dev/null
+++ b/debian/patches/librt_linking.patch
@@ -0,0 +1,16 @@
+Description: 'shm_open@@GLIBC_2.3' is defined in DSO //lib/librt.so.1 so try
+ adding it to the linker command line
+Author: Scott Howard <showard at debian.org>
+Bug-Debian: http://bugs.debian.org/618785
+
+--- sandboxgamemaker-2.6.1+dfsg.orig/src/Makefile
++++ sandboxgamemaker-2.6.1+dfsg/src/Makefile
+@@ -24,7 +24,7 @@ CLIENT_INCLUDES= $(INCLUDES) -Iinclude
+ 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 -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
++CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11 -lrt
+ endif
+ ifeq ($(PLATFORM),Linux)
+ CLIENT_LIBS+= -lrt
diff --git a/debian/patches/series b/debian/patches/series
index 3b58e58..abbe437 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ debianizing_makefiles.patch
 linux_launcher.patch
 fix_ftbfs_bigendian.patch
 binutils-gold_X11.patch
+librt_linking.patch

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