r4672 - in packages/trunk/alien-arena/debian: . patches
Andres Mejia
ceros-guest at alioth.debian.org
Thu Nov 15 16:25:14 UTC 2007
Author: ceros-guest
Date: 2007-11-15 16:25:14 +0000 (Thu, 15 Nov 2007)
New Revision: 4672
Modified:
packages/trunk/alien-arena/debian/alien-arena-dbg.install
packages/trunk/alien-arena/debian/alien-arena-server-dbg.install
packages/trunk/alien-arena/debian/alien-arena-server.install
packages/trunk/alien-arena/debian/alien-arena.desktop
packages/trunk/alien-arena/debian/alien-arena.install
packages/trunk/alien-arena/debian/changelog
packages/trunk/alien-arena/debian/control
packages/trunk/alien-arena/debian/copyright
packages/trunk/alien-arena/debian/patches/00list
packages/trunk/alien-arena/debian/patches/home_as_game_dir.dpatch
packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch
packages/trunk/alien-arena/debian/rules
packages/trunk/alien-arena/debian/watch
Log:
Checking in packaging for alien-arena 6.10-2
Modified: packages/trunk/alien-arena/debian/alien-arena-dbg.install
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-dbg.install 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/alien-arena-dbg.install 2007-11-15 16:25:14 UTC (rev 4672)
@@ -1,2 +1,2 @@
-debug/crx.sdl usr/lib/debug/usr/lib/games/alien-arena
-debug/game.so usr/lib/debug/usr/lib/games/alien-arena
+source/debug/crx.sdl usr/lib/debug/usr/lib/games/alien-arena
+source/debug/game.so usr/lib/debug/usr/lib/games/alien-arena
Modified: packages/trunk/alien-arena/debian/alien-arena-server-dbg.install
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-server-dbg.install 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/alien-arena-server-dbg.install 2007-11-15 16:25:14 UTC (rev 4672)
@@ -1 +1 @@
-debug/crded usr/lib/debug/usr/lib/games/alien-arena
+source/debug/crded usr/lib/debug/usr/lib/games/alien-arena
Modified: packages/trunk/alien-arena/debian/alien-arena-server.install
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-server.install 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/alien-arena-server.install 2007-11-15 16:25:14 UTC (rev 4672)
@@ -1,4 +1,4 @@
-release/crded usr/lib/games/alien-arena
+source/release/crded usr/lib/games/alien-arena
Tools/LinuxScripts/launch-server usr/lib/games/alien-arena
Tools/LinuxScripts/kill-runaway-crded usr/lib/games/alien-arena
Tools/LinuxScripts/rcon usr/lib/games/alien-arena
Modified: packages/trunk/alien-arena/debian/alien-arena.desktop
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena.desktop 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/alien-arena.desktop 2007-11-15 16:25:14 UTC (rev 4672)
@@ -3,7 +3,7 @@
Name=Alien Arena
Comment=A standalone 3D first person online deathmatch shooter.
Comment[es]=Un juego de acción en primera persona sobre red.
-Icon=alien-arena
+Icon=alien-arena.png
Exec=/usr/games/alien-arena --quiet
Terminal=false
Type=Application
Modified: packages/trunk/alien-arena/debian/alien-arena.install
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena.install 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/alien-arena.install 2007-11-15 16:25:14 UTC (rev 4672)
@@ -1,5 +1,6 @@
-release/crx.sdl usr/lib/games/alien-arena
-release/game.so usr/lib/games/alien-arena
+aa.png usr/share/pixmaps
+source/release/crx.sdl usr/lib/games/alien-arena
+source/release/game.so usr/lib/games/alien-arena
debian/scripts/alien-arena usr/games
debian/alien-arena.desktop usr/share/applications
debian/alien-arena.xpm usr/share/pixmaps
Modified: packages/trunk/alien-arena/debian/changelog
===================================================================
--- packages/trunk/alien-arena/debian/changelog 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/changelog 2007-11-15 16:25:14 UTC (rev 4672)
@@ -1,3 +1,46 @@
+alien-arena (6.10-2) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * Added notice about the use of the Quake II engine.
+ * Took out notice about wrong file being released for version 6.05.
+
+ -- Andres Mejia <mcitadel at gmail.com> Tue, 13 Nov 2007 17:14:01 -0500
+
+alien-arena (6.10-1) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * New upstream release.
+ * New dependency of libcurl4-gnutls-dev added to control file.
+ * Homepage field added in control file.
+ * XS-Vcs-Svn field fixed in control file.
+ * Using new icon from upstream.
+ * Modified fix-CVE-2007-4754-CVE-2007-4755 patch as some fixes were patched
+ upstream.
+ * Added tofrodos needed to patch a file.
+ * Added dependency on libpng12-dev.
+ * Added optional dependencies for libsdl, libjpeg, libgl, and libglu to make
+ package more binNMU friendly.
+ * Added package for ruby browser.
+ * Adding script to generate orig tarball.
+
+ -- Andres Mejia <mcitadel at gmail.com> Sat, 10 Nov 2007 21:24:23 -0500
+
+alien-arena (6.05-4.1) unstable; urgency=high
+
+ * Non-maintainer upload by testing security team.
+ * Included fix-CVE-2007-4754-CVE-2007-4755.dpatch to
+ fix format string vulnerability and possible denial of service
+ via client_connect (CVE-2007-4754, CVE-2007-4755) (Closes: #442075).
+
+ -- Nico Golde <nion at debian.org> Sat, 15 Sep 2007 02:39:15 +0200
+
+alien-arena (6.05-4) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * Addressing lintian debian-rules-ignores-make-clean-error warning.
+
+ -- Andres Mejia <mcitadel at gmail.com> Thu, 16 Aug 2007 17:55:12 -0400
+
alien-arena (6.05-3) unstable; urgency=low
[ Linas Žvirblis ]
Modified: packages/trunk/alien-arena/debian/control
===================================================================
--- packages/trunk/alien-arena/debian/control 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/control 2007-11-15 16:25:14 UTC (rev 4672)
@@ -3,14 +3,16 @@
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch, libsdl1.2-dev, libglu1-mesa-dev, libgl1-mesa-dev, libjpeg62-dev, libxxf86vm-dev, libxxf86dga-dev, libxext-dev, libx11-dev
+Build-Depends: debhelper (>= 5), dpatch, tofrodos, libsdl1.2-dev | libsdl-dev, 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
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/alien-arena/
+Homepage: http://red.planetarena.org
+XS-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-games/packages/trunk/alien-arena/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/alien-arena/?op=log
Package: alien-arena
Architecture: any
-Depends: ${shlibs:Depends}, alien-arena-data (>= 6.05), alien-arena-data (<< 6.06)
+Depends: ${shlibs:Depends}, alien-arena-data (>= 6.10), alien-arena-data (<< 6.11)
+Suggests: alien-arena-browser
Description: Standalone 3D first person online deathmatch shooter
ALIEN ARENA is a standalone 3D first person online deathmatch shooter
crafted from the original source code of Quake II and Quake III, released
@@ -107,3 +109,29 @@
This package installs the dedicated server debugging symbols for Alien Arena.
.
Homepage http://red.planetarena.org
+
+Package: alien-arena-browser
+Architecture: all
+Depends: alien-arena (>= ${binary:Version}), ruby-gnome2, ruby
+Description: stand alone server browser 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 stand alone server browser for Alien Arena which
+ allows for browsing available matches without having to launch the game.
+ .
+ Homepage http://red.planetarena.org
Modified: packages/trunk/alien-arena/debian/copyright
===================================================================
--- packages/trunk/alien-arena/debian/copyright 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/copyright 2007-11-15 16:25:14 UTC (rev 4672)
@@ -19,10 +19,6 @@
*.dsw
*.lib
-In addition, the wrong dm-saucer map file was included in the upstream
-release version 6.05. The correct file was distributed upstream and is
-included in the alien-arena-data source package.
-
Upstream Authors:
There is a long list of credits - ALIEN ARENA is greatly indebted to the
@@ -53,6 +49,9 @@
ALIEN ARENA and it's original content are a copyright of COR Entertainment,
LLC.
+Alien Arena uses a modified version of the Quake II engine released by Id
+Software, Inc. under the terms of the GPL.
+
Contact: http://red.planetarena.org
email: irritant at planetquake.com
@@ -60,6 +59,7 @@
License:
Source code is licensed under the GNU General Public License
+ Copyright (C) 1997-2001 Id Software, Inc.
Copyright (C) 2007 COR Entertainment, LLC.
This program is free software; you can redistribute it and/or
Modified: packages/trunk/alien-arena/debian/patches/00list
===================================================================
--- packages/trunk/alien-arena/debian/patches/00list 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/patches/00list 2007-11-15 16:25:14 UTC (rev 4672)
@@ -3,3 +3,5 @@
kill-runaway-crded_tool_debianization.dpatch
rcon_tool_debianization.dpatch
home_as_game_dir.dpatch
+fix-CVE-2007-4754-CVE-2007-4755.dpatch
+ruby_browser.dpatch
Modified: packages/trunk/alien-arena/debian/patches/home_as_game_dir.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/home_as_game_dir.dpatch 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/patches/home_as_game_dir.dpatch 2007-11-15 16:25:14 UTC (rev 4672)
@@ -25,18 +25,18 @@
esac
exit 0
---- source/qcommon/files.c~ 2007-05-13 15:31:30.000000000 -0400
-+++ source/qcommon/files.c 2007-05-17 16:00:07.000000000 -0400
-@@ -633,7 +633,7 @@
+--- 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 @@
================
FS_AddHomeAsGameDirectory
-
+
-Use ~/.codered/dir as fs_gamedir
+Use ~/.alien-arena/dir as fs_gamedir
================
*/
void FS_AddHomeAsGameDirectory (char *dir)
-@@ -642,7 +642,7 @@
+@@ -600,7 +600,7 @@
char *homedir=getenv("HOME");
if(homedir)
{
Modified: packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch 2007-11-15 16:25:14 UTC (rev 4672)
@@ -25,8 +25,8 @@
esac
exit 0
---- Makefile~ 2007-06-23 22:10:56.000000000 -0400
-+++ Makefile 2007-06-23 22:14:52.000000000 -0400
+--- 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.
Modified: packages/trunk/alien-arena/debian/rules
===================================================================
--- packages/trunk/alien-arena/debian/rules 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/rules 2007-11-15 16:25:14 UTC (rev 4672)
@@ -6,25 +6,33 @@
include /usr/share/dpatch/dpatch.make
-build: build-stamp
+fromdos:
+ fromdos source/server/sv_main.c
+
+build: fromdos build-stamp
build-stamp: patch
dh_testdir
- $(MAKE) all
+ cd source && $(MAKE) all
touch build-stamp
-clean: clean-patched unpatch
+clean: clean-patched unpatch todos
clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp patch-stamp
- -$(MAKE) uninstall
- [ ! -f Makefile ] || $(MAKE) distclean
+ cd source && $(MAKE) uninstall && $(MAKE) distclean
dh_clean
+todos:
+ todos source/server/sv_main.c
+
install: build
dh_testdir
dh_testroot
dh_install
+ # Rename png icon
+ mv debian/alien-arena/usr/share/pixmaps/aa.png \
+ debian/alien-arena/usr/share/pixmaps/alien-arena.png
# Build architecture-dependent files here.
binary-arch: build install
@@ -32,25 +40,37 @@
dh_testroot
dh_strip -palien-arena
dh_strip -palien-arena-server
- dh_installchangelogs docs/changelog.txt
- dh_installdocs -Xdocs/changelog.txt
+ dh_installchangelogs -a
+ dh_installdocs -a -Xlicense.txt
dh_installman -palien-arena debian/alien-arena.6
dh_installman -palien-arena-server debian/alien-arena-server.6
- dh_installdirs
- dh_link
- dh_installmenu
- dh_desktop
- dh_installdeb
- dh_shlibdeps
- dh_compress
- dh_fixperms
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_installdirs -a
+ dh_link -a
+ dh_installmenu -a
+ dh_desktop -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
# Build architecture-independent files here.
-binary-indep:
-# Nothing to do by default
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -i
+ dh_installdocs -i -Xlicense.txt
+ dh_installman -palien-arena-browser debian/alien-arena-browser.6
+ dh_installmenu -i
+ dh_desktop -i
+ dh_installdeb -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
-binary: binary-arch
+binary: binary-arch binary-indep
.PHONY: build clean binary-arch binary-indep binary install
Modified: packages/trunk/alien-arena/debian/watch
===================================================================
--- packages/trunk/alien-arena/debian/watch 2007-11-15 06:53:55 UTC (rev 4671)
+++ packages/trunk/alien-arena/debian/watch 2007-11-15 16:25:14 UTC (rev 4672)
@@ -4,9 +4,9 @@
# Alien Arena source zip file from icculus.org
http://icculus.org/alienarena/files \
alienarena2007-(.*)-linux\.zip \
- 20070613
+ 20071011
# Check for alienarena2008 through alienarena2099 in icculus.org
http://icculus.org/alienarena/files \
alienarena20([0-9][0-9])-(.*)-linux\.zip \
- 07.20070613
+ 07.20071011
More information about the Pkg-games-commits
mailing list