r10672 - in packages/trunk/alien-arena/debian: . patches source

Michael Gilbert gilbert-guest at alioth.debian.org
Fri Jan 8 02:14:27 UTC 2010 

Author: gilbert-guest
Date: 2010-01-08 02:14:26 +0000 (Fri, 08 Jan 2010)
New Revision: 10672

Added:
   packages/trunk/alien-arena/debian/source/
   packages/trunk/alien-arena/debian/source/format
Removed:
   packages/trunk/alien-arena/debian/README.source
Modified:
   packages/trunk/alien-arena/debian/changelog
   packages/trunk/alien-arena/debian/control
   packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch
   packages/trunk/alien-arena/debian/patches/makefile_modifications.patch
   packages/trunk/alien-arena/debian/patches/series
   packages/trunk/alien-arena/debian/rules
Log:
update alien-arena to dpkg source format 3.0

Deleted: packages/trunk/alien-arena/debian/README.source
===================================================================
--- packages/trunk/alien-arena/debian/README.source	2010-01-07 21:56:36 UTC (rev 10671)
+++ packages/trunk/alien-arena/debian/README.source	2010-01-08 02:14:26 UTC (rev 10672)
@@ -1 +0,0 @@
-This package uses quilt for patch management.

Modified: packages/trunk/alien-arena/debian/changelog
===================================================================
--- packages/trunk/alien-arena/debian/changelog	2010-01-07 21:56:36 UTC (rev 10671)
+++ packages/trunk/alien-arena/debian/changelog	2010-01-08 02:14:26 UTC (rev 10672)
@@ -1,4 +1,4 @@
-alien-arena (7.33-1) unstable; urgency=low
+alien-arena (7.33-1) unstable; urgency=high
 
   * New upstream release with many feature enhancments
     (closes: #592770, #467387, #437461).
@@ -7,11 +7,12 @@
   * Add support for new upstream file naming scheme to watch file
     (closes: #513659).
   * Server browser is now in-game.
+  * Updated to use source format version 3.0.
   * Config directory has been moved to '~/.config/alien-arena' to adhere
     to the latest freedesktop standards.
   * Updated to standards version 3.8.3.
 
- -- Michael Gilbert <michael.s.gilbert at gmail.com>  Tue, 29 Dec 2009 16:56:23 -0500
+ -- Michael Gilbert <michael.s.gilbert at gmail.com>  Wed, 06 Jan 2010 16:56:23 -0500
 
 alien-arena (7.0-1) unstable; urgency=low
 

Modified: packages/trunk/alien-arena/debian/control
===================================================================
--- packages/trunk/alien-arena/debian/control	2010-01-07 21:56:36 UTC (rev 10671)
+++ packages/trunk/alien-arena/debian/control	2010-01-08 02:14:26 UTC (rev 10672)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Michael Gilbert <michael.s.gilbert at gmail.com>, Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5), sharutils, quilt, tofrodos, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libjpeg62-dev | libjpeg-dev, libpng12-dev | libpng-dev, libxxf86vm-dev, libxxf86dga-dev, libxext-dev, libx11-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev , libopenal-dev , libvorbis-dev
+Build-Depends: debhelper (>= 5), sharutils, tofrodos, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libjpeg62-dev | libjpeg-dev, libpng12-dev | libpng-dev, libxxf86vm-dev, libxxf86dga-dev, libxext-dev, libx11-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev , libopenal-dev , libvorbis-dev
 Standards-Version: 3.8.3
 Homepage: http://red.planetarena.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/alien-arena/

Modified: packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch
===================================================================
--- packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch	2010-01-07 21:56:36 UTC (rev 10671)
+++ packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch	2010-01-08 02:14:26 UTC (rev 10672)
@@ -1,9 +1,9 @@
-Index: CVE-2007-4754 format string vulnerability, CVE-2007-4755 DoS fixes
+Index: b/source/game/acesrc/acebot_cmds.c
 ===================================================================
---- ./source/game/acesrc/acebot_cmds.c.bak	2007-11-10 16:35:28.000000000 -0500
-+++ ./source/game/acesrc/acebot_cmds.c	2007-11-10 16:51:15.000000000 -0500
+--- a/source/game/acesrc/acebot_cmds.c	2010-01-07 21:01:37.000000000 -0500
++++ b/source/game/acesrc/acebot_cmds.c	2010-01-07 21:02:31.000000000 -0500
 @@ -191,7 +191,7 @@
- 	len = vsprintf (bigbuffer,fmt,argptr);
+ 	len = vsnprintf (bigbuffer,sizeof(bigbuffer),fmt,argptr);
  	va_end (argptr);
  	
 -	gi.centerprintf(ent, bigbuffer);
@@ -11,14 +11,16 @@
  	
  }
  
