[redeclipse] 02/03: Drop system-enet patch, use make trickery instead

[Martin Werner]

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

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

commit bf57daa834f39f41c76fe9c3f73d64a7f338480b
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Wed Apr 8 15:46:06 2015 +0200

    Drop system-enet patch, use make trickery instead
    
    Based on a hunch, this might be a more robust way to build with system
    Enet, needing one less patch refresh on future upstream releases.
---
 debian/changelog                            |  2 ++
 debian/patches/build-with-system-enet.patch | 41 -----------------------------
 debian/patches/series                       |  1 -
 debian/rules                                |  4 +++
 4 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae8ca9b..b2acf3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ redeclipse (1.5.1-1) experimental; urgency=low
     - Add system-install-Install-appdata.patch
   * Make sure guidelines.txt is accessible by client for first-connect
     - Add system-install-Add-doc-link-for-client-finding-guide.patch
+  * Use make variables instead of patch to build with system Enet
+    - Drop build-with-system-enet.patch
 
  -- Martin Erik Werner <martinerikwerner at gmail.com>  Sun, 29 Mar 2015 16:02:22 +0200
 
diff --git a/debian/patches/build-with-system-enet.patch b/debian/patches/build-with-system-enet.patch
deleted file mode 100644
index 7169242..0000000
--- a/debian/patches/build-with-system-enet.patch
+++ /dev/null
@@ -1,41 +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) <adriyetichaves at gmail.com>
-
-Index: redeclipse-debian/src/Makefile
-===================================================================
---- redeclipse-debian.orig/src/Makefile
-+++ redeclipse-debian/src/Makefile
-@@ -37,7 +37,7 @@ endif
- CXX_TEMP:=$(CXX)
- override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
- 
--INCLUDES= -I. -Ishared -Iengine -Igame -Ienet/include
-+INCLUDES= -I. -Ishared -Iengine -Igame
- 
- 
- STRIP=
-@@ -81,7 +81,7 @@ BIN_SUFFIX=_native
- endif
- endif
- CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -Lenet -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
- ifneq (,$(findstring linux,$(PLATFORM)))
- CLIENT_LIBS+= -lrt
-@@ -209,10 +209,10 @@ $(APPSERVER)_windows$(BIN_SUFFIX): $(SER
- 	$(WINDRES) -i $(APPNAME).rc -J rc -o $(APPNAME).res -O coff
- 	$(CXX) $(CXXFLAGS) -o $@ $(APPNAME).res $(SERVER_OBJS) $(SERVER_LIBS)
- 
--$(APPCLIENT)$(BIN_SUFFIX): $(LIBENET) $(CLIENT_OBJS)
-+$(APPCLIENT)$(BIN_SUFFIX): $(CLIENT_OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(CLIENT_OBJS) $(CLIENT_LIBS)
- 
--$(APPSERVER)$(BIN_SUFFIX): $(LIBENET) $(SERVER_OBJS)
-+$(APPSERVER)$(BIN_SUFFIX): $(SERVER_OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SERVER_OBJS) $(SERVER_LIBS)
- 
- client: $(APPCLIENT)$(APPMODIFIER)$(BIN_SUFFIX)
diff --git a/debian/patches/series b/debian/patches/series
index 076835b..b74c62d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 windowed-by-default.patch
-build-with-system-enet.patch
 system-install-Add-common-install-target-for-common-.patch
 appdate-Use-template-set-at-install-name.patch
 appdata-Upgrade-via-appstream-util.patch
diff --git a/debian/rules b/debian/rules
index c5e6c78..0f88e7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,13 @@ endif
 
 override_dh_auto_clean:
 	$(MAKE) -C src/ clean-client clean-server
+	rm -rf enet
 
 override_dh_auto_build:
+	mkdir -p enet/include
 	dh_auto_build -- \
 		CXXFLAGS="$(CXXFLAGS) -ffast-math" \
+		LIBENET="" \
 		client server
 
 override_dh_strip:
@@ -24,6 +27,7 @@ override_dh_strip:
 
 override_dh_auto_install:
 	$(MAKE) -C src/ \
+		LIBENET="" \
 		DESTDIR=$(CURDIR)/debian/tmp \
 		prefix=/usr games=/games gamesbin=/games \
 		system-install-client system-install-server \

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