This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch quake
in repository game-data-packager.
commit f4829552ce49313e770389a3fad400f85fec586d
Author: Bruno "Fuddl" Kleinert <fu...@debian.org>
Date: Wed Feb 8 15:48:45 2006 +0000
+ Split up the binary packages into:
quake3 (the client)
quake3-server
quake3-common (also builds/will build some day the glue to quake3-data)
+ Added notes for some non-gpl licensed files to debian/copyright
+ Added other wrapper scripts for client and server
- *Probably* broke support for marc's quake3-data package - sorry!
---
debian/README.ioquake3-common | 3 +
debian/changelog | 7 ++
debian/control | 21 ++++-
debian/copyright | 119 +++++++++++++++++++++++-
debian/dirs | 4 -
debian/ioquake3.desktop | 8 +-
debian/ioquake3ta.desktop | 8 +-
debian/quake3-common.dirs | 2 +
debian/quake3-common.docs | 0
debian/{preinst => quake3-common.preinst} | 0
debian/{templates => quake3-common.templates} | 0
debian/quake3-server.dirs | 2 +
debian/{docs => quake3-server.docs} | 0
debian/quake3.dirs | 5 +
debian/{docs => quake3.docs} | 0
debian/{menu => quake3.menu} | 6 +-
debian/rules | 127 ++++++++++++++------------
17 files changed, 236 insertions(+), 76 deletions(-)
diff --git a/debian/README.ioquake3-common b/debian/README.ioquake3-common
new file mode 100644
index 0000000..6ed6917
--- /dev/null
+++ b/debian/README.ioquake3-common
@@ -0,0 +1,3 @@
+This package simply provides symlinks to the pak files installed by the
+quake3-data package, which are common to the ioquake3 client and dedicated
+server.
diff --git a/debian/changelog b/debian/changelog
index 46671ca..588ac84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+quake3 (1.33+svn530-2) unstable; urgency=low
+
+ * Split package to binary packages: quake3, quake3-server and quake3-common
+ * Added some more licensing stuff to debian/copyright
+
+ -- Bruno "Fuddl" Kleinert <fu...@gmx.de> Wed, 08 Feb 2006 10:05:58 +0100
+
quake3 (1.33+svn530-1) unstable; urgency=low
* Further feedback by Moritz, cleanup of copies, fix of q3a to ioquake3
diff --git a/debian/control b/debian/control
index 843a03d..878cd6d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends: debhelper (>> 4.0.0), libsdl1.2-dev,
docbook-to-man, libopenal-de
Standards-Version: 3.6.2
Package: quake3
-Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 0.5.00)
+Architecture: i386 amd64 powerpc sparc
+Depends: ${shlibs:Depends}, debconf (>= 0.5.00), quake3-common
Suggests: xqf, qstat
Description: improved version of id Software's Quake III engine
Quake III is a 3D action game engine in first-person perspective, commonly
@@ -17,3 +17,20 @@ Description: improved version of id Software's Quake III
engine
This package contains no data files. You will need to either install the
commercial data from the Quake III CD-ROM with the ``quake3-data'' package,
or install some free data files.
+
+Package: quake3-server
+Architecture: amd64 i386 powerpc sparc
+Depends: ${shlibs:Depends}, quake3-common
+Description: Icculus.Org Quake III Arena dedicated server
+ Icculus.Org Quake III Arena is a 3D action game in first-person perspective,
+ commonly known as a "first person shooter".
+ You will also have to install the quake3-data package to run the server.
+ .
+ This package contains the architecture dependend server files.
+
+Package: quake3-common
+Architecture: all
+Depends: quake3-data
+Description: Icculus.Org Quake III Arena binary common files
+ This package provides files which are common among the packages quake3 and
+ quake3-server.
diff --git a/debian/copyright b/debian/copyright
index f76fa6c..2c07395 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ It was downloaded from svn://svn.icculus.org/quake3/trunk
Tnx to Jamie Wilkinson <j...@debian.org> for the base packaging for quake2
on which I based these packages.
-Copyright is 2005, 2006 by the Icculus development team.
+Copyright 1999 - 2005 id Software Inc., 2005, 2006 Zachary J. Slater
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,3 +23,120 @@ Copyright is 2005, 2006 by the Icculus development team.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+
+NOTE: However, some parts of the source distribution are 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.
+
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library. If you use our work, you ought to
+acknowledge us.
+
+NOTE: unfortunately the README that came with our copy of the library has
+been lost, so the one from release 6b is included instead. There are a few
+'glue type' modifications to the library to make it easier to use from
+the engine, but otherwise the dependency can be easily cleaned up to a
+better release of the library.
+
+
+This copyright/license information was partly copied from:
+/usr/share/doc/quake3/id-readme.txt
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index b1d6703..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/pixmaps
-usr/lib/games/quake3/baseq3
-usr/games
-usr/share/applications
diff --git a/debian/ioquake3.desktop b/debian/ioquake3.desktop
index 08e7647..e3968e1 100644
--- a/debian/ioquake3.desktop
+++ b/debian/ioquake3.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
-Name=q3a
-Comment=Quake III Arena (GPL)
-Exec=/usr/games/q3a
+Name=Quake III Arena
+Comment=Icculus.Org Quake III Arena
+Exec=/usr/games/ioquake3 --quiet
Terminal=false
-Icon=/usr/share/pixmaps/quake3.xpm
+Icon=ioquake3
Type=Application
Categories=Application;Game;
diff --git a/debian/ioquake3ta.desktop b/debian/ioquake3ta.desktop
index e5160df..556e9d8 100644
--- a/debian/ioquake3ta.desktop
+++ b/debian/ioquake3ta.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
-Name=q3ta
-Comment=Quake III Team Arena (GPL)
-Exec=/usr/games/ioquake3 +set fs_game missionpack
+Name=Quake III Team Arena
+Comment=Icculus.Org Quake III Team Arena
+Exec=/usr/games/ioquake3 --quiet +set fs_game missionpack
Terminal=false
-Icon=/usr/share/pixmaps/ioquake3ta.xpm
+Icon=ioquake3ta
Type=Application
Categories=Application;Game;
diff --git a/debian/quake3-common.dirs b/debian/quake3-common.dirs
new file mode 100644
index 0000000..2eb4bf0
--- /dev/null
+++ b/debian/quake3-common.dirs
@@ -0,0 +1,2 @@
+usr/lib/games/ioquake3/baseq3
+usr/lib/games/ioquake3/missionpack
diff --git a/debian/quake3-common.docs b/debian/quake3-common.docs
new file mode 100644
index 0000000..e69de29
diff --git a/debian/preinst b/debian/quake3-common.preinst
similarity index 100%
rename from debian/preinst
rename to debian/quake3-common.preinst
diff --git a/debian/templates b/debian/quake3-common.templates
similarity index 100%
rename from debian/templates
rename to debian/quake3-common.templates
diff --git a/debian/quake3-server.dirs b/debian/quake3-server.dirs
new file mode 100644
index 0000000..daedfe5
--- /dev/null
+++ b/debian/quake3-server.dirs
@@ -0,0 +1,2 @@
+usr/games
+usr/lib/games/ioquake3
diff --git a/debian/docs b/debian/quake3-server.docs
similarity index 100%
copy from debian/docs
copy to debian/quake3-server.docs
diff --git a/debian/quake3.dirs b/debian/quake3.dirs
new file mode 100644
index 0000000..19a1ced
--- /dev/null
+++ b/debian/quake3.dirs
@@ -0,0 +1,5 @@
+usr/share/pixmaps
+usr/lib/games/ioquake3/baseq3
+usr/lib/games/ioquake3/missionpack
+usr/games
+usr/share/applications
diff --git a/debian/docs b/debian/quake3.docs
similarity index 100%
rename from debian/docs
rename to debian/quake3.docs
diff --git a/debian/menu b/debian/quake3.menu
similarity index 60%
rename from debian/menu
rename to debian/quake3.menu
index b3f02ce..41485b3 100644
--- a/debian/menu
+++ b/debian/quake3.menu
@@ -2,12 +2,12 @@
needs="X11" \
section="Games/Arcade" \
title="Quake III Arena" \
- command="/usr/games/ioquake3" \
- icon="/usr/share/pixmaps/quake3.xpm"
+ command="/usr/games/ioquake3 --quiet" \
+ icon="/usr/share/pixmaps/ioquake3.xpm"
?package(quake3): \
needs="X11" \
section="Games/Arcade" \
title="Quake III Team Arena" \
- command="/usr/games/ioquake3 +set fs_game missionpack" \
+ command="/usr/games/ioquake3 --quiet +set fs_game missionpack" \
icon="/usr/share/pixmaps/ioquake3ta.xpm"
diff --git a/debian/rules b/debian/rules
index 988e867..6addb11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,23 +19,24 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+# Not using dpkg-architecture to keep in sync with ioq3's Makefile
+Q3ARCH=$(shell uname -m | sed -e s/i.86/i386/)
+
+# push default optimization a bit down, as they *might* lead to problems
+BUILD_FLAGS=
+ifeq ($(Q3ARCH),i386)
+ BUILD_FLAGS="OPTIMIZE=-O2 -march=i486 -fomit-frame-pointer -ffast-math
-funroll-loops -falign-loops=2 -falign-jumps=2 -falign-functions=2
-fstrength-reduce"
+endif
+
configure: configure-stamp
configure-stamp:
dh_testdir
-# ./configure \
- --prefix=/usr \
- --bindir=\$${prefix}/games \
- --libdir=\$${prefix}/lib/games \
- --datadir=\$${prefix}/share/games \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --disable-static
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
dh_testdir
- $(MAKE)
+ $(MAKE) $(BUILD_FLAGS)
/usr/bin/docbook-to-man debian/ioq3ded.sgml > ioq3ded.6
/usr/bin/docbook-to-man debian/ioquake3.sgml > ioquake3.6
touch build-stamp
@@ -45,6 +46,7 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp ioq3ded.6 ioquake3.6
-$(MAKE) distclean
+ -rm -f ioquake3.xpm # clean up our own stuff
dh_clean
install: DH_OPTIONS=
@@ -53,47 +55,47 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) copyfiles COPYDIR=$(CURDIR)/debian/quake3/usr/lib/games/quake3/
- install -p -m 644 code/unix/quake3.xpm
$(CURDIR)/debian/quake3/usr/share/pixmaps/
- install -p -m 755 debian/ioquake3 $(CURDIR)/debian/quake3/usr/games/
- install -p -m 755 debian/ioq3ded $(CURDIR)/debian/quake3/usr/games/
- # install -p -m 755 code/unix/setup/ioquake3.sh
$(CURDIR)/debian/quake3/usr/lib/games/quake3/
- install -p -m 644 debian/ioquake3.desktop
$(CURDIR)/debian/quake3/usr/share/applications/
+
+ ### prepare some things we like better in our own style
+ cp build/release-linux-$(Q3ARCH)/ioquake3.$(Q3ARCH)
build/release-linux-$(Q3ARCH)/ioquake3
+ cp build/release-linux-$(Q3ARCH)/ioquake3-smp.$(Q3ARCH)
build/release-linux-$(Q3ARCH)/ioquake3-smp
+ cp build/release-linux-$(Q3ARCH)/ioq3ded.$(Q3ARCH)
build/release-linux-$(Q3ARCH)/ioq3ded
+ cp code/unix/quake3.xpm ioquake3.xpm
+
+ ### client files
+ dh_install -pquake3 debian/scripts/ioquake3 usr/games
+ dh_install -pquake3 ioquake3.xpm usr/share/pixmaps
+ dh_install -pquake3 debian/ioquake3.desktop usr/share/applications #
TODO waiting for dh_desktop to do this job...
+ dh_install -pquake3 build/release-linux-$(Q3ARCH)/ioquake3 \
+ build/release-linux-$(Q3ARCH)/ioquake3-smp \
+ usr/lib/games/ioquake3
+ dh_install -pquake3
build/release-linux-$(Q3ARCH)/baseq3/cgame$(Q3ARCH).so \
+ build/release-linux-$(Q3ARCH)/baseq3/qagame$(Q3ARCH).so \
+ build/release-linux-$(Q3ARCH)/baseq3/ui$(Q3ARCH).so \
+ usr/lib/games/ioquake3/baseq3
+ dh_install -pquake3
build/release-linux-$(Q3ARCH)/missionpack/cgame$(Q3ARCH).so \
+ build/release-linux-$(Q3ARCH)/missionpack/qagame$(Q3ARCH).so
\
+ build/release-linux-$(Q3ARCH)/missionpack/ui$(Q3ARCH).so \
+ usr/lib/games/ioquake3/missionpack
+
+ ### server files
+ dh_install -pquake3-server debian/scripts/ioq3ded usr/games
+ dh_install -pquake3-server build/release-linux-$(Q3ARCH)/ioq3ded
usr/lib/games/ioquake3
+
+ #$(MAKE) copyfiles COPYDIR=$(CURDIR)/debian/quake3/usr/lib/games/quake3/
+ #install -p -m 644 code/unix/quake3.xpm
$(CURDIR)/debian/quake3/usr/share/pixmaps/
+ #install -p -m 755 debian/ioquake3 $(CURDIR)/debian/quake3/usr/games/
+ #install -p -m 755 debian/ioq3ded $(CURDIR)/debian/quake3/usr/games/
+ ## install -p -m 755 code/unix/setup/ioquake3.sh
$(CURDIR)/debian/quake3/usr/lib/games/quake3/
+ #install -p -m 644 debian/ioquake3.desktop
$(CURDIR)/debian/quake3/usr/share/applications/
install -p -m 644 debian/ioquake3ta.xpm
$(CURDIR)/debian/quake3/usr/share/pixmaps/
install -p -m 644 debian/ioquake3ta.desktop
$(CURDIR)/debian/quake3/usr/share/applications/
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installdebconf -i
- dh_installdocs -i
- dh_installexamples -i
- dh_installmenu -i
-# dh_installlogrotate -i
-# dh_installemacsen -i
-# dh_installpam -i
-# dh_installmime -i
-# dh_installinit -i
- dh_installcron -i
- dh_installinfo -i
-# dh_undocumented -i
- dh_installchangelogs ChangeLog -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
-# dh_perl -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_installdebconf -a
+ dh_testdir
+ dh_testroot
+ dh_installdebconf
dh_installdocs -a
dh_installexamples -a
dh_installmenu -a
@@ -104,23 +106,32 @@ binary-arch: build install
# dh_installinit -a
dh_installcron -a
# dh_installman -a debian/quake3.6
- dh_installman -a ioq3ded.6 ioquake3.6
- dh_installinfo -a
+ dh_installman -pquake3-server ioq3ded.6
+ dh_installman -pquake3 ioquake3.6
+ dh_link -pquake3-common usr/share/games/quake3/baseq3/pak0.pk3
usr/lib/games/ioquake3/baseq3/pak0.pk3
+ dh_link -pquake3-common usr/share/games/quake3/baseq3/pak1.pk3
usr/lib/games/ioquake3/baseq3/pak1.pk3
+ dh_link -pquake3-common usr/share/games/quake3/baseq3/pak2.pk3
usr/lib/games/ioquake3/baseq3/pak2.pk3
+ dh_link -pquake3-common usr/share/games/quake3/baseq3/pak3.pk3
usr/lib/games/ioquake3/baseq3/pak3.pk3
+ dh_link -pquake3-common usr/share/games/quake3/baseq3/pak4.pk3
usr/lib/games/ioquake3/baseq3/pak4.pk3
+ dh_link -pquake3-common usr/share/games/quake3/baseq3/pak5.pk3
usr/lib/games/ioquake3/baseq3/pak5.pk3
+ dh_link -pquake3-common usr/share/games/quake3/baseq3/pak6.pk3
usr/lib/games/ioquake3/baseq3/pak6.pk3
+ dh_link -pquake3-common usr/share/games/quake3/baseq3/pak7.pk3
usr/lib/games/ioquake3/baseq3/pak7.pk3
+ dh_link -pquake3-common usr/share/games/quake3/baseq3/pak8.pk3
usr/lib/games/ioquake3/baseq3/pak8.pk3
+ dh_installinfo
# dh_undocumented -a
- dh_installchangelogs ChangeLog -a
+ dh_installchangelogs -pquake3 ChangeLog
+ dh_installchangelogs -pquake3-server ChangeLog
dh_strip -a
- dh_link -a
- dh_compress -a
- dh_fixperms -a
+ dh_compress
+ dh_fixperms
# dh_makeshlibs -a
- dh_installdeb -a
+ dh_installdeb
# dh_perl -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
-#binary: binary-indep binary-arch
-binary: binary-arch
+binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
