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

[Scott Howard]

The following commit has been merged in the master branch:
commit b158d9e0fe110121c4176a9f91bf945323f863d7
Author: Scott Howard <showard314 at gmail.com>
Date:   Thu Mar 10 22:30:22 2011 -0500

    switch to new Debian libenet package, dh 8, use .install instead of make install

diff --git a/debian/changelog b/debian/changelog
index 6338ef4..6179711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sandboxgamemaker (2.6.1+dfsg-4) UNRELEASED; urgency=low
+
+  * debian/control, debian/compat updated for debhelper version 8
+  * removed debian/patches/libenet_1.3_add.patch, use newly packaged
+    enet 1.3.1 in Debian
+  * use debian/sandboxgamemaker.install instead of src/Makefile's install
+    target
+
+ -- Scott Howard <showard at debian.org>  Thu, 10 Mar 2011 22:28:20 -0500
+
 sandboxgamemaker (2.6.1+dfsg-3) experimental; urgency=low
 
   * debian/patches/binutils-gold_X11.patch
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 277c1a9..9eb2447 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/games
 Priority: optional
 Maintainer: Scott Howard <showard314 at gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, libenet-dev, po-debconf, libwxgtk2.8-dev
+Build-Depends: debhelper (>= 8), libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, libenet-dev (>= 1.3.1-1), po-debconf, libwxgtk2.8-dev
 Standards-Version: 3.9.1
 Homepage: http://sandboxgamemaker.com/
 Vcs-Browser: http://git.debian.org/?p=pkg-games/sandboxgamemaker.git
diff --git a/debian/patches/binutils-gold_X11.patch b/debian/patches/binutils-gold_X11.patch
index bc352be..7bd3a47 100644
--- a/debian/patches/binutils-gold_X11.patch
+++ b/debian/patches/binutils-gold_X11.patch
@@ -4,14 +4,14 @@ 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
+--- sandboxgamemaker.orig/src/Makefile	2011-03-10 21:31:38.000000000 -0500
++++ sandboxgamemaker/src/Makefile	2011-03-10 21:33:18.769313598 -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
+-CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_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 a1e0f3e..3b58e58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 wx_launcher_paths.patch
 debianizing_makefiles.patch
 linux_launcher.patch
-libenet_1.3_add.patch
 fix_ftbfs_bigendian.patch
 binutils-gold_X11.patch
diff --git a/debian/rules b/debian/rules
index 5d37c09..9fdc174 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
 	dh $@
 
 override_dh_auto_build:
-	chmod +x src/enet/configure #for enet
-	-mkdir bin #for enet
 	$(MAKE) -C src
 	$(MAKE) -C src pasl
 
@@ -16,11 +14,6 @@ override_dh_auto_clean:
 	rm -rf bin
 	rm -f sandboxgamemaker_glauncher src/launch src/launcher/pasl.o src/launcher/paslapp.o
 	dh_auto_clean
-	
-override_dh_auto_install:
-	$(MAKE) -C src DESTDIR=$(CURDIR)/debian/sandboxgamemaker install
-
-
 
 ORIG_TARBALL=PlatinumArtsSandbox2.6.1Multiplatform.zip
 ORIG_DIRECTORY=PlatinumArtsSandbox2.6.1
diff --git a/debian/sandboxgamemaker.install b/debian/sandboxgamemaker.install
index 4cb0cc5..244aa95 100644
--- a/debian/sandboxgamemaker.install
+++ b/debian/sandboxgamemaker.install
@@ -3,3 +3,4 @@ debian/*.desktop /usr/share/applications/
 debian/sandboxgamemaker.xpm /usr/share/pixmaps
 sandbox_unix_usr /usr/games
 sandboxgamemaker_glauncher /usr/lib/sandboxgamemaker/
+src/sandbox_* /usr/lib/sandboxgamemaker/

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