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

Scott Howard showard314 at gmail.com
Mon Nov 8 15:00:46 UTC 2010


The following commit has been merged in the master branch:
commit 4e4ab1ed78823eac9327191b3d9fc27e3650bac3
Author: Scott Howard <showard314 at gmail.com>
Date:   Mon Nov 8 10:00:03 2010 -0500

    Refreshed all patches, Removed spelling_errors.patch and build_fix_bendian.patch (accepted
      upstream)

diff --git a/debian/changelog b/debian/changelog
index 1f93d81..77366e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 sandboxgamemaker (2.6.1+dfsg-1) experimental; urgency=low
 
   * New upstream release.
+  * Refreshed all patches.
+  * Removed spelling_errors.patch and build_fix_bendian.patch (accepted
+    upstream)
 
- -- Scott Howard <showard314 at gmail.com>  Mon, 08 Nov 2010 08:55:03 -0500
+ -- Scott Howard <showard314 at gmail.com>  Mon, 08 Nov 2010 09:58:16 -0500
 
 sandboxgamemaker (2.6+dfsg-2) experimental; urgency=low
 
diff --git a/debian/patches/debianizing_makefiles.patch b/debian/patches/debianizing_makefiles.patch
index 80be189..caa6fe6 100644
--- a/debian/patches/debianizing_makefiles.patch
+++ b/debian/patches/debianizing_makefiles.patch
@@ -3,8 +3,8 @@ Description: Patch to use a shared enet library, generate binaries without 32 or
 Author: Scott Howard <showard314 at gmail.com>
 Index: sandboxgamemaker/src/Makefile
 ===================================================================
---- sandboxgamemaker.orig/src/Makefile	2010-10-09 09:45:22.304456370 -0400
-+++ sandboxgamemaker/src/Makefile	2010-10-09 09:45:23.554372552 -0400
+--- sandboxgamemaker.orig/src/Makefile	2010-11-08 09:56:08.851379211 -0500
++++ sandboxgamemaker/src/Makefile	2010-11-08 09:56:15.011009700 -0500
 @@ -7,7 +7,7 @@
  PLATFORM= $(shell uname -s)
  PLATFORM_PREFIX=sandbox
@@ -23,7 +23,7 @@ Index: sandboxgamemaker/src/Makefile
  endif
  ifeq ($(PLATFORM),Linux)
  CLIENT_LIBS+= -lrt
-@@ -174,7 +174,7 @@
+@@ -175,7 +175,7 @@
  SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
  else
  SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
@@ -32,7 +32,7 @@ Index: sandboxgamemaker/src/Makefile
  endif
  
  SERVER_OBJS= \
-@@ -219,15 +219,6 @@
+@@ -220,15 +220,6 @@
  
  all: client server
  
@@ -48,7 +48,7 @@ Index: sandboxgamemaker/src/Makefile
  clean:
  	-$(RM) $(SERVER_OBJS) $(FPSSERVER_OBJS) $(MOVIESERVER_OBJS) $(CLIENT_PCH) $(CLIENT_OBJS) $(SSPCLIENT_OBJS) $(RPGCLIENT_OBJS) $(FPSCLIENT_OBJS) $(MOVIECLIENT_OBJS) $(KRSCLIENT_OBJS) $(PZLCLIENT_OBJS) $(LAUNCHER_OBJS) $(MASTER_OBJS) $(PLATFORM_PREFIX)_server_* $(PLATFORM_PREFIX)_client_*
  
-@@ -316,40 +307,41 @@
+@@ -317,40 +308,41 @@
  install: all
  else
  
diff --git a/debian/patches/libenet_1.3_add.patch b/debian/patches/libenet_1.3_add.patch
index 59ccf51..6922b4a 100644
--- a/debian/patches/libenet_1.3_add.patch
+++ b/debian/patches/libenet_1.3_add.patch
@@ -4,7 +4,7 @@ Author: Scott Howard <showard314 at gmail.com>
 Index: sandboxgamemaker/src/enet/ChangeLog
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/ChangeLog	2010-10-16 13:03:36.952508390 -0400
++++ sandboxgamemaker/src/enet/ChangeLog	2010-11-08 09:56:24.370448249 -0500
 @@ -0,0 +1,86 @@
 +ENet 1.3.0 (June 5, 2010):
 +
