This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch debdir in repository redeclipse.
commit ebd8f17bff7b1bcd874407c6ce69c57e16c18d6d Author: Martin Erik Werner <[email protected]> Date: Wed Nov 23 03:06:04 2011 +0100 move patch down to patches --- patches/build-with-system-enet.inactive | 51 +++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/patches/build-with-system-enet.inactive b/patches/build-with-system-enet.inactive new file mode 100644 index 0000000..6a0d0c7 --- /dev/null +++ b/patches/build-with-system-enet.inactive @@ -0,0 +1,51 @@ +Description: Use system Enet instead of bundled version + This change is explicitly disliked by upstream, however it is preferred by + Debian policy. +Origin: http://gitorious.org/chakra-packages/games/commit/1aae10c597cf09a281d47570e43c8892531cd9bf +Author: Adrián Chaves Fernández (Gallaecio) <[email protected]> + +--- a/src/Makefile 2011-07-31 21:38:04.000000000 +0200 ++++ b/src/Makefile 2011-07-31 21:50:43.000000000 +0200 +@@ -5,7 +5,7 @@ + PLATFORM= $(shell uname -s) + PLATFORM_SUFFIX=_native + +-INCLUDES= -Ishared -Iengine -Igame -Ienet/include ++INCLUDES= -Ishared -Iengine -Igame -I/usr/share/enet/include + + STRIP= + ifeq (,$(findstring -g,$(CXXFLAGS))) +@@ -22,7 +22,7 @@ + CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm + else + CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` +-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL ++CLIENT_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL + endif + ifeq ($(PLATFORM),Linux) + CLIENT_LIBS+= -lrt +@@ -92,7 +92,7 @@ + SERVER_LIBS= -mwindows -Llib -lzdll -lenet -lws2_32 -lwinmm + else + SERVER_INCLUDES= -DSTANDALONE -DMASTERSERVER -DIRC $(INCLUDES) +-SERVER_LIBS= -Lenet/.libs -lenet -lz ++SERVER_LIBS= -lenet -lz + endif + SERVER_OBJS= \ + shared/crypto-standalone.o \ +@@ -157,13 +157,13 @@ + $(STRIP) ../bin/reserver.exe + endif + else +-client: libenet $(CLIENT_OBJS) ++client: $(CLIENT_OBJS) + $(CXX) $(CXXFLAGS) -o reclient $(CLIENT_OBJS) $(CLIENT_LIBS) + ifneq (,$(STRIP)) + $(STRIP) reclient + endif + +-server: libenet $(SERVER_OBJS) ++server: $(SERVER_OBJS) + $(CXX) $(CXXFLAGS) -o reserver $(SERVER_OBJS) $(SERVER_LIBS) + ifneq (,$(STRIP)) + $(STRIP) reserver -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
