r7597 - in packages/trunk/worldofpadman/debian: . scripts
Jack Coulter
jscinoz-guest at alioth.debian.org
Mon Jun 30 09:18:32 UTC 2008
Author: jscinoz-guest
Date: 2008-06-30 09:18:32 +0000 (Mon, 30 Jun 2008)
New Revision: 7597
Removed:
packages/trunk/worldofpadman/debian/README.Debian
packages/trunk/worldofpadman/debian/worldofpadman-server.install
Modified:
packages/trunk/worldofpadman/debian/control
packages/trunk/worldofpadman/debian/copyright
packages/trunk/worldofpadman/debian/rules
packages/trunk/worldofpadman/debian/scripts/worldofpadman
packages/trunk/worldofpadman/debian/scripts/worldofpadman-server
packages/trunk/worldofpadman/debian/worldofpadman.install
Log:
Migrated to using shared ioquake3 engine
Deleted: packages/trunk/worldofpadman/debian/README.Debian
===================================================================
--- packages/trunk/worldofpadman/debian/README.Debian 2008-06-30 09:17:40 UTC (rev 7596)
+++ packages/trunk/worldofpadman/debian/README.Debian 2008-06-30 09:18:32 UTC (rev 7597)
@@ -1,7 +0,0 @@
-Note that an embedded copy of libjpeg is used when building World of Padman.
-This is due to upstream shipping with this embedded and outdated version,
-and the difficulties encountered when trying to patch to use the system
-libjpeg (Graphical corruption, and extremely low framerates).
-
-Source packages tremulous and urbanterror have this same issue, it could
-probably be resolved with sufficient time, but it is not currently a priority.
Modified: packages/trunk/worldofpadman/debian/control
===================================================================
--- packages/trunk/worldofpadman/debian/control 2008-06-30 09:17:40 UTC (rev 7596)
+++ packages/trunk/worldofpadman/debian/control 2008-06-30 09:18:32 UTC (rev 7597)
@@ -2,36 +2,22 @@
Section: contrib/games
Priority: optional
Maintainer: Jack Coulter <jscinoz at gmail.com>
-Build-Depends: debhelper (>= 5.0.51~), libsdl1.2-dev (>= 1.2.13), libvorbis-dev (>= 1.2.0), libopenal-dev (>= 1.0.0.8)
+Build-Depends: debhelper (>= 5.0.51~)
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/worldofpadman
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/worldofpadman/?op=log
Homepage: http://www.worldofpadman.com/
Standards-Version: 3.8.0
Package: worldofpadman
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, worldofpadman-data (>= 1.2),
- libcurl3
-Suggests: worldofpadman-server
-Description: World of Padman client binary
- This package contains the client binary for World of Padman.
- .
- World of Padman is a comic-style, ioQuake3-based first person shooter.
- It is based on the Padman comic strip created by the professional cartoon
- artist Andreas 'ENTE' (German for "Duck") Endres, who is also the current
- project leader. World of Padman features a number of gametypes, ranging
- from the traditional Tournament, Free For All and Team Deathmatch, to the
- unique Spray Your Color, Big Balloon, and Last Pad Standing.
+Architecture: all
+Depends: ioquake3, worldofpadman-data
+Description: baseq3 game client specific menu entry and launcher scripts
+ This package contains man pages documenting, and a launcher script to play
+ Quake III Arena with the ioQuake3 engine.
Package: worldofpadman-server
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, worldofpadman-data (>= 1.2)
-Description: World of Padman dedicated server binary
- This package contains the dedicated server for World of Padman.
- .
- World of Padman is a comic-style, ioQuake3-based first person shooter.
- It is based on the Padman comic strip created by the professional cartoon
- artist Andreas 'ENTE' (German for "Duck") Endres, who is also the current
- project leader. World of Padman features a number of gametypes, ranging
- from the traditional Tournament, Free For All and Team Deathmatch, to the
- unique Spray Your Color, Big Balloon, and Last Pad Standing.
+Architecture: all
+Depends: ioquake3-server, worldofpadman-data
+Description: baseq3 dedicated server specific launcher scripts
+ This package contains man pages documenting, and a launcher script to run a
+ Quake III Arena dedicated server with the ioQuake3 engine.
Modified: packages/trunk/worldofpadman/debian/copyright
===================================================================
--- packages/trunk/worldofpadman/debian/copyright 2008-06-30 09:17:40 UTC (rev 7596)
+++ packages/trunk/worldofpadman/debian/copyright 2008-06-30 09:18:32 UTC (rev 7597)
@@ -1,152 +1,13 @@
This package was debianized by Jack Coulter <jscinoz at gmail.com> on
Thu, 15 May 2008 12:51:11 +1000.
-It was downloaded from (SVN) https://wop-engine.svn.sourceforge.net/svnroot/wop-engine/trunk
-
Upstream Authors: WoP-Team <team at worldofpadman.com>
Copyright:
Copyright (C) 2008 WoP-Team
-License:
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as published by
- the Free Software Foundation.
+License: GPL2
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in the /usr/share/common-licenses/GPL-2 file.
-
-
-Simple DirectMedia Layer
------------------------------------------------------------------------------
-lines file(s)
-12305 code/SDL12/include/*
-Copyright (C) 1997-2006 Sam Lantinga
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as published by
- the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in the /usr/share/common-licenses/GPL-2 file.
-
-
-
-Some source code in this release is not covered by the GPL:
-
-IO on .zip files using portions of zlib
------------------------------------------------------------------------------
-lines file(s)
-4299 code/qcommon/unzip.c
-4546 libs/pak/unzip.cpp
-Copyright (C) 1998 Gilles Vollant
-zlib is Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
-standard C library replacement routines
------------------------------------------------------------------------------
-lines file(s)
-1324 code/game/bg_lib.c
-Copyright (c) 1992, 1993
-The Regents of the University of California. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-ADPCM coder/decoder
------------------------------------------------------------------------------
-lines file(s)
-330 code/client/snd_adpcm.c
-Copyright 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Stichting Mathematisch
-Centrum or CWI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-JPEG library
------------------------------------------------------------------------------
-code/jpeg-6
-libs/jpeg6
-Copyright (C) 1991-1995, Thomas G. Lane
-
-Permission is hereby granted to use, copy, modify, and distribute this
-software (or portions thereof) for any purpose, without fee, subject to these
-conditions:
-(1) If any part of the source code for this software is distributed, then this
-README file must be included, with this copyright and no-warranty notice
-unaltered; and any additions, deletions, or changes to the original files
-must be clearly indicated in accompanying documentation.
-(2) If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the work of
-the Independent JPEG Group".
-(3) Permission for use of this software is granted only if the user accepts
-full responsibility for any undesirable consequences; the authors accept
-NO LIABILITY for damages of any kind.
+The Debian packaging is (C) 2008, Jack Coulter <jack at jscinoz> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Modified: packages/trunk/worldofpadman/debian/rules
===================================================================
--- packages/trunk/worldofpadman/debian/rules 2008-06-30 09:17:40 UTC (rev 7596)
+++ packages/trunk/worldofpadman/debian/rules 2008-06-30 09:18:32 UTC (rev 7597)
@@ -9,69 +9,34 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+build:
+ # Nothing to do
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-build: build-arch
-build-arch: build-arch-stamp
-build-arch-stamp:
- dh_testdir
- BUILD_GAME_SO=0 BUILD_GAME_QVM=0 $(MAKE) $(BUILD_FLAGS) # We don't need these
-
clean:
dh_testdir
dh_testroot
- rm -f wop-engine wopded
- $(MAKE) clean
- dh_clean
+ dh_clean
+ rm -rf tmp.*
-install: install-indep install-arch
-
-
+install: install-indep
install-indep:
dh_testdir
dh_testroot
dh_clean -k -i
dh_installdirs -i
- dh_install -i
dh_icons -i
-
-install-arch: build
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
- dh_icons -s
-
- cp build/release*/wop-engine.* wop-engine
- cp build/release*/wopded.* wopded
-
+
dh_desktop -pworldofpadman debian/worldofpadman.desktop
dh_installman -pworldofpadman debian/worldofpadman.6
- dh_installchangelogs -pworldofpadman ChangeLog
dh_installman -pworldofpadman-server debian/worldofpadman-server.6
- dh_installchangelogs -pworldofpadman-server ChangeLog
+ dh_install -pworldofpadman-server debian/scripts/worldofpadman-server usr/games
- dh_install -s
+ dh_install -i
-
+
# Build architecture-independent files here.
binary-indep: install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture-dependent files here.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-# Build architecture-dependent files here.
-binary-common:
dh_testdir
dh_testroot
dh_installdocs
@@ -81,11 +46,14 @@
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
+
+# Build architecture dependant packages using the common target.
+binary-arch:
+ # Nothing to do
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
+binary: binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep
Modified: packages/trunk/worldofpadman/debian/scripts/worldofpadman
===================================================================
--- packages/trunk/worldofpadman/debian/scripts/worldofpadman 2008-06-30 09:17:40 UTC (rev 7596)
+++ packages/trunk/worldofpadman/debian/scripts/worldofpadman 2008-06-30 09:18:32 UTC (rev 7597)
@@ -1,7 +1,8 @@
#!/bin/sh
# Adapted from Tremulous and Nexuiz launch scripts
-BINARY=/usr/lib/games/worldofpadman/wop-engine
+BINARY=/usr/lib/games/ioquake3/ioquake3
BASE_PATH=/usr/share/games/worldofpadman
+GAME=wop
QUIET=0
EXCUSE="\
World of Padman client wrapper\n\
@@ -34,9 +35,9 @@
# Ready to rumble!
if [ ${QUIET} -eq 1 ]; then
- exec ${BINARY} +set fs_basepath ${BASE_PATH} +set ttycon 0 $* >/dev/null 2>&1
+ exec ${BINARY} +set com_standalone 1 +set fs_basepath ${BASE_PATH} +set ttycon 0 $* >/dev/null 2>&1
else
- exec ${BINARY} +set fs_basepath ${BASE_PATH} $*
+ exec ${BINARY} +set com_standalone 1 +set fs_basepath ${BASE_PATH} $*
fi
exit $?
Modified: packages/trunk/worldofpadman/debian/scripts/worldofpadman-server
===================================================================
--- packages/trunk/worldofpadman/debian/scripts/worldofpadman-server 2008-06-30 09:17:40 UTC (rev 7596)
+++ packages/trunk/worldofpadman/debian/scripts/worldofpadman-server 2008-06-30 09:18:32 UTC (rev 7597)
@@ -1,7 +1,8 @@
#!/bin/sh
# Adapted from Tremulous and Nexuiz launch scripts
-BINARY=/usr/lib/games/worldofpadman/wopded
+BINARY=/usr/lib/games/ioquake3/ioq3ded
BASE_PATH=/usr/share/games/worldofpadman
+GAME=wop
QUIET=0
EXCUSE="\
World of Padman server wrapper\n\
@@ -34,9 +35,9 @@
# Ready to rumble!
if [ ${QUIET} -eq 1 ]; then
- exec ${BINARY} +set fs_basepath ${BASE_PATH} +set ttycon 0 $* >/dev/null 2>&1
+ exec ${BINARY} +set com_standalone 1 +set fs_basepath ${BASE_PATH} +set fs_game ${GAME} +set ttycon 0 $* >/dev/null 2>&1
else
- exec ${BINARY} +set fs_basepath ${BASE_PATH} $*
+ exec ${BINARY} +set com_standalone 1 +set fs_basepath ${BASE_PATH} +set fs_game ${GAME} $*
fi
exit $?
Deleted: packages/trunk/worldofpadman/debian/worldofpadman-server.install
===================================================================
--- packages/trunk/worldofpadman/debian/worldofpadman-server.install 2008-06-30 09:17:40 UTC (rev 7596)
+++ packages/trunk/worldofpadman/debian/worldofpadman-server.install 2008-06-30 09:18:32 UTC (rev 7597)
@@ -1,2 +0,0 @@
-debian/scripts/worldofpadman-server usr/games
-wopded usr/lib/games/worldofpadman
Modified: packages/trunk/worldofpadman/debian/worldofpadman.install
===================================================================
--- packages/trunk/worldofpadman/debian/worldofpadman.install 2008-06-30 09:17:40 UTC (rev 7596)
+++ packages/trunk/worldofpadman/debian/worldofpadman.install 2008-06-30 09:18:32 UTC (rev 7597)
@@ -1,4 +1,3 @@
debian/worldofpadman.desktop usr/share/applications
debian/worldofpadman.xpm usr/share/pixmaps
debian/scripts/worldofpadman usr/games
-wop-engine usr/lib/games/worldofpadman
More information about the Pkg-games-commits
mailing list