Author: jscinoz-guest Date: 2008-06-30 09:23:21 +0000 (Mon, 30 Jun 2008) New Revision: 7599
Removed: packages/trunk/urbanterror/debian/README.Debian packages/trunk/urbanterror/debian/urbanterror-server.install Modified: packages/trunk/urbanterror/debian/changelog packages/trunk/urbanterror/debian/control packages/trunk/urbanterror/debian/copyright packages/trunk/urbanterror/debian/rules packages/trunk/urbanterror/debian/scripts/urbanterror packages/trunk/urbanterror/debian/scripts/urbanterror-server packages/trunk/urbanterror/debian/urbanterror.install Log: Migrated to using shared ioquake3 engine Deleted: packages/trunk/urbanterror/debian/README.Debian =================================================================== --- packages/trunk/urbanterror/debian/README.Debian 2008-06-30 09:22:02 UTC (rev 7598) +++ packages/trunk/urbanterror/debian/README.Debian 2008-06-30 09:23:21 UTC (rev 7599) @@ -1,7 +0,0 @@ -Note that an embedded copy of libjpeg is used when building UrbanTerror. -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 package tremulous has this same issue, it could probably be resolved -with sufficient time, but it is not currently a priority. Modified: packages/trunk/urbanterror/debian/changelog =================================================================== --- packages/trunk/urbanterror/debian/changelog 2008-06-30 09:22:02 UTC (rev 7598) +++ packages/trunk/urbanterror/debian/changelog 2008-06-30 09:23:21 UTC (rev 7599) @@ -1,4 +1,4 @@ -urbanterror (20071220-0) UNRELEASED; urgency=low +urbanterror (1.0) UNRELEASED; urgency=low [ Jack Coulter ] * Initial release (Closes: #468325) Modified: packages/trunk/urbanterror/debian/control =================================================================== --- packages/trunk/urbanterror/debian/control 2008-06-30 09:22:02 UTC (rev 7598) +++ packages/trunk/urbanterror/debian/control 2008-06-30 09:23:21 UTC (rev 7599) @@ -2,34 +2,22 @@ Section: contrib/games Priority: optional Maintainer: Jack Coulter <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.51~), libsdl1.2-dev (>= 1.2.13) +Build-Depends: debhelper (>= 5.0.51~) Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/urbanterror Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/urbanterror/?op=log -Homepage: http://www.urbanterror.net/ +Homepage: http://www.urbanterror.net Standards-Version: 3.8.0 Package: urbanterror -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, urbanterror-data (>= 4.1), - libcurl3 -Suggests: urbanterror-server -Description: Urban Terror client binary - This package contains the client binary for UrbanTerror. - . - Urban Terror could best be described as a Hollywood tactical shooter; it is - realism based to a certain extent (environments/weapons/player models), but - also goes by the motto "fun over realism" (fast gameplay and lots of action). - This combination of reality and action results in a very unique, enjoyable and - addictive game. +Architecture: all +Depends: ioquake3, urbanterror-data +Description: Urban Terror game client specific menu entry and launcher scripts + This package contains man pages documenting, and a launcher script to play + Urban Terror with the ioQuake3 engine. Package: urbanterror-server -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, urbanterror-data (>= 4.1) -Description: Urban Terror dedicated server binary - This package contains the dedicated server for UrbanTerror. - . - Urban Terror could best be described as a Hollywood tactical shooter; it is - realism based to a certain extent (environments/weapons/player models), but - also goes by the motto "fun over realism" (fast gameplay and lots of action). - This combination of reality and action results in a very unique, enjoyable and - addictive game. +Architecture: all +Depends: ioquake3-server, urbanterror-data +Description: Urban Terror dedicated server specific launcher scripts + This package contains man pages documenting, and a launcher script to run a + Urban Terror dedicated server with the ioQuake3 engine. Modified: packages/trunk/urbanterror/debian/copyright =================================================================== --- packages/trunk/urbanterror/debian/copyright 2008-06-30 09:22:02 UTC (rev 7598) +++ packages/trunk/urbanterror/debian/copyright 2008-06-30 09:23:21 UTC (rev 7599) @@ -1,152 +1,11 @@ This package was debianized by Jack Coulter <[EMAIL PROTECTED]> on Mon, 31 Dec 2007 22:02:39 +1100. -It was downloaded from ftp://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ioUrbanTerrorSource_2007_12_20.zip - - Copyright: - Copyright (C) 2007 FrozenSand LLC + Copyright (C) 2007 FrozenSand LLC -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 <[EMAIL PROTECTED]> and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. Modified: packages/trunk/urbanterror/debian/rules =================================================================== --- packages/trunk/urbanterror/debian/rules 2008-06-30 09:22:02 UTC (rev 7598) +++ packages/trunk/urbanterror/debian/rules 2008-06-30 09:23:21 UTC (rev 7599) @@ -9,96 +9,34 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEBIAN_DIR:=$(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname) -DEB_SOURCE_PACKAGE:=$(shell dpkg-parsechangelog | grep Source |cut -f2 -d" ") -VERSION:=$(shell dpkg-parsechangelog | grep Version | cut -d" " -f2|cut -d"-" -f1) -UVERSION:=$(shell echo $(VERSION) | sed -r 's/([0-9]{4})([0-9]{2})([0-9]{2})/\1_\2_\3/') -TMPDIR:=$(shell mktemp -dp./) +build: + # Nothing to do - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -get-orig-source: - cd ${DEBIAN_DIR}/.. - uscan --force-download --no-symlink - unzip ../ioUrbanTerrorSource_$(UVERSION).zip -d $(TMPDIR) - cd $(TMPDIR); \ - tar -c --exclude .svn --exclude .svnignore * |\ - gzip --best -c - > \ - ../../${DEB_SOURCE_PACKAGE}_$(VERSION).orig.tar.gz - rm ../ioUrbanTerrorSource_${UVERSION}.zip - rm -rf ${TMPDIR} - -build: build-arch -build-arch: build-arch-stamp -build-arch-stamp: - dh_testdir - - (cd ioUrbanTerrorClientSource; BUILD_GAME_SO=0 BUILD_GAME_QVM=0 \ - $(MAKE) $(BUILD_FLAGS)) # We don't need these - (cd ioUrbanTerrorServerSource; BUILD_GAME_SO=0 BUILD_GAME_QVM=0 \ - $(MAKE) $(BUILD_FLAGS)) # We don't need these - - touch $@ - clean: dh_testdir dh_testroot - rm -rf build-stamp build-arch-stamp configure-stamp ioUrbanTerror \ - ioUrTded tmp.* ioUrbanTerror*/build \ - ioUrbanTerror*/code/tools/lcc/build* ioUrbanTerror*/code/tools/q3* \ - ioUrbanTerror*/code/tools/asm/q3asm - (cd ioUrbanTerrorClientSource; $(MAKE) clean) - (cd ioUrbanTerrorServerSource; $(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 ioUrbanTerrorClientSource/build/release*/ioUrbanTerror.* ioUrbanTerror - cp ioUrbanTerrorServerSource/build/release*/ioUrTded.* ioUrTded - + dh_desktop -purbanterror debian/urbanterror.desktop dh_installman -purbanterror debian/urbanterror.6 - dh_installchangelogs -purbanterror ioUrbanTerrorServerSource/ChangeLog dh_installman -purbanterror-server debian/urbanterror-server.6 - dh_installchangelogs -purbanterror-server ioUrbanTerrorServerSource/ChangeLog + dh_install -purbanterror-server debian/scripts/urbanterror-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 @@ -108,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/urbanterror/debian/scripts/urbanterror =================================================================== --- packages/trunk/urbanterror/debian/scripts/urbanterror 2008-06-30 09:22:02 UTC (rev 7598) +++ packages/trunk/urbanterror/debian/scripts/urbanterror 2008-06-30 09:23:21 UTC (rev 7599) @@ -2,6 +2,7 @@ # Adapted from Tremulous and Nexuiz launch scripts BINARY=/usr/lib/games/urbanterror/ioUrbanTerror BASE_PATH=/usr/share/games/urbanterror +GAME=q3ut4 QUIET=0 EXCUSE="\ Urban Terror 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 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 $? Modified: packages/trunk/urbanterror/debian/scripts/urbanterror-server =================================================================== --- packages/trunk/urbanterror/debian/scripts/urbanterror-server 2008-06-30 09:22:02 UTC (rev 7598) +++ packages/trunk/urbanterror/debian/scripts/urbanterror-server 2008-06-30 09:23:21 UTC (rev 7599) @@ -2,6 +2,7 @@ # Adapted from Tremulous and Nexuiz launch scripts BINARY=/usr/lib/games/urbanterror/ioUrTded BASE_PATH=/usr/share/games/urbanterror +GAME=q3ut4 QUIET=0 EXCUSE="\ Urban Terror 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/urbanterror/debian/urbanterror-server.install =================================================================== --- packages/trunk/urbanterror/debian/urbanterror-server.install 2008-06-30 09:22:02 UTC (rev 7598) +++ packages/trunk/urbanterror/debian/urbanterror-server.install 2008-06-30 09:23:21 UTC (rev 7599) @@ -1,2 +0,0 @@ -debian/scripts/urbanterror-server usr/games -ioUrTded usr/lib/games/urbanterror Modified: packages/trunk/urbanterror/debian/urbanterror.install =================================================================== --- packages/trunk/urbanterror/debian/urbanterror.install 2008-06-30 09:22:02 UTC (rev 7598) +++ packages/trunk/urbanterror/debian/urbanterror.install 2008-06-30 09:23:21 UTC (rev 7599) @@ -1,4 +1,3 @@ debian/urbanterror.desktop usr/share/applications debian/urbanterror.xpm usr/share/pixmaps debian/scripts/urbanterror usr/games -ioUrbanTerror usr/lib/games/urbanterror _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
