[redeclipse] 439/494: refreshed and reordered patches

Martin Werner arand-guest at moszumanska.debian.org
Sun Jun 21 20:53:00 UTC 2015


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

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

commit a1df4b9cc2bf60a5a58f246da2d09e206d65f852
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Fri Mar 22 21:08:59 2013 +0100

    refreshed and reordered patches
---
 patches/build-with-system-enet.patch                              | 8 ++++----
 ...pp-name.patch => desktop-file-don-t-quote-icon-app-name.patch} | 0
 patches/series                                                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/build-with-system-enet.patch b/patches/build-with-system-enet.patch
index da44a77..55a5b88 100644
--- a/patches/build-with-system-enet.patch
+++ b/patches/build-with-system-enet.patch
@@ -6,7 +6,7 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
 
 --- a/src/core.mk
 +++ b/src/core.mk
-@@ -21,7 +21,7 @@
+@@ -28,7 +28,7 @@
  CXX_TEMP:=$(CXX)
  override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
  
@@ -15,7 +15,7 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
  
  
  STRIP=
-@@ -59,7 +59,7 @@
+@@ -66,7 +66,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
-@@ -130,7 +130,7 @@
+@@ -137,7 +137,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 \
-@@ -195,13 +195,13 @@
+@@ -202,13 +202,13 @@
  	$(STRIP) $(WINBIN)/$(APPSERVER).exe
  endif
  else
diff --git a/patches/0001-desktop-file-don-t-quote-icon-app-name.patch b/patches/desktop-file-don-t-quote-icon-app-name.patch
similarity index 100%
rename from patches/0001-desktop-file-don-t-quote-icon-app-name.patch
rename to patches/desktop-file-don-t-quote-icon-app-name.patch
diff --git a/patches/series b/patches/series
index 4823ff7..1f82f4d 100644
--- a/patches/series
+++ b/patches/series
@@ -1,3 +1,3 @@
-0001-desktop-file-don-t-quote-icon-app-name.patch
 windowed-by-default.patch
 build-with-system-enet.patch
+desktop-file-don-t-quote-icon-app-name.patch

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



More information about the Pkg-games-commits mailing list