r5363 - in packages/trunk/alien-arena/debian: . patches

[Andres Mejia]

Author: ceros-guest
Date: 2008-01-15 07:38:15 +0000 (Tue, 15 Jan 2008)
New Revision: 5363

Modified:
   packages/trunk/alien-arena/debian/changelog
   packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch
Log:
Fixing problem checking for the existence of libcurl.

Modified: packages/trunk/alien-arena/debian/changelog
===================================================================
--- packages/trunk/alien-arena/debian/changelog	2008-01-15 06:45:17 UTC (rev 5362)
+++ packages/trunk/alien-arena/debian/changelog	2008-01-15 07:38:15 UTC (rev 5363)
@@ -12,6 +12,7 @@
   * Removed Encoding field in desktop file.
   * Modify patch for upstream Makefile to make Makefile more useful in building
     Debian packages.
+    + Also fixes problem not detecting the existence of libcurl.
   * Remove debug packages for release. Will support nostrip option instead.
   * Add description for fix-CVE-2007-4754-CVE-2007-4755.dpatch, silences
     lintian warning.

Modified: packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch	2008-01-15 06:45:17 UTC (rev 5362)
+++ packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch	2008-01-15 07:38:15 UTC (rev 5363)
@@ -26,8 +26,8 @@
 esac
 exit 0
 
---- source/Makefile.bak	2008-01-14 21:04:00.000000000 -0500
-+++ source/Makefile	2008-01-14 22:27:44.000000000 -0500
+--- source/Makefile.bak	2008-01-15 02:25:58.000000000 -0500
++++ source/Makefile	2008-01-15 02:33:31.000000000 -0500
 @@ -14,7 +14,7 @@
  OPTIM_LVL?=2
  
@@ -46,7 +46,7 @@
  CLIENT_DIR=		$(MOUNT_DIR)/client
  SERVER_DIR=		$(MOUNT_DIR)/server
  REF_GL_DIR=		$(MOUNT_DIR)/ref_gl
-@@ -45,41 +45,15 @@
+@@ -45,50 +45,24 @@
  NULL_DIR=		$(MOUNT_DIR)/null
  ARENA_DIR=		$(GAME_DIR)
  
@@ -90,8 +90,10 @@
 +		-ftree-vectorize -fexpensive-optimizations -fno-strict-aliasing
  endif
  
- ifeq ($(shell curl -V | grep -c .), 3)
-@@ -88,7 +62,7 @@
+-ifeq ($(shell curl -V | grep -c .), 3)
++ifeq ($(shell curl-config --version | cut -d ' ' -f 1), libcurl)
+ 	BASE_CFLAGS += -DHAVE_CURL
+ endif
  
  ARENA_CFLAGS=-DARENA