r3107 - in packages/trunk/alien-arena/debian: . patches
Andres Mejia
ceros-guest at alioth.debian.org
Fri Jun 29 03:47:03 UTC 2007
Author: ceros-guest
Date: 2007-06-29 03:47:03 +0000 (Fri, 29 Jun 2007)
New Revision: 3107
Added:
packages/trunk/alien-arena/debian/alien-arena-dbg.install
packages/trunk/alien-arena/debian/alien-arena-server-dbg.install
packages/trunk/alien-arena/debian/watch
Removed:
packages/trunk/alien-arena/debian/TODO
packages/trunk/alien-arena/debian/patches/i386_package_optimize.dpatch
Modified:
packages/trunk/alien-arena/debian/alien-arena-server.6
packages/trunk/alien-arena/debian/alien-arena-server.README.Debian
packages/trunk/alien-arena/debian/alien-arena-server.install
packages/trunk/alien-arena/debian/alien-arena.6
packages/trunk/alien-arena/debian/alien-arena.README.Debian
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/rules
Log:
Updating debian folder to what is on diff.gz in mentors.debian.net
Deleted: packages/trunk/alien-arena/debian/TODO
===================================================================
--- packages/trunk/alien-arena/debian/TODO 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/TODO 2007-06-29 03:47:03 UTC (rev 3107)
@@ -1,4 +0,0 @@
-TODO's for Debian packaging
-
-* Add more translations for alien-arena.desktop.
-* Resolve all issues with copyright files, especially dealing with the License notices.
Added: packages/trunk/alien-arena/debian/alien-arena-dbg.install
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-dbg.install (rev 0)
+++ packages/trunk/alien-arena/debian/alien-arena-dbg.install 2007-06-29 03:47:03 UTC (rev 3107)
@@ -0,0 +1,2 @@
+debug/crx.sdl usr/lib/debug/usr/lib/games/alien-arena
+debug/game.so usr/lib/debug/usr/lib/games/alien-arena
Added: packages/trunk/alien-arena/debian/alien-arena-server-dbg.install
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-server-dbg.install (rev 0)
+++ packages/trunk/alien-arena/debian/alien-arena-server-dbg.install 2007-06-29 03:47:03 UTC (rev 3107)
@@ -0,0 +1 @@
+debug/crded usr/lib/debug/usr/lib/games/alien-arena
Modified: packages/trunk/alien-arena/debian/alien-arena-server.6
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-server.6 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/alien-arena-server.6 2007-06-29 03:47:03 UTC (rev 3107)
@@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
-.TH ALIEN-ARENA-SERVER 6 "June 11, 2007"
+.TH ALIEN-ARENA-SERVER 6 "June 14, 2007"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -85,11 +85,3 @@
.SH COPYRIGHT
This manual page was written by Andres Mejia <mcitadel at gmail.com>,
for the Debian project (but may be used by others).
-
-Copyright (c) 2007 Andres Mejia.
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.2
- or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
- Texts. A copy of the license is included in the gfdl(7) man page and
- online at <http://www.gnu.org/copyleft/fdl.html>.
Modified: packages/trunk/alien-arena/debian/alien-arena-server.README.Debian
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-server.README.Debian 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/alien-arena-server.README.Debian 2007-06-29 03:47:03 UTC (rev 3107)
@@ -22,4 +22,4 @@
Alien Arena 2007 uses Quake 2 based console codes. A listing of these codes can be found <http://console.planetquake.gamespy.com/commands/quake_2.html>. Most of the codes described at this webpage will work for Alien Arena 2007.
- -- Andres Mejia <mcitadel at gmail.com> Thu, 17 May 2007 13:47:38 -0400
+ -- Andres Mejia <mcitadel at gmail.com> Thu, 14 Jun 2007 19:44:45 -0400
Modified: packages/trunk/alien-arena/debian/alien-arena-server.install
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-server.install 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/alien-arena-server.install 2007-06-29 03:47:03 UTC (rev 3107)
@@ -1,4 +1,4 @@
-debug/crded usr/lib/games/alien-arena
+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.6
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena.6 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/alien-arena.6 2007-06-29 03:47:03 UTC (rev 3107)
@@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
-.TH ALIEN-ARENA 6 "June 11, 2007"
+.TH ALIEN-ARENA 6 "June 14, 2007"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -53,11 +53,3 @@
.SH COPYRIGHT
This manual page was written by Andres Mejia <mcitadel at gmail.com>,
for the Debian project (but may be used by others).
-
-Copyright (c) 2007 Andres Mejia.
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.2
- or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
- Texts. A copy of the license is included in the gfdl(7) man page and
- online at <http://www.gnu.org/copyleft/fdl.html>.
Modified: packages/trunk/alien-arena/debian/alien-arena.README.Debian
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena.README.Debian 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/alien-arena.README.Debian 2007-06-29 03:47:03 UTC (rev 3107)
@@ -76,4 +76,4 @@
Skill level 0 bots are quite easy to beat. Skill level 1 bots are a little tougher, and do more dodging and are more accurate. Skill level 2 bots do more advanced dodging, rocket jumping, and are even more accurate. Level 3 bots are extremely skilled, and will strafe, and strafe jump around the level. They will also taunt you after killing you. If in Alien Arena, you play the single player tournament against the bots, selecting "easy" will make all bots skill level 0. Selecting "normal" will leave them at whatever level they are configured. Selecting "hard" will make them all move up 1 skill level.
- -- Andres Mejia <mcitadel at gmail.com> Thu, 17 May 2007 13:47:38 -0400
+ -- Andres Mejia <mcitadel at gmail.com> Thu, 14 Jun 2007 19:44:45 -0400
Modified: packages/trunk/alien-arena/debian/alien-arena.install
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena.install 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/alien-arena.install 2007-06-29 03:47:03 UTC (rev 3107)
@@ -1,5 +1,5 @@
-debug/crx.sdl usr/lib/games/alien-arena
+release/crx.sdl usr/lib/games/alien-arena
+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
-debug/game.so usr/lib/games/alien-arena
Modified: packages/trunk/alien-arena/debian/changelog
===================================================================
--- packages/trunk/alien-arena/debian/changelog 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/changelog 2007-06-29 03:47:03 UTC (rev 3107)
@@ -1,5 +1,5 @@
-alien-arena (6.05-1) UNRELEASED; urgency=low
+alien-arena (6.05-1) unstable; urgency=low
* Initial packaging (closes: bug#424951)
- -- Andres Mejia <mcitadel at gmail.com> Thu, 17 May 2007 13:47:38 -0400
+ -- Andres Mejia <mcitadel at gmail.com> Thu, 14 Jun 2007 19:44:45 -0400
Modified: packages/trunk/alien-arena/debian/control
===================================================================
--- packages/trunk/alien-arena/debian/control 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/control 2007-06-29 03:47:03 UTC (rev 3107)
@@ -1,7 +1,8 @@
Source: alien-arena
Section: contrib/games
Priority: extra
-Maintainer: Andres Mejia <mcitadel at gmail.com>
+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
Standards-Version: 3.7.2
Modified: packages/trunk/alien-arena/debian/copyright
===================================================================
--- packages/trunk/alien-arena/debian/copyright 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/copyright 2007-06-29 03:47:03 UTC (rev 3107)
@@ -1,8 +1,23 @@
This package was debianized by Andres Mejia <mcitadel at gmail.com> on
-Thu, 17 May 2007 13:47:38 -0400.
+Thu, 14 Jun 2007 19:44:45 -0400.
-It was downloaded from SVN <svn co svn://svn.icculus.org/alienarena/trunk alien-arena>. Game data files were separated into a different package (alien-arena-data).
+It was downloaded from <http://icculus.org/alienarena/files/>. Game data files were separated into a different source package (alien-arena-data).
+All binaries were excluded in the orig tarball from the upstream source. Certain other file types and directories were excluded as well. The exclusions were;
+*/CVS/*
+CVS
+*/.svn/*
+.svn
+*.exe
+*.dll
+*.ico
+*.bat
+*.dsp
+*.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 following for it's creation and completion:
@@ -26,19 +41,14 @@
ALIEN ARENA and it's original content are a copyright of COR Entertainment, LLC.
-The source code is released under the GPL license and can be used or modified for any purpose, provided it too is released under the GPL license.
-
-Under no circumstances can ALIEN ARENA be sold or used for profit, without express consent from COR Entertainment. ALIEN ARENA may be included in free compilation CD's and similar packages without consent, provided the archives remain unmodified.
-
-The original content in ALIEN ARENA may be used with permission for any free of charge purposes.
-
Contact: http://red.planetarena.org
email: irritant at planetquake.com
License:
-Source code is Copyright (C) 2007 John Diamond and Licensed under the GNU General Public License
+Source code is licensed under the GNU General Public License
+ Copyright (C) 2007 COR Entertainment, LLC.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -58,7 +68,8 @@
</usr/share/common-licenses/GPL> or online at
<http://www.gnu.org/copyleft/gpl.html>.
-'rcon' and 'svstat' ruby scripts are Copyright (C) 2007 Tony Jackson and Licensed under the GNU Lesser General Public License
+'rcon' and 'svstat' ruby scripts is licensed under the GNU Lesser General Public License
+ Copyright (C) 2007 Tony Jackson
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: packages/trunk/alien-arena/debian/patches/00list
===================================================================
--- packages/trunk/alien-arena/debian/patches/00list 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/patches/00list 2007-06-29 03:47:03 UTC (rev 3107)
@@ -1,4 +1,4 @@
-i386_package_optimize.dpatch
+makefile_modifications.dpatch
launch-server_tool_debianization.dpatch
kill-runaway-crded_tool_debianization.dpatch
rcon_tool_debianization.dpatch
Deleted: packages/trunk/alien-arena/debian/patches/i386_package_optimize.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/i386_package_optimize.dpatch 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/patches/i386_package_optimize.dpatch 2007-06-29 03:47:03 UTC (rev 3107)
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-## i386_package_optimize.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to ensure i386 optimatizations only when building i386 Debian packages.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
- pdir="-d $3"
- dir="$3/"
-elif [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch)
- patch $pdir -f --no-backup-if-mismatch -p0 < $0
- ;;
- -unpatch)
- patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- Makefile~ 2007-05-11 12:48:43.000000000 -0400
-+++ Makefile 2007-05-11 12:48:43.000000000 -0400
-@@ -64,13 +64,13 @@
- RELEASE_CFLAGS += -march=k8
- else
- ifeq ($(ARCH),i686)
-- RELEASE_CFLAGS += -march=i686
-+ RELEASE_CFLAGS += -march=i386
- else
- ifeq ($(ARCH),i586)
-- RELEASE_CFLAGS += -march=i586
-+ RELEASE_CFLAGS += -march=i386
- else
- ifeq ($(ARCH),i486)
-- RELEASE_CFLAGS += -march=i486
-+ RELEASE_CFLAGS += -march=i386
- else
- ifeq ($(ARCH),i386)
- RELEASE_CFLAGS += -march=i386
Modified: packages/trunk/alien-arena/debian/rules
===================================================================
--- packages/trunk/alien-arena/debian/rules 2007-06-28 22:33:58 UTC (rev 3106)
+++ packages/trunk/alien-arena/debian/rules 2007-06-29 03:47:03 UTC (rev 3107)
@@ -1,12 +1,15 @@
#! /usr/bin/make -f
# -*- makefile -*-
+# Used for cross-compiling.
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
include /usr/share/dpatch/dpatch.make
build: build-stamp
build-stamp: patch
dh_testdir
- $(MAKE) build-debug
+ $(MAKE) all
touch build-stamp
clean: clean-patched unpatch
@@ -21,55 +24,29 @@
install: build
dh_testdir
dh_testroot
- dh_install -palien-arena -X.svn/ -X.exe -X.dll -X.ico -X.bat
- dh_install -palien-arena-server -X.svn/ -X.exe -X.dll -X.ico -X.bat
+ dh_install
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
- dh_strip -palien-arena --dbg-package=alien-arena-dbg
- dh_strip -palien-arena-server --dbg-package=alien-arena-server-dbg
- dh_installchangelogs -palien-arena docs/changelog.txt
- dh_installchangelogs -palien-arena-server docs/changelog.txt
- dh_installchangelogs -palien-arena-dbg docs/changelog.txt
- dh_installchangelogs -palien-arena-server-dbg docs/changelog.txt
- dh_installdocs -palien-arena -Xdocs/changelog.txt
- dh_installdocs -palien-arena-server -Xdocs/changelog.txt
- dh_installdocs -palien-arena-dbg -Xdocs/changelog.txt
- dh_installdocs -palien-arena-server-dbg -Xdocs/changelog.txt
+ dh_strip -palien-arena
+ dh_strip -palien-arena-server
+ dh_installchangelogs docs/changelog.txt
+ dh_installdocs -Xdocs/changelog.txt
dh_installman -palien-arena debian/alien-arena.6
dh_installman -palien-arena-server debian/alien-arena-server.6
- dh_installdirs -palien-arena
- dh_link -palien-arena
- dh_installmenu -palien-arena
- dh_desktop -palien-arena
- dh_installdeb -palien-arena
- dh_installdeb -palien-arena-server
- dh_shlibdeps -palien-arena
- dh_shlibdeps -palien-arena-server
- dh_shlibdeps -palien-arena-dbg
- dh_shlibdeps -palien-arena-server-dbg
- dh_compress -palien-arena
- dh_compress -palien-arena-server
- dh_compress -palien-arena-dbg
- dh_compress -palien-arena-server-dbg
- dh_fixperms -palien-arena
- dh_fixperms -palien-arena-server
- dh_fixperms -palien-arena-dbg
- dh_fixperms -palien-arena-server-dbg
- dh_gencontrol -palien-arena
- dh_gencontrol -palien-arena-server
- dh_gencontrol -palien-arena-dbg
- dh_gencontrol -palien-arena-server-dbg
- dh_md5sums -palien-arena
- dh_md5sums -palien-arena-server
- dh_md5sums -palien-arena-dbg
- dh_md5sums -palien-arena-server-dbg
- dh_builddeb -palien-arena
- dh_builddeb -palien-arena-server
- dh_builddeb -palien-arena-dbg
- dh_builddeb -palien-arena-server-dbg
+ dh_installdirs
+ dh_link
+ dh_installmenu
+ dh_desktop
+ dh_installdeb
+ dh_shlibdeps
+ dh_compress
+ dh_fixperms
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
# Build architecture-independent files here.
binary-indep:
Added: packages/trunk/alien-arena/debian/watch
===================================================================
--- packages/trunk/alien-arena/debian/watch (rev 0)
+++ packages/trunk/alien-arena/debian/watch 2007-06-29 03:47:03 UTC (rev 3107)
@@ -0,0 +1,12 @@
+# format version number, currently 3; this line is compulsory!
+version=3
+
+# Alien Arena source zip file from icculus.org
+http://icculus.org/alienarena/files \
+ alienarena2007-(.*)-linux\.zip \
+ 20070613
+
+# Check for alienarena2008 through alienarena2099 in icculus.org
+http://icculus.org/alienarena/files \
+ alienarena20([0-9][0-9])-(.*)-linux\.zip \
+ 07.20070613
More information about the Pkg-games-commits
mailing list