[SCM] Packaging for Red Eclipse branch, master, updated. upstream/1.2-13-g0e195c7

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit dca739bee833de74d34fbe8763be9f5014334e31
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Mon Feb 13 14:48:36 2012 +0100

    Enable building with system Enet

diff --git a/debian/control b/debian/control
index 02818f6..fadcfac 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Uploaders: Martin Erik Werner <martinerikwerner at gmail.com>
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 8),
+               libenet-dev,
                imagemagick,
                libgl1-mesa-dev,
                libsdl-image1.2-dev,
diff --git a/debian/patches/build-with-system-enet.inactive b/debian/patches/build-with-system-enet.patch
similarity index 91%
rename from debian/patches/build-with-system-enet.inactive
rename to debian/patches/build-with-system-enet.patch
index 6a0d0c7..947aa16 100644
--- a/debian/patches/build-with-system-enet.inactive
+++ b/debian/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) <adriyetichaves at 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) <adriyetichaves at 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) <adriyetichaves at 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/debian/patches/series b/debian/patches/series
index 0411096..d40e02c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 windowed-by-default.patch
 build-with-debug-symbols.patch
+build-with-system-enet.patch
diff --git a/debian/rules b/debian/rules
index e38cea3..6fdb698 100755
--- a/debian/rules
+++ b/debian/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

-- 
Packaging for Red Eclipse