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

Andres Mejia ceros-guest at alioth.debian.org
Tue Jan 15 03:33:36 UTC 2008 

Author: ceros-guest
Date: 2008-01-15 03:33:35 +0000 (Tue, 15 Jan 2008)
New Revision: 5357

Removed:
   packages/trunk/alien-arena/debian/alien-arena-dbg.install
   packages/trunk/alien-arena/debian/alien-arena-server-dbg.install
Modified:
   packages/trunk/alien-arena/debian/changelog
   packages/trunk/alien-arena/debian/control
   packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch
   packages/trunk/alien-arena/debian/rules
Log:
Modify patch for upstream Makefile to make it more useful for build Debian packages. Remove debug package for building. Will use nostrip option instead.

Deleted: packages/trunk/alien-arena/debian/alien-arena-dbg.install
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-dbg.install	2008-01-15 02:42:48 UTC (rev 5356)
+++ packages/trunk/alien-arena/debian/alien-arena-dbg.install	2008-01-15 03:33:35 UTC (rev 5357)
@@ -1,2 +0,0 @@
-source/debug/crx.sdl usr/lib/debug/usr/lib/games/alien-arena
-source/debug/game.so usr/lib/debug/usr/lib/games/alien-arena

Deleted: packages/trunk/alien-arena/debian/alien-arena-server-dbg.install
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-server-dbg.install	2008-01-15 02:42:48 UTC (rev 5356)
+++ packages/trunk/alien-arena/debian/alien-arena-server-dbg.install	2008-01-15 03:33:35 UTC (rev 5357)
@@ -1 +0,0 @@
-source/debug/crded usr/lib/debug/usr/lib/games/alien-arena

Modified: packages/trunk/alien-arena/debian/changelog
===================================================================
--- packages/trunk/alien-arena/debian/changelog	2008-01-15 02:42:48 UTC (rev 5356)
+++ packages/trunk/alien-arena/debian/changelog	2008-01-15 03:33:35 UTC (rev 5357)
@@ -10,6 +10,9 @@
   * Bumped to Standards-Version 3.7.3.
   * Test for existence of *-stamp stamps before removing them.
   * Removed Encoding field in desktop file.
+  * Modify patch for upstream Makefile to make Makefile more useful in building
+    Debian packages.
+  * Remove debug packages for release. Will support nostrip option instead.
 
  -- Andres Mejia <mcitadel at gmail.com>  Mon, 14 Jan 2008 18:29:39 -0500
 

Modified: packages/trunk/alien-arena/debian/control
===================================================================
--- packages/trunk/alien-arena/debian/control	2008-01-15 02:42:48 UTC (rev 5356)
+++ packages/trunk/alien-arena/debian/control	2008-01-15 03:33:35 UTC (rev 5357)
@@ -56,52 +56,6 @@
  .
  This package installs the dedicated server for Alien Arena.
 
-Package: alien-arena-dbg
-Architecture: any
-Depends: alien-arena (= ${binary:Version})
-Description: debugging symbols for alien-arena
- ALIEN ARENA is a standalone 3D first person online deathmatch shooter
- crafted from the original source code of Quake II and Quake III, released
- by id Software under the GPL license. With features including 32 bit
- graphics, new particle engine and effects, light blooms, reflective water,
- hi resolution textures and skins, hi poly models, stain maps, ALIEN ARENA
- pushes the envelope of graphical beauty rivaling today's top games.
- .
- The game features 37 levels, which can be played online against other
- players, or against the built in CodeRED bots.
- .
- Alien Arena offers CTF, AOA(All Out Assault) mode, in which players can
- climb into vehicles to do battle, Deathball, and Team Core Assault. Simply
- go into the multiplayer menu to start a server, change the game rules, and
- choose a map to play on. You can also select from five different
- mutators(instagib, rocket arena, excessive, low grav, regen, and vampire) to
- further customize your game experience.
- .
- This package installs the SDL client debugging symbols for Alien Arena.
-
-Package: alien-arena-server-dbg
-Architecture: any
-Depends: alien-arena-server (= ${binary:Version})
-Description: debugging symbols for alien-arena-server
- ALIEN ARENA is a standalone 3D first person online deathmatch shooter
- crafted from the original source code of Quake II and Quake III, released
- by id Software under the GPL license. With features including 32 bit
- graphics, new particle engine and effects, light blooms, reflective water,
- hi resolution textures and skins, hi poly models, stain maps, ALIEN ARENA
- pushes the envelope of graphical beauty rivaling today's top games.
- .
- The game features 37 levels, which can be played online against other
- players, or against the built in CodeRED bots.
- .
- Alien Arena offers CTF, AOA(All Out Assault) mode, in which players can
- climb into vehicles to do battle, Deathball, and Team Core Assault. Simply
- go into the multiplayer menu to start a server, change the game rules, and
- choose a map to play on. You can also select from five different
- mutators(instagib, rocket arena, excessive, low grav, regen, and vampire) to
- further customize your game experience.
- .
- This package installs the dedicated server debugging symbols for Alien Arena.
-
 Package: alien-arena-browser
 Architecture: all
 Depends: alien-arena (>= ${binary:Version}), ruby-gnome2, ruby

