This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch debdir in repository redeclipse.
commit 075b0c00ed0a4dde22f7f00f145c15d1d4cd1479 Author: Martin Erik Werner <[email protected]> Date: Wed Nov 23 02:29:30 2011 +0100 rm license-required-renaming.diff, rename patches --- patches/40-build-with-system-enet.diff | 51 ---------------------- ...symbols.diff => build-with-debug-symbols.patch} | 0 patches/license-required-naming.diff | 11 ----- patches/series | 5 +-- ...d-by-default.diff => windowed-by-default.patch} | 0 5 files changed, 2 insertions(+), 65 deletions(-) diff --git a/patches/40-build-with-system-enet.diff b/patches/40-build-with-system-enet.diff deleted file mode 100644 index 6a0d0c7..0000000 --- a/patches/40-build-with-system-enet.diff +++ /dev/null @@ -1,51 +0,0 @@ -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 diff --git a/patches/build-with-debug-symbols.diff b/patches/build-with-debug-symbols.patch similarity index 100% rename from patches/build-with-debug-symbols.diff rename to patches/build-with-debug-symbols.patch diff --git a/patches/license-required-naming.diff b/patches/license-required-naming.diff deleted file mode 100644 index b962b55..0000000 --- a/patches/license-required-naming.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/engine/engine.h -+++ b/src/engine/engine.h -@@ -5,7 +5,7 @@ - - #define ENG_VERSION 110 - #define ENG_NAME "Red Eclipse" --#define ENG_RELEASE "Supernova Edition" -+#define ENG_RELEASE "Supernova Edition [for Debian]" - #define ENG_URL "www.redeclipse.net" - #ifdef WIN32 - #define ENG_PLATFORM "win" diff --git a/patches/series b/patches/series index cd6c682..18d6156 100644 --- a/patches/series +++ b/patches/series @@ -1,3 +1,2 @@ -build-with-debug-symbols.diff -license-required-naming.diff -windowed-by-default.diff +build-with-debug-symbols.patch +windowed-by-default.patch diff --git a/patches/windowed-by-default.diff b/patches/windowed-by-default.patch similarity index 100% rename from patches/windowed-by-default.diff rename to patches/windowed-by-default.patch -- 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