---- ./source/server/sv_main.c.bak	2007-11-10 16:48:42.000000000 -0500
-+++ ./source/server/sv_main.c	2007-11-10 16:49:56.000000000 -0500
-@@ -154,7 +154,7 @@
- 			nametxt[k]=0;
- 			//s = NET_AdrToString ( cl->netchan.remote_address); //fuck you Luigi
- 			Com_sprintf (player, sizeof(player), "%i %i \"%s\" \"127.0.0.1\"\n",
--				cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt);
-+				cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt, "suppressed");
- 			playerLength = strlen(player);
- 			if (statusLength + playerLength >= sizeof(status) )
- 				break;		// can't hold any more
+Index: b/source/server/sv_main.c
+===================================================================
+--- a/source/server/sv_main.c	2010-01-07 21:01:37.000000000 -0500
++++ b/source/server/sv_main.c	2010-01-07 21:03:07.000000000 -0500
+@@ -166,7 +166,7 @@
+ #endif
+ 			//s = NET_AdrToString ( cl->netchan.remote_address); //fuck you Luigi
+ 			Com_sprintf (player, sizeof(player), "%i %i \"%s\" \"127.0.0.1\"\n",
+-				cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt);
++				cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt, "suppressed");
+ 			playerLength = strlen(player);
+ 			if (statusLength + playerLength >= sizeof(status) )
+ 				break;		// can't hold any more

Modified: packages/trunk/alien-arena/debian/patches/makefile_modifications.patch
===================================================================
--- packages/trunk/alien-arena/debian/patches/makefile_modifications.patch	2010-01-07 21:56:36 UTC (rev 10671)
+++ packages/trunk/alien-arena/debian/patches/makefile_modifications.patch	2010-01-08 02:14:26 UTC (rev 10672)
@@ -1,44 +1,43 @@
-Index: Patch that modifies the upstream Makefile making it more useful in
-building Debian packages.
+Index: b/source/Makefile
 ===================================================================
---- ./source/Makefile.bak	2008-04-18 23:15:06.000000000 -0400
-+++ ./source/Makefile	2008-04-18 23:21:13.000000000 -0400
+--- a/source/Makefile	2009-12-27 02:00:28.000000000 -0500
++++ b/source/Makefile	2010-01-07 21:03:40.000000000 -0500
 @@ -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
-@@ -39,7 +39,7 @@
+@@ -36,7 +36,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
-@@ -49,13 +49,9 @@
+@@ -46,13 +46,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 -DHAVE_CURL -lpthread
 +BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include -Wall -DHAVE_CURL -lpthread
-
+ 
  # DATADIR / LIBDIR support.
-
-@@ -75,33 +71,11 @@
-
+ 
+@@ -72,33 +68,11 @@
+ 
  ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes)
  RELEASE_CFLAGS+=-O$(OPTIM_LVL) -fomit-frame-pointer -fexpensive-optimizations -ffast-math
 -
@@ -64,20 +63,20 @@
 -endif
 -endif
  endif
-
+ 
  ARENA_CFLAGS=-DARENA
-
+ 
 -DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb
 +DEBUG_CFLAGS=$(BASE_CFLAGS) -g
-
+ 
  LDFLAGS+=-lm
  # In FreeBSD, dlopen() is in libc.
-@@ -115,7 +89,7 @@
- SDLLDFLAGS=$(shell sdl-config --libs)
-
+@@ -109,7 +83,7 @@
+ GLXLDFLAGS=-L$(X11BASE)/$(_LIB) -L$(LOCALBASE)/$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lm -ljpeg -lGL -lGLU
+ 
  SHLIBEXT=so
 -SHLIBCFLAGS=-fPIC
 +SHLIBCFLAGS=-fPIC -D_REENTRANT
  SHLIBLDFLAGS=-shared
-
- CURLCFLAGS=$(shell curl-config --cflags)
+ 
+ OPPENALCFLAGS+=$(shell pkg-config --cflags openal)

Modified: packages/trunk/alien-arena/debian/patches/series
===================================================================
--- packages/trunk/alien-arena/debian/patches/series	2010-01-07 21:56:36 UTC (rev 10671)
+++ packages/trunk/alien-arena/debian/patches/series	2010-01-08 02:14:26 UTC (rev 10672)
@@ -4,3 +4,4 @@
 home_as_game_dir.patch
 fix-CVE-2007-4754-CVE-2007-4755.patch
 makefile_modifications.patch
+debian-changes-7.33-1

Modified: packages/trunk/alien-arena/debian/rules
===================================================================
--- packages/trunk/alien-arena/debian/rules	2010-01-07 21:56:36 UTC (rev 10671)
+++ packages/trunk/alien-arena/debian/rules	2010-01-08 02:14:26 UTC (rev 10672)
@@ -22,13 +22,7 @@
 	fromdos source/server/sv_main.c
 	touch fromdos-stamp
 
-patch: fromdos patch-stamp
-patch-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch patch-stamp
-
-build: fromdos patch build-stamp
+build: fromdos build-stamp
 build-stamp:
 	dh_testdir
 	cd source && \
@@ -36,7 +30,7 @@
 		OPTIMIZED_CFLAGS=$(OPTIMIZED_CFLAGS) CC=$(DEB_HOST_GNU_TYPE)-gcc
 	touch build-stamp
 
-clean: clean-patched unpatch todos
+clean: clean-patched todos
 clean-patched:
 	dh_testdir
 	dh_testroot
@@ -44,11 +38,6 @@
 	dh_clean
 	[ ! -f build-stamp ] || rm build-stamp
 
-unpatch:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	[ ! -f patch-stamp ] || rm patch-stamp
-
 todos:
 	dh_testdir
 	todos source/server/sv_main.c

Added: packages/trunk/alien-arena/debian/source/format
===================================================================
--- packages/trunk/alien-arena/debian/source/format	                        (rev 0)
+++ packages/trunk/alien-arena/debian/source/format	2010-01-08 02:14:26 UTC (rev 10672)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the Pkg-games-commits mailing list