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

Sat Apr 19 03:31:36 UTC 2008

Author: ceros-guest
Date: 2008-04-19 03:31:36 +0000 (Sat, 19 Apr 2008)
New Revision: 6655

Modified:
   packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch
   packages/trunk/alien-arena/debian/patches/makefile_modifications.patch
   packages/trunk/alien-arena/debian/patches/series
   packages/trunk/alien-arena/debian/rules
Log:
Updating some patches

Modified: packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch
===================================================================

--- packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch	2008-04-19 00:33:13 UTC (rev 6654)
+++ packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch	2008-04-19 03:31:36 UTC (rev 6655)
@@ -1,17 +1,17 @@
 Index: Patch to set game directory used by client and server from $HOME/.codered to $HOME/.alien-arena
 ===================================================================
---- ./source/qcommon/files.c~ 2007-10-29 13:13:02.000000000 -0400
-+++ ./source/qcommon/files.c     2007-10-29 13:15:21.000000000 -0400
-@@ -591,7 +591,7 @@
+--- ./source/qcommon/files.c.bak	2008-04-18 23:07:50.000000000 -0400
++++ ./source/qcommon/files.c	2008-04-18 23:08:24.000000000 -0400
+@@ -607,7 +607,7 @@
  ================
  FS_AddHomeAsGameDirectory
- 
+
 -Use ~/.codered/dir as fs_gamedir
 +Use ~/.alien-arena/dir as fs_gamedir
  ================
  */
  void FS_AddHomeAsGameDirectory (char *dir)
-@@ -600,7 +600,7 @@
+@@ -616,7 +616,7 @@
  	char *homedir=getenv("HOME");
  	if(homedir)
  	{
@@ -19,4 +19,4 @@
 +		int len = snprintf(gdir,sizeof(gdir),"%s/.alien-arena/%s/", homedir, dir);
  		Com_Printf("using %s for writing\n",gdir);
  		FS_CreatePath (gdir);
- 
+

Modified: packages/trunk/alien-arena/debian/patches/makefile_modifications.patch
===================================================================
--- packages/trunk/alien-arena/debian/patches/makefile_modifications.patch	2008-04-19 00:33:13 UTC (rev 6654)
+++ packages/trunk/alien-arena/debian/patches/makefile_modifications.patch	2008-04-19 03:31:36 UTC (rev 6655)
@@ -1,45 +1,46 @@
 Index: Patch that modifies the upstream Makefile making it more useful in
 building Debian packages.
 ===================================================================
---- ./source/Makefile.bak	2008-01-15 02:25:58.000000000 -0500
-+++ ./source/Makefile	2008-01-15 02:33:31.000000000 -0500
+--- ./source/Makefile.bak	2008-04-18 23:15:06.000000000 -0400
++++ ./source/Makefile	2008-04-18 23:21:13.000000000 -0400
 @@ -14,7 +14,7 @@
  OPTIM_LVL?=2
- 
+
  # Path to standard libraries (e.g. jpeg).
 -LOCALBASE?=/usr/local
 +LOCALBASE?=/usr
- 
+
  # Path to X libraries (e.g. GL).
  X11BASE?=/usr/X11R6
-@@ -35,7 +35,7 @@
+@@ -39,7 +39,7 @@
  MOUNT_DIR=		./
- 
+
  BUILD_RELEASE_DIR=	release
 -BUILD_DEBUG_DIR=	debug
 +BUILD_DEBUG_DIR=	release
  CLIENT_DIR=		$(MOUNT_DIR)/client
  SERVER_DIR=		$(MOUNT_DIR)/server
  REF_GL_DIR=		$(MOUNT_DIR)/ref_gl
-@@ -45,50 +45,24 @@
+@@ -49,13 +49,9 @@
  NULL_DIR=		$(MOUNT_DIR)/null
  ARENA_DIR=		$(GAME_DIR)
- 
+
 -ifeq ($(ARCH),x86_64)
 -	_LIB := lib64
 -else
 -	_LIB := lib
 -endif
 +_LIB := lib
- 
--BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include -fno-strict-aliasing -fmerge-constants
-+BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include -Wall
- 
- RELEASE_CFLAGS=$(BASE_CFLAGS)
- 
+
+-BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include -fno-strict-aliasing -fmerge-constants -DHAVE_CURL
++BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include -Wall -DHAVE_CURL
+
+ # DATADIR / LIBDIR support.
+
+@@ -75,33 +71,11 @@
+
  ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes)
- RELEASE_CFLAGS+=-O$(OPTIM_LVL) -fomit-frame-pointer \
--		-ftree-vectorize -fexpensive-optimizations
+ RELEASE_CFLAGS+=-O$(OPTIM_LVL) -fomit-frame-pointer -fexpensive-optimizations
 -
 -ifeq ($(OSTYPE),linux)
 -ifeq ($(ARCH),x86_64)
@@ -62,27 +63,21 @@
 -endif
 -endif
 -endif
-+		-ftree-vectorize -fexpensive-optimizations -fno-strict-aliasing
  endif
- 
--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
- 
+
 -DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb
 +DEBUG_CFLAGS=$(BASE_CFLAGS) -g
- 
+
  LDFLAGS+=-lm
  # In FreeBSD, dlopen() is in libc.
-@@ -102,7 +76,7 @@
+@@ -115,7 +89,7 @@
  SDLLDFLAGS=$(shell sdl-config --libs)
- 
+
  SHLIBEXT=so
 -SHLIBCFLAGS=-fPIC
 +SHLIBCFLAGS=-fPIC -D_REENTRANT
  SHLIBLDFLAGS=-shared
- 
+
  CURLCFLAGS=$(shell curl-config --cflags)

Modified: packages/trunk/alien-arena/debian/patches/series
===================================================================
--- packages/trunk/alien-arena/debian/patches/series	2008-04-19 00:33:13 UTC (rev 6654)
+++ packages/trunk/alien-arena/debian/patches/series	2008-04-19 03:31:36 UTC (rev 6655)
@@ -1,7 +1,7 @@
-makefile_modifications.patch
 launch-server_tool_debianization.patch
 kill-runaway-crded_tool_debianization.patch
 rcon_tool_debianization.patch
 home_as_game_dir.patch
 fix-CVE-2007-4754-CVE-2007-4755.patch
 ruby_browser.patch
+makefile_modifications.patch

Modified: packages/trunk/alien-arena/debian/rules
===================================================================
--- packages/trunk/alien-arena/debian/rules	2008-04-19 00:33:13 UTC (rev 6654)
+++ packages/trunk/alien-arena/debian/rules	2008-04-19 03:31:36 UTC (rev 6655)
@@ -60,7 +60,7 @@
 	dh_install
 # Rename png icon
 	uudecode -o \
-        debian/alien-arena/usr/share/pixmaps/alien-arena.png alien-arena.png.uu
+		debian/alien-arena/usr/share/pixmaps/alien-arena.png alien-arena.png.uu
 
 # Build architecture-dependent files here.
 binary-arch: build install