Modified: packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch	2008-01-15 02:42:48 UTC (rev 5356)
+++ packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch	2008-01-15 03:33:35 UTC (rev 5357)
@@ -2,7 +2,8 @@
 ## makefile_modifications.dpatch by Andres Mejia <mcitadel at gmail.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch that takes out some unnecessary tests and settings for an autobuild.
+## DP: Patch that modifies the upstream Makefile making it more useful in
+## DP: building Debian packages.
 
 dir=
 if [ $# -eq 3 -a "$2" = '-d' ]; then
@@ -25,27 +26,27 @@
 esac
 exit 0
 
---- source/Makefile~	2007-06-23 22:10:56.000000000 -0400
-+++ source/Makefile	2007-06-23 22:14:52.000000000 -0400
-@@ -5,7 +5,7 @@
- # Start of configurable options.
- 
- # Which compiler to use.
--CC?=gcc
-+CC=$(DEB_HOST_GNU_TYPE)-gcc
- 
- # Enable compilation optimizations when "yes".
- OPTIMIZED_CFLAGS?=yes
+--- source/Makefile.bak	2008-01-14 21:04:00.000000000 -0500
++++ source/Makefile	2008-01-14 22:27:44.000000000 -0500
 @@ -14,7 +14,7 @@
- OPTIM_LVL?=3
+ OPTIM_LVL?=2
  
  # Path to standard libraries (e.g. jpeg).
 -LOCALBASE?=/usr/local
-+#LOCALBASE?=/usr/local
++LOCALBASE?=/usr
  
  # Path to X libraries (e.g. GL).
  X11BASE?=/usr/X11R6
-@@ -45,11 +45,7 @@
+@@ -35,7 +35,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,41 +45,15 @@
  NULL_DIR=		$(MOUNT_DIR)/null
  ARENA_DIR=		$(GAME_DIR)
  
@@ -56,12 +57,14 @@
 -endif
 +_LIB := lib
  
- BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include
+-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
  
-@@ -58,28 +54,6 @@
+ RELEASE_CFLAGS=$(BASE_CFLAGS)
+ 
  ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes)
- RELEASE_CFLAGS+=-O$(OPTIM_LVL) -funroll-loops -fomit-frame-pointer \
- 		-ftree-vectorize -fexpensive-optimizations
+ RELEASE_CFLAGS+=-O$(OPTIM_LVL) -fomit-frame-pointer \
+-		-ftree-vectorize -fexpensive-optimizations
 -
 -ifeq ($(OSTYPE),linux)
 -ifeq ($(ARCH),x86_64)
@@ -84,15 +87,25 @@
 -endif
 -endif
 -endif
++		-ftree-vectorize -fexpensive-optimizations -fno-strict-aliasing
  endif
  
+ ifeq ($(shell curl -V | grep -c .), 3)
+@@ -88,7 +62,7 @@
+ 
  ARENA_CFLAGS=-DARENA
-@@ -92,7 +66,7 @@
- LDFLAGS+=-ldl
- endif
  
--GLXLDFLAGS=-L$(X11BASE)/$(_LIB) -L$(LOCALBASE)/$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lm -ljpeg -lGL -lGLU
-+GLXLDFLAGS=-L$(X11BASE)/$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lm -ljpeg -lGL -lGLU
+-DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb
++DEBUG_CFLAGS=$(BASE_CFLAGS) -g
  
- SDLCFLAGS=$(shell sdl-config --cflags)
+ LDFLAGS+=-lm
+ # In FreeBSD, dlopen() is in libc.
+@@ -102,7 +76,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/rules
===================================================================
--- packages/trunk/alien-arena/debian/rules	2008-01-15 02:42:48 UTC (rev 5356)
+++ packages/trunk/alien-arena/debian/rules	2008-01-15 03:33:35 UTC (rev 5357)
@@ -4,6 +4,18 @@
 # Used for cross-compiling.
 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+   OPTIMIZED_CFLAGS=no
+else
+   OPTIMIZED_CFLAGS=yes
+endif
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+   TYPE=release
+else
+   TYPE=debug
+endif
+
 include /usr/share/dpatch/dpatch.make
 
 fromdos: fromdos-stamp
@@ -15,7 +27,9 @@
 build: fromdos patch build-stamp
 build-stamp:
 	dh_testdir
-	cd source && $(MAKE) all
+	cd source && \
+		$(MAKE) build-$(TYPE) \
+		OPTIMIZED_CFLAGS=$(OPTIMIZED_CFLAGS) CC=$(DEB_HOST_GNU_TYPE)-gcc
 	touch build-stamp
 
 clean: clean-patched unpatch todos
@@ -36,7 +50,7 @@
 	dh_testdir
 	dh_testroot
 	dh_install
-	# Rename png icon
+# Rename png icon
 	mv debian/alien-arena/usr/share/pixmaps/aa.png \
 		debian/alien-arena/usr/share/pixmaps/alien-arena.png
 
@@ -44,8 +58,10 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip -palien-arena
 	dh_strip -palien-arena-server
+endif
 	dh_installchangelogs -a
 	dh_installdocs -a -Xlicense.txt
 	dh_installman -palien-arena debian/alien-arena.6

More information about the Pkg-games-commits mailing list