@@ -95,7 +95,7 @@ Index: sandboxgamemaker/src/enet/ChangeLog
 Index: sandboxgamemaker/src/enet/Doxyfile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/Doxyfile	2010-10-16 13:03:36.952508390 -0400
++++ sandboxgamemaker/src/enet/Doxyfile	2010-11-08 09:56:24.380447649 -0500
 @@ -0,0 +1,993 @@
 +# Doxyfile 1.2.18
 +
@@ -1093,7 +1093,7 @@ Index: sandboxgamemaker/src/enet/Doxyfile
 Index: sandboxgamemaker/src/enet/LICENSE
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/LICENSE	2010-10-16 13:03:36.952508390 -0400
++++ sandboxgamemaker/src/enet/LICENSE	2010-11-08 09:56:24.380447649 -0500
 @@ -0,0 +1,7 @@
 +Copyright (c) 2002-2009 Lee Salzman
 +
@@ -1105,7 +1105,7 @@ Index: sandboxgamemaker/src/enet/LICENSE
 Index: sandboxgamemaker/src/enet/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/Makefile.am	2010-10-16 13:03:36.962507763 -0400
++++ sandboxgamemaker/src/enet/Makefile.am	2010-11-08 09:56:24.380447649 -0500
 @@ -0,0 +1,22 @@
 +pkgconfigdir = $(libdir)/pkgconfig
 +nodist_pkgconfig_DATA = libenet.pc
@@ -1132,7 +1132,7 @@ Index: sandboxgamemaker/src/enet/Makefile.am
 Index: sandboxgamemaker/src/enet/Makefile.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/Makefile.in	2010-10-16 13:03:36.962507763 -0400
++++ sandboxgamemaker/src/enet/Makefile.in	2010-11-08 09:56:24.380447649 -0500
 @@ -0,0 +1,739 @@
 +# Makefile.in generated by automake 1.11 from Makefile.am.
 +# @configure_input@
@@ -1876,7 +1876,7 @@ Index: sandboxgamemaker/src/enet/Makefile.in
 Index: sandboxgamemaker/src/enet/README
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/README	2010-10-16 13:03:36.962507763 -0400
++++ sandboxgamemaker/src/enet/README	2010-11-08 09:56:24.380447649 -0500
 @@ -0,0 +1,15 @@
 +Please visit the ENet homepage at http://enet.bespin.org for installation
 +and usage instructions.
@@ -1896,7 +1896,7 @@ Index: sandboxgamemaker/src/enet/README
 Index: sandboxgamemaker/src/enet/aclocal.m4
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/aclocal.m4	2010-10-16 13:03:36.962507763 -0400
++++ sandboxgamemaker/src/enet/aclocal.m4	2010-11-08 09:56:24.380447649 -0500
 @@ -0,0 +1,996 @@
 +# generated automatically by aclocal 1.11 -*- Autoconf -*-
 +
@@ -2897,7 +2897,7 @@ Index: sandboxgamemaker/src/enet/aclocal.m4
 Index: sandboxgamemaker/src/enet/callbacks.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/callbacks.c	2010-10-16 13:03:36.962507763 -0400
