[redeclipse] 382/494: remove ldflags patch (upstreamed) and refresh enet patch

[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 38599dc436c9f04b2fa62b2d34e4bf4169f4f273
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Wed Aug 1 16:16:42 2012 +0200

    remove ldflags patch (upstreamed) and refresh enet patch
---
 patches/build-with-ldflags.patch     | 34 ----------------------------------
 patches/build-with-system-enet.patch |  4 ++--
 patches/series                       |  1 -
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/patches/build-with-ldflags.patch b/patches/build-with-ldflags.patch
deleted file mode 100644
index eb2b280..0000000
--- a/patches/build-with-ldflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Build with LDFLAGS
- Append $(LDFLAGS) to client server and cube2font targets.
-Author: Martin Erik Werner <martinerikwerner at gmail.com>
-
-Forwarded: no
-Last-Update: 2012-06-07
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -170,13 +170,13 @@
- endif
- else
- client: $(CLIENT_OBJS)
--	$(CXX) $(CXXFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS)
- ifneq (,$(STRIP))
- 	$(STRIP) $(APPCLIENT)
- endif
- 
- server: $(SERVER_OBJS)
--	$(CXX) $(CXXFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS)
- ifneq (,$(STRIP))
- 	$(STRIP) $(APPSERVER)
- endif
-@@ -193,7 +193,7 @@
- 	$(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
- 
- cube2font: shared/cube2font.o
--	$(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
- 
- install-cube2font: cube2font
- 	install -d ../bin
diff --git a/patches/build-with-system-enet.patch b/patches/build-with-system-enet.patch
index d9bf240..0231f2a 100644
--- a/patches/build-with-system-enet.patch
+++ b/patches/build-with-system-enet.patch
@@ -39,13 +39,13 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
  else
 -client: libenet $(CLIENT_OBJS)
 +client: $(CLIENT_OBJS)
- 	$(CXX) $(CXXFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS)
  ifneq (,$(STRIP))
  	$(STRIP) $(APPCLIENT)
  endif
  
 -server: libenet $(SERVER_OBJS)
 +server: $(SERVER_OBJS)
- 	$(CXX) $(CXXFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS)
  ifneq (,$(STRIP))
  	$(STRIP) $(APPSERVER)
diff --git a/patches/series b/patches/series
index 90ab62a..f525da9 100644
--- a/patches/series
+++ b/patches/series
@@ -1,3 +1,2 @@
 windowed-by-default.patch
 build-with-system-enet.patch
-build-with-ldflags.patch

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