[redeclipse] 428/494: refreshed quilt patches

[Martin Werner]

This is an automated email from the git hooks/post-receive script.

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit 379646ea86bcff57b2b4eb986bb9f994a80f24f9
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Thu Mar 21 00:13:31 2013 +0100

    refreshed quilt patches
---
 patches/build-with-system-enet.patch | 22 +++++++++++-----------
 patches/windowed-by-default.patch    |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/patches/build-with-system-enet.patch b/patches/build-with-system-enet.patch
index 8b637ce..da44a77 100644
--- a/patches/build-with-system-enet.patch
+++ b/patches/build-with-system-enet.patch
@@ -4,18 +4,18 @@ Description: Use system Enet instead of bundled version
 Origin: http://gitorious.org/chakra-packages/games/commit/1aae10c597cf09a281d47570e43c8892531cd9bf
 Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
 
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -9,7 +9,7 @@
- PLATFORM= $(shell uname -s)
- PLATFORM_SUFFIX=_native
+--- a/src/core.mk
++++ b/src/core.mk
+@@ -21,7 +21,7 @@
+ CXX_TEMP:=$(CXX)
+ override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
+ 
+-INCLUDES= -Ishared -Iengine -Igame -Ienet/include $(APPFLAGS)
++INCLUDES= -Ishared -Iengine -Igame $(APPFLAGS)
  
--INCLUDES= -Ishared -Iengine -Igame -Ienet/include
-+INCLUDES= -Ishared -Iengine -Igame -I/usr/share/enet/include
  
  STRIP=
- ifeq (,$(findstring -g,$(CXXFLAGS)))
-@@ -42,7 +42,7 @@
+@@ -59,7 +59,7 @@
  CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
  else
  CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
@@ -24,7 +24,7 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
  endif
  ifeq ($(PLATFORM),Linux)
  CLIENT_LIBS+= -lrt
-@@ -113,7 +113,7 @@
+@@ -130,7 +130,7 @@
  SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
  else
  SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
@@ -33,7 +33,7 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
  endif
  SERVER_OBJS= \
  	shared/crypto-standalone.o \
-@@ -178,13 +178,13 @@
+@@ -195,13 +195,13 @@
  	$(STRIP) $(WINBIN)/$(APPSERVER).exe
  endif
  else
diff --git a/patches/windowed-by-default.patch b/patches/windowed-by-default.patch
index e9eb4f8..7226670 100644
--- a/patches/windowed-by-default.patch
+++ b/patches/windowed-by-default.patch
@@ -9,7 +9,7 @@ Last-Update: 2011-12-13
 
 --- a/src/engine/main.cpp
 +++ b/src/engine/main.cpp
-@@ -256,7 +256,7 @@
+@@ -258,7 +258,7 @@
  #endif
  }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git