++++ sandboxgamemaker/src/enet/callbacks.c	2010-11-08 09:56:24.380447649 -0500
 @@ -0,0 +1,47 @@
 +/** 
 + @file callbacks.c
@@ -2949,7 +2949,7 @@ Index: sandboxgamemaker/src/enet/callbacks.c
 Index: sandboxgamemaker/src/enet/compress.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/compress.c	2010-10-16 13:03:36.962507763 -0400
++++ sandboxgamemaker/src/enet/compress.c	2010-11-08 09:56:24.380447649 -0500
 @@ -0,0 +1,654 @@
 +/** 
 + @file compress.c
@@ -3608,7 +3608,7 @@ Index: sandboxgamemaker/src/enet/compress.c
 Index: sandboxgamemaker/src/enet/config.guess
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/config.guess	2010-10-16 13:03:36.962507763 -0400
++++ sandboxgamemaker/src/enet/config.guess	2010-11-08 09:56:24.380447649 -0500
 @@ -0,0 +1,1533 @@
 +#! /bin/sh
 +# Attempt to guess a canonical system name.
@@ -5146,7 +5146,7 @@ Index: sandboxgamemaker/src/enet/config.guess
 Index: sandboxgamemaker/src/enet/config.sub
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/config.sub	2010-10-16 13:03:36.962507763 -0400
++++ sandboxgamemaker/src/enet/config.sub	2010-11-08 09:56:24.380447649 -0500
 @@ -0,0 +1,1693 @@
 +#! /bin/sh
 +# Configuration validation subroutine script.
@@ -6844,7 +6844,7 @@ Index: sandboxgamemaker/src/enet/config.sub
 Index: sandboxgamemaker/src/enet/configure
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/configure	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/configure	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,12738 @@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
@@ -19587,7 +19587,7 @@ Index: sandboxgamemaker/src/enet/configure
 Index: sandboxgamemaker/src/enet/configure.ac
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/configure.ac	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/configure.ac	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,41 @@
 +AC_INIT([libenet], [1.2.2])
 +AC_CONFIG_SRCDIR([include/enet/enet.h])
@@ -19633,7 +19633,7 @@ Index: sandboxgamemaker/src/enet/configure.ac
 Index: sandboxgamemaker/src/enet/configure.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/configure.in	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/configure.in	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,36 @@
 +AC_INIT(libenet, 9-15-2008)
 +AM_INIT_AUTOMAKE(libenet.a, 9-15-2008)
@@ -19674,7 +19674,7 @@ Index: sandboxgamemaker/src/enet/configure.in
 Index: sandboxgamemaker/src/enet/depcomp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/depcomp	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/depcomp	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,630 @@
 +#! /bin/sh
 +# depcomp - compile a program generating dependencies as side-effects
@@ -20309,7 +20309,7 @@ Index: sandboxgamemaker/src/enet/depcomp
 Index: sandboxgamemaker/src/enet/design.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/design.txt	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/design.txt	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,117 @@
 +* Why ENet?
 +
@@ -20431,7 +20431,7 @@ Index: sandboxgamemaker/src/enet/design.txt
 Index: sandboxgamemaker/src/enet/docs/FAQ.dox
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/docs/FAQ.dox	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/docs/FAQ.dox	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,24 @@
 +/**
 + @page FAQ Frequently Answered Questions
@@ -20460,7 +20460,7 @@ Index: sandboxgamemaker/src/enet/docs/FAQ.dox
 Index: sandboxgamemaker/src/enet/docs/design.dox
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/docs/design.dox	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/docs/design.dox	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,126 @@
 +/**
 + at page Features Features and Architecture
@@ -20591,7 +20591,7 @@ Index: sandboxgamemaker/src/enet/docs/design.dox
 Index: sandboxgamemaker/src/enet/docs/install.dox
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/docs/install.dox	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/docs/install.dox	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,60 @@
 +/**
 + at page Installation Installation
@@ -20656,7 +20656,7 @@ Index: sandboxgamemaker/src/enet/docs/install.dox
 Index: sandboxgamemaker/src/enet/docs/license.dox
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/docs/license.dox	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/docs/license.dox	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,26 @@
 +/**
 + @page License License
@@ -20687,7 +20687,7 @@ Index: sandboxgamemaker/src/enet/docs/license.dox
 Index: sandboxgamemaker/src/enet/docs/mainpage.dox
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/docs/mainpage.dox	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/docs/mainpage.dox	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,75 @@
 +/** @mainpage enet
 + <center>http://enet.bespin.org</center>
@@ -20767,7 +20767,7 @@ Index: sandboxgamemaker/src/enet/docs/mainpage.dox
 Index: sandboxgamemaker/src/enet/docs/tutorial.dox
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/docs/tutorial.dox	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/docs/tutorial.dox	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,357 @@
 +/**
 + at page Tutorial Tutorial
@@ -21129,7 +21129,7 @@ Index: sandboxgamemaker/src/enet/docs/tutorial.dox
 Index: sandboxgamemaker/src/enet/enet.dsp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/enet.dsp	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/enet.dsp	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,164 @@
 +# Microsoft Developer Studio Project File - Name="enet" - Package Owner=<4>
 +# Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -21298,7 +21298,7 @@ Index: sandboxgamemaker/src/enet/enet.dsp
 Index: sandboxgamemaker/src/enet/enet_dll.cbp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/enet_dll.cbp	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/enet_dll.cbp	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,86 @@
 +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 +<CodeBlocks_project_file>
@@ -21389,7 +21389,7 @@ Index: sandboxgamemaker/src/enet/enet_dll.cbp
 Index: sandboxgamemaker/src/enet/host.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/host.c	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/host.c	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,479 @@
 +/** 
 + @file host.c
@@ -21873,13 +21873,13 @@ Index: sandboxgamemaker/src/enet/host.c
 Index: sandboxgamemaker/src/enet/include/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/Makefile.am	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/Makefile.am	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1 @@
 +SUBDIRS = enet
 Index: sandboxgamemaker/src/enet/include/Makefile.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/Makefile.in	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/Makefile.in	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,448 @@
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# @configure_input@
@@ -22332,7 +22332,7 @@ Index: sandboxgamemaker/src/enet/include/Makefile.in
 Index: sandboxgamemaker/src/enet/include/enet/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/Makefile.am	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/Makefile.am	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,12 @@
 +libenetincludedir = $(includedir)/enet
 +libenetinclude_HEADERS = \
@@ -22349,7 +22349,7 @@ Index: sandboxgamemaker/src/enet/include/enet/Makefile.am
 Index: sandboxgamemaker/src/enet/include/enet/Makefile.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/Makefile.in	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/Makefile.in	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,377 @@
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# @configure_input@
@@ -22731,7 +22731,7 @@ Index: sandboxgamemaker/src/enet/include/enet/Makefile.in
 Index: sandboxgamemaker/src/enet/include/enet/callbacks.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/callbacks.h	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/callbacks.h	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,27 @@
 +/** 
 + @file  callbacks.h
@@ -22763,7 +22763,7 @@ Index: sandboxgamemaker/src/enet/include/enet/callbacks.h
 Index: sandboxgamemaker/src/enet/include/enet/enet.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/enet.h	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/enet.h	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,540 @@
 +/** 
 + @file  enet.h
@@ -23308,7 +23308,7 @@ Index: sandboxgamemaker/src/enet/include/enet/enet.h
 Index: sandboxgamemaker/src/enet/include/enet/list.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/list.h	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/list.h	2010-11-08 09:56:24.400446451 -0500
 @@ -0,0 +1,43 @@
 +/** 
 + @file  list.h
@@ -23356,7 +23356,7 @@ Index: sandboxgamemaker/src/enet/include/enet/list.h
 Index: sandboxgamemaker/src/enet/include/enet/protocol.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/protocol.h	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/protocol.h	2010-11-08 09:56:24.410445852 -0500
 @@ -0,0 +1,196 @@
 +/** 
 + @file  protocol.h
@@ -23557,7 +23557,7 @@ Index: sandboxgamemaker/src/enet/include/enet/protocol.h
 Index: sandboxgamemaker/src/enet/include/enet/time.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/time.h	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/time.h	2010-11-08 09:56:24.410445852 -0500
 @@ -0,0 +1,18 @@
 +/** 
 + @file  time.h
@@ -23580,7 +23580,7 @@ Index: sandboxgamemaker/src/enet/include/enet/time.h
 Index: sandboxgamemaker/src/enet/include/enet/types.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/types.h	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/types.h	2010-11-08 09:56:24.410445852 -0500
 @@ -0,0 +1,13 @@
 +/** 
 + @file  types.h
@@ -23598,7 +23598,7 @@ Index: sandboxgamemaker/src/enet/include/enet/types.h
 Index: sandboxgamemaker/src/enet/include/enet/unix.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/unix.h	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/unix.h	2010-11-08 09:56:24.410445852 -0500
 @@ -0,0 +1,45 @@
 +/** 
 + @file  unix.h
@@ -23648,7 +23648,7 @@ Index: sandboxgamemaker/src/enet/include/enet/unix.h
 Index: sandboxgamemaker/src/enet/include/enet/utility.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/utility.h	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/utility.h	2010-11-08 09:56:24.410445852 -0500
 @@ -0,0 +1,12 @@
 +/** 
 + @file  utility.h
@@ -23665,7 +23665,7 @@ Index: sandboxgamemaker/src/enet/include/enet/utility.h
 Index: sandboxgamemaker/src/enet/include/enet/win32.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/include/enet/win32.h	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/include/enet/win32.h	2010-11-08 09:56:24.410445852 -0500
 @@ -0,0 +1,58 @@
 +/** 
 + @file  win32.h
@@ -23728,7 +23728,7 @@ Index: sandboxgamemaker/src/enet/include/enet/win32.h
 Index: sandboxgamemaker/src/enet/install-sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/install-sh	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/install-sh	2010-11-08 09:56:24.410445852 -0500
 @@ -0,0 +1,520 @@
 +#!/bin/sh
 +# install - install a program, script, or datafile
@@ -24253,7 +24253,7 @@ Index: sandboxgamemaker/src/enet/install-sh
 Index: sandboxgamemaker/src/enet/libenet.pc.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/libenet.pc.in	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/libenet.pc.in	2010-11-08 09:56:24.410445852 -0500
 @@ -0,0 +1,10 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -24268,7 +24268,7 @@ Index: sandboxgamemaker/src/enet/libenet.pc.in
 Index: sandboxgamemaker/src/enet/list.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/list.c	2010-10-16 13:03:36.982506509 -0400
++++ sandboxgamemaker/src/enet/list.c	2010-11-08 09:56:24.410445852 -0500
 @@ -0,0 +1,75 @@
 +/** 
 + @file list.c
@@ -24348,7 +24348,7 @@ Index: sandboxgamemaker/src/enet/list.c
 Index: sandboxgamemaker/src/enet/ltmain.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/ltmain.sh	2010-10-16 13:03:36.992505882 -0400
++++ sandboxgamemaker/src/enet/ltmain.sh	2010-11-08 09:56:24.420445252 -0500
 @@ -0,0 +1,8413 @@
 +# Generated from ltmain.m4sh.
 +
@@ -32766,7 +32766,7 @@ Index: sandboxgamemaker/src/enet/ltmain.sh
 Index: sandboxgamemaker/src/enet/m4/libtool.m4
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/m4/libtool.m4	2010-10-16 13:03:37.002505255 -0400
++++ sandboxgamemaker/src/enet/m4/libtool.m4	2010-11-08 09:56:24.420445252 -0500
 @@ -0,0 +1,7377 @@
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +#
@@ -40148,7 +40148,7 @@ Index: sandboxgamemaker/src/enet/m4/libtool.m4
 Index: sandboxgamemaker/src/enet/m4/ltoptions.m4
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/m4/ltoptions.m4	2010-10-16 13:03:37.002505255 -0400
++++ sandboxgamemaker/src/enet/m4/ltoptions.m4	2010-11-08 09:56:24.420445252 -0500
 @@ -0,0 +1,368 @@
 +# Helper functions for option handling.                    -*- Autoconf -*-
 +#
@@ -40521,7 +40521,7 @@ Index: sandboxgamemaker/src/enet/m4/ltoptions.m4
 Index: sandboxgamemaker/src/enet/m4/ltsugar.m4
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/m4/ltsugar.m4	2010-10-16 13:03:37.002505255 -0400
++++ sandboxgamemaker/src/enet/m4/ltsugar.m4	2010-11-08 09:56:24.420445252 -0500
 @@ -0,0 +1,123 @@
 +# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 +#
@@ -40649,7 +40649,7 @@ Index: sandboxgamemaker/src/enet/m4/ltsugar.m4
 Index: sandboxgamemaker/src/enet/m4/ltversion.m4
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/m4/ltversion.m4	2010-10-16 13:03:37.002505255 -0400
++++ sandboxgamemaker/src/enet/m4/ltversion.m4	2010-11-08 09:56:24.420445252 -0500
 @@ -0,0 +1,23 @@
 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
@@ -40677,7 +40677,7 @@ Index: sandboxgamemaker/src/enet/m4/ltversion.m4
 Index: sandboxgamemaker/src/enet/m4/lt~obsolete.m4
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/m4/lt~obsolete.m4	2010-10-16 13:03:37.002505255 -0400
++++ sandboxgamemaker/src/enet/m4/lt~obsolete.m4	2010-11-08 09:56:24.430444652 -0500
 @@ -0,0 +1,92 @@
 +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 +#
@@ -40774,7 +40774,7 @@ Index: sandboxgamemaker/src/enet/m4/lt~obsolete.m4
 Index: sandboxgamemaker/src/enet/missing
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/missing	2010-10-16 13:03:37.002505255 -0400
++++ sandboxgamemaker/src/enet/missing	2010-11-08 09:56:24.430444652 -0500
 @@ -0,0 +1,376 @@
 +#! /bin/sh
 +# Common stub for a few missing GNU programs while installing.
@@ -41155,7 +41155,7 @@ Index: sandboxgamemaker/src/enet/missing
 Index: sandboxgamemaker/src/enet/mkinstalldirs
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/mkinstalldirs	2010-10-16 13:03:37.002505255 -0400
++++ sandboxgamemaker/src/enet/mkinstalldirs	2010-11-08 09:56:24.430444652 -0500
 @@ -0,0 +1,40 @@
 +#! /bin/sh
 +# mkinstalldirs --- make directory hierarchy
@@ -41200,7 +41200,7 @@ Index: sandboxgamemaker/src/enet/mkinstalldirs
 Index: sandboxgamemaker/src/enet/packet.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/packet.c	2010-10-16 13:03:37.002505255 -0400
++++ sandboxgamemaker/src/enet/packet.c	2010-11-08 09:56:24.430444652 -0500
 @@ -0,0 +1,157 @@
 +/** 
 + @file  packet.c
@@ -41362,7 +41362,7 @@ Index: sandboxgamemaker/src/enet/packet.c
 Index: sandboxgamemaker/src/enet/peer.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/peer.c	2010-10-16 13:03:37.012504628 -0400
++++ sandboxgamemaker/src/enet/peer.c	2010-11-08 09:56:24.430444652 -0500
 @@ -0,0 +1,816 @@
 +/** 
 + @file  peer.c
@@ -42183,7 +42183,7 @@ Index: sandboxgamemaker/src/enet/peer.c
 Index: sandboxgamemaker/src/enet/protocol.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/protocol.c	2010-10-16 13:03:37.012504628 -0400
++++ sandboxgamemaker/src/enet/protocol.c	2010-11-08 09:56:24.430444652 -0500
 @@ -0,0 +1,1671 @@
 +/** 
 + @file  protocol.c
@@ -43859,7 +43859,7 @@ Index: sandboxgamemaker/src/enet/protocol.c
 Index: sandboxgamemaker/src/enet/unix.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/unix.c	2010-10-16 13:03:37.012504628 -0400
++++ sandboxgamemaker/src/enet/unix.c	2010-11-08 09:56:24.430444652 -0500
 @@ -0,0 +1,438 @@
 +/** 
 + @file  unix.c
@@ -44302,7 +44302,7 @@ Index: sandboxgamemaker/src/enet/unix.c
 Index: sandboxgamemaker/src/enet/win32.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sandboxgamemaker/src/enet/win32.c	2010-10-16 13:03:37.012504628 -0400
++++ sandboxgamemaker/src/enet/win32.c	2010-11-08 09:56:24.430444652 -0500
 @@ -0,0 +1,348 @@
 +/** 
 + @file  win32.c
@@ -44654,8 +44654,8 @@ Index: sandboxgamemaker/src/enet/win32.c
 +
 Index: sandboxgamemaker/src/Makefile
 ===================================================================
---- sandboxgamemaker.orig/src/Makefile	2010-10-16 13:03:31.262865067 -0400
-+++ sandboxgamemaker/src/Makefile	2010-10-16 13:03:37.012504628 -0400
+--- sandboxgamemaker.orig/src/Makefile	2010-11-08 09:56:15.011009700 -0500
++++ sandboxgamemaker/src/Makefile	2010-11-08 09:56:24.430444652 -0500
 @@ -7,7 +7,7 @@
  PLATFORM= $(shell uname -s)
  PLATFORM_PREFIX=sandbox
@@ -44674,7 +44674,7 @@ Index: sandboxgamemaker/src/Makefile
  endif
  ifeq ($(PLATFORM),Linux)
  CLIENT_LIBS+= -lrt
-@@ -174,7 +174,7 @@
+@@ -175,7 +175,7 @@
  SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
  else
  SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
@@ -44683,7 +44683,7 @@ Index: sandboxgamemaker/src/Makefile
  endif
  
  SERVER_OBJS= \
-@@ -219,6 +219,15 @@
+@@ -220,6 +220,15 @@
  
  all: client server
  
@@ -44699,7 +44699,7 @@ Index: sandboxgamemaker/src/Makefile
  clean:
  	-$(RM) $(SERVER_OBJS) $(FPSSERVER_OBJS) $(MOVIESERVER_OBJS) $(CLIENT_PCH) $(CLIENT_OBJS) $(SSPCLIENT_OBJS) $(RPGCLIENT_OBJS) $(FPSCLIENT_OBJS) $(MOVIECLIENT_OBJS) $(KRSCLIENT_OBJS) $(PZLCLIENT_OBJS) $(LAUNCHER_OBJS) $(MASTER_OBJS) $(PLATFORM_PREFIX)_server_* $(PLATFORM_PREFIX)_client_*
  
-@@ -307,31 +316,31 @@
+@@ -308,31 +317,31 @@
  install: all
  else
  
diff --git a/debian/patches/linux_launcher.patch b/debian/patches/linux_launcher.patch
index 79a17be..3f21018 100644
--- a/debian/patches/linux_launcher.patch
+++ b/debian/patches/linux_launcher.patch
@@ -2,8 +2,8 @@ Description: Takes new sandbox_unix_usr script from upstream
 Author: Scott Howard <showard314 at gmail.com>
 Index: sandboxgamemaker/sandbox_unix_usr
 ===================================================================
---- sandboxgamemaker.orig/sandbox_unix_usr	2010-10-09 12:26:45.901017249 -0400
-+++ sandboxgamemaker/sandbox_unix_usr	2010-10-09 12:28:05.394605052 -0400
+--- sandboxgamemaker.orig/sandbox_unix_usr	2010-11-08 09:30:03.000000000 -0500
++++ sandboxgamemaker/sandbox_unix_usr	2010-11-08 09:40:27.590268368 -0500
 @@ -2,7 +2,7 @@
  # SANDBOX_DIR should refer to the directory in which sandbox is placed.
  #SANDBOX_DIR=~/sandbox
@@ -21,7 +21,7 @@ Index: sandboxgamemaker/sandbox_unix_usr
  			echo "  --server		launch dedicated server binary instead"
  			echo "  --master		launch a masterserver for server registration"
  			echo "					compiled masterserver not included"
-@@ -90,6 +91,9 @@
+@@ -86,6 +87,9 @@
  			"master")
  				SANDBOX_TYPE="master"
  			;;
@@ -31,7 +31,7 @@ Index: sandboxgamemaker/sandbox_unix_usr
  			"debug")
  				SANDBOX_PREFIX="debug"
  				SANDBOX_EXEC="gdb --args"
-@@ -104,22 +108,13 @@
+@@ -100,22 +104,13 @@
  	shift
  done
  
@@ -55,15 +55,15 @@ Index: sandboxgamemaker/sandbox_unix_usr
  	echo "install the sdl, sdl-image and sdl-mixer DEVELOPMENT libraries and use \"sudo make -C ${SANDBOX_DIR}/src install\" to compile a binary"
  	echo ""
  	exit 1
-@@ -129,25 +124,33 @@
+@@ -125,25 +120,33 @@
  cd ${SANDBOX_DIR}
  case ${SANDBOX_TYPE} in
  	"client")
 -		if [ -a bin/sandbox_client_${MACHINE_BIT}_${SANDBOX_MODULE} ]
 +		if [ -a /usr/lib/sandboxgamemaker/sandbox_client_${SANDBOX_MODULE} ]
  		then
--			${SANDBOX_EXEC} ./bin/${SANDBOX_PREFIX}_client_${MACHINE_BIT}_${SANDBOX_MODULE} -q${SANDBOX_HOME} -r ${SANDBOX_OPTIONS}
-+			${SANDBOX_EXEC} /usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_client_${SANDBOX_MODULE} -q${SANDBOX_HOME} -r ${SANDBOX_OPTIONS}
+-			eval ${SANDBOX_EXEC} ./bin/${SANDBOX_PREFIX}_client_${MACHINE_BIT}_${SANDBOX_MODULE} -q${SANDBOX_HOME} -r ${SANDBOX_OPTIONS}
++			eval ${SANDBOX_EXEC} /usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_client_${SANDBOX_MODULE} -q${SANDBOX_HOME} -r ${SANDBOX_OPTIONS}
  		else
  			failed
  		fi
@@ -72,8 +72,8 @@ Index: sandboxgamemaker/sandbox_unix_usr
 -		if [ -a bin/sandbox_server_${MACHINE_BIT}_${SANDBOX_MODULE} ]
 +		if [ -a /usr/lib/sandboxgamemaker/sandbox_server_${SANDBOX_MODULE} ]
  		then
--			${SANDBOX_EXEC} ./bin/${SANDBOX_PREFIX}_server_${MACHINE_BIT}_${SANDBOX_MODULE}  -q${SANDBOX_HOME} ${SANDBOX_OPTIONS}
-+			${SANDBOX_EXEC} /usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_server_${SANDBOX_MODULE}  -q${SANDBOX_HOME} ${SANDBOX_OPTIONS}
+-			eval ${SANDBOX_EXEC} ./bin/${SANDBOX_PREFIX}_server_${MACHINE_BIT}_${SANDBOX_MODULE}  -q${SANDBOX_HOME} ${SANDBOX_OPTIONS}
++			eval ${SANDBOX_EXEC} /usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_server_${SANDBOX_MODULE}  -q${SANDBOX_HOME} ${SANDBOX_OPTIONS}
  		else
  			failed
  		fi
@@ -82,7 +82,7 @@ Index: sandboxgamemaker/sandbox_unix_usr
 -		if [ -a bin/sandbox_master ]
 +		if [ -a /usr/lib/sandboxgamemaker/sandbox_master ]
 +		then
-+			${SANDBOX_EXEC} /usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_master
++			eval ${SANDBOX_EXEC} /usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_master
 +		else
 +			failed
 +		fi
@@ -90,8 +90,8 @@ Index: sandboxgamemaker/sandbox_unix_usr
 +	"launcher")
 +		if [ -a /usr/lib/sandboxgamemaker/sandboxgamemaker_glauncher ]
  		then
--			${SANDBOX_EXEC} ./bin/${SANDBOX_PREFIX}_master
-+			${SANDBOX_EXEC} /usr/lib/sandboxgamemaker/sandboxgamemaker_glauncher
+-			eval ${SANDBOX_EXEC} ./bin/${SANDBOX_PREFIX}_master
++			eval ${SANDBOX_EXEC} /usr/lib/sandboxgamemaker/sandboxgamemaker_glauncher
  		else
  			failed
  		fi
diff --git a/debian/patches/series b/debian/patches/series
index a22941b..d186bbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@ wx_launcher_paths.patch
 debianizing_makefiles.patch
 linux_launcher.patch
 libenet_1.3_add.patch
-spelling_errors.patch
-build_fix_bendian.patch
diff --git a/debian/patches/wx_launcher_paths.patch b/debian/patches/wx_launcher_paths.patch
index 2d37c67..3e2c625 100644
--- a/debian/patches/wx_launcher_paths.patch
+++ b/debian/patches/wx_launcher_paths.patch
@@ -3,8 +3,8 @@ Author: Scott Howard <showard314 at gmail.com>
 
 Index: sandboxgamemaker/src/launcher/pasl.cpp
 ===================================================================
---- sandboxgamemaker.orig/src/launcher/pasl.cpp	2010-10-09 11:31:24.074230231 -0400
-+++ sandboxgamemaker/src/launcher/pasl.cpp	2010-10-09 11:32:47.267063097 -0400
+--- sandboxgamemaker.orig/src/launcher/pasl.cpp	2010-11-08 09:56:04.851619159 -0500
++++ sandboxgamemaker/src/launcher/pasl.cpp	2010-11-08 09:56:08.851379211 -0500
 @@ -461,28 +461,28 @@
          if(wxIsPlatform64Bit())
          {
@@ -51,9 +51,9 @@ Index: sandboxgamemaker/src/launcher/pasl.cpp
  
 Index: sandboxgamemaker/src/Makefile
 ===================================================================
---- sandboxgamemaker.orig/src/Makefile	2010-10-09 11:31:24.094216043 -0400
-+++ sandboxgamemaker/src/Makefile	2010-10-09 11:31:26.052826677 -0400
-@@ -214,9 +214,8 @@
+--- sandboxgamemaker.orig/src/Makefile	2010-11-08 09:56:04.871617959 -0500
++++ sandboxgamemaker/src/Makefile	2010-11-08 09:56:08.851379211 -0500
+@@ -215,9 +215,8 @@
  
  pasl:   $(LAUNCHER_OBJS)
  	$(CXX) $(CXXFLAGS) $(LAUNCHER_FLAGS) -o launch $(LAUNCHER_OBJS) $(LAUNCHER_LIBS)

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



More information about the Pkg-games-commits mailing list