This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch debdir in repository redeclipse.
commit 2200b72003606f311a5cbd675d432ce013d74ca5 Author: Martin Erik Werner <martinerikwer...@gmail.com> Date: Mon Feb 13 14:48:36 2012 +0100 Enable building with system Enet --- control | 1 + ...ild-with-system-enet.inactive => build-with-system-enet.patch} | 8 ++++---- patches/series | 1 + rules | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/control b/control index 02818f6..fadcfac 100644 --- a/control +++ b/control @@ -4,6 +4,7 @@ Priority: optional Uploaders: Martin Erik Werner <martinerikwer...@gmail.com> Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Build-Depends: debhelper (>= 8), + libenet-dev, imagemagick, libgl1-mesa-dev, libsdl-image1.2-dev, diff --git a/patches/build-with-system-enet.inactive b/patches/build-with-system-enet.patch similarity index 91% rename from patches/build-with-system-enet.inactive rename to patches/build-with-system-enet.patch index 6a0d0c7..947aa16 100644 --- a/patches/build-with-system-enet.inactive +++ b/patches/build-with-system-enet.patch @@ -4,8 +4,8 @@ Description: Use system Enet instead of bundled version Origin: http://gitorious.org/chakra-packages/games/commit/1aae10c597cf09a281d47570e43c8892531cd9bf Author: Adrián Chaves Fernández (Gallaecio) <adriyeticha...@gmail.com> ---- a/src/Makefile 2011-07-31 21:38:04.000000000 +0200 -+++ b/src/Makefile 2011-07-31 21:50:43.000000000 +0200 +--- a/src/Makefile ++++ b/src/Makefile @@ -5,7 +5,7 @@ PLATFORM= $(shell uname -s) PLATFORM_SUFFIX=_native @@ -24,7 +24,7 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyeticha...@gmail.com> endif ifeq ($(PLATFORM),Linux) CLIENT_LIBS+= -lrt -@@ -92,7 +92,7 @@ +@@ -93,7 +93,7 @@ SERVER_LIBS= -mwindows -Llib -lzdll -lenet -lws2_32 -lwinmm else SERVER_INCLUDES= -DSTANDALONE -DMASTERSERVER -DIRC $(INCLUDES) @@ -33,7 +33,7 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyeticha...@gmail.com> endif SERVER_OBJS= \ shared/crypto-standalone.o \ -@@ -157,13 +157,13 @@ +@@ -158,13 +158,13 @@ $(STRIP) ../bin/reserver.exe endif else diff --git a/patches/series b/patches/series index 0411096..d40e02c 100644 --- a/patches/series +++ b/patches/series @@ -1,2 +1,3 @@ windowed-by-default.patch build-with-debug-symbols.patch +build-with-system-enet.patch diff --git a/rules b/rules index e38cea3..6fdb698 100755 --- a/rules +++ b/rules @@ -5,7 +5,6 @@ override_dh_auto_clean: dh_auto_clean - dh_auto_clean --sourcedirectory=src/enet override_dh_auto_build: dh_auto_build -- client server icons -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits