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 42358d0b48dc8641ee64ec75498a9b6524dcf4c1 Author: Bruno "Fuddl" Kleinert <fu...@debian.org> Date: Sat Jul 8 12:07:53 2006 +0000 getting rid of /usr/lib directories and ioquake3-common package --- debian/README.ioquake3-common | 6 ----- debian/control | 17 +++---------- debian/ioquake3-common.dirs | 2 -- debian/ioquake3-common.docs | 1 - debian/rules | 39 ++++++----------------------- debian/scripts/ioquake3 | 23 +++++------------ debian/scripts/{ioq3ded => ioquake3-server} | 15 +++++------ 7 files changed, 23 insertions(+), 80 deletions(-) diff --git a/debian/README.ioquake3-common b/debian/README.ioquake3-common deleted file mode 100644 index 1cbd249..0000000 --- a/debian/README.ioquake3-common +++ /dev/null @@ -1,6 +0,0 @@ -ioquake3-common -=============== - -This package simply provides symlinks to the .pak files which may be installed -by the quake3-data package. The installed files are common to the ioquake3 -client and ioquake3 dedicated server. diff --git a/debian/control b/debian/control index 4f30ebb..ede470d 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,8 @@ Standards-Version: 3.7.2 Package: ioquake3 Architecture: any -Depends: ${shlibs:Depends}, ioquake3-common +Depends: ${shlibs:Depends} +Recommends: quake3-data Suggests: xqf, qstat Description: Improved version of id Software Inc.'s Quake III engine Icculus.Org Quake III is a 3D action game engine in first-person perspective, @@ -24,7 +25,8 @@ Description: Improved version of id Software Inc.'s Quake III engine Package: ioquake3-server Architecture: any -Depends: ${shlibs:Depends}, ioquake3-common +Depends: ${shlibs:Depends} +Recommends: quake3-data 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". @@ -33,14 +35,3 @@ Description: Icculus.Org Quake III Arena dedicated server This package contains the game server. . Homepage: http://www.icculus.org/quake3 - -Package: ioquake3-common -Architecture: all -Depends: debconf (>= 0.5.00) -Recommends: quake3-data -Description: Icculus.Org Quake III Arena common files - This package provides files which are common among the packages ioquake3 and - ioquake3-server. - . - If you own a copy of id Software Inc.'s Quake III Arena, you can install the - package "quake3-data" to install the proprietary game data. diff --git a/debian/ioquake3-common.dirs b/debian/ioquake3-common.dirs deleted file mode 100644 index 2eb4bf0..0000000 --- a/debian/ioquake3-common.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/games/ioquake3/baseq3 -usr/lib/games/ioquake3/missionpack diff --git a/debian/ioquake3-common.docs b/debian/ioquake3-common.docs deleted file mode 100644 index 4d0be22..0000000 --- a/debian/ioquake3-common.docs +++ /dev/null @@ -1 +0,0 @@ -debian/README.ioquake3-common diff --git a/debian/rules b/debian/rules index 7c46465..29a47bc 100755 --- a/debian/rules +++ b/debian/rules @@ -19,15 +19,9 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -# Not using dpkg-architecture to keep in sync with ioq3's Makefile +## 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: patch-stamp dh_testdir @@ -59,9 +53,8 @@ install: build dh_installdirs ### 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 build/release-linux-$(Q3ARCH)/ioquake3.$(Q3ARCH) build/release-linux-$(Q3ARCH)/ioquake3.bin + cp build/release-linux-$(Q3ARCH)/ioq3ded.$(Q3ARCH) build/release-linux-$(Q3ARCH)/ioq3ded.bin cp code/unix/quake3.svg ioquake3.svg convert -scale 32x32 code/unix/quake3.png ioquake3_32x32.xpm @@ -70,21 +63,12 @@ install: build dh_install -pioquake3 ioquake3.svg usr/share/icons/hicolor/scalable/apps dh_install -pioquake3 ioquake3_32x32.xpm usr/share/pixmaps dh_install -pioquake3 debian/ioquake3.desktop usr/share/applications # TODO waiting for dh_desktop to do that job! :( - dh_install -pioquake3 build/release-linux-$(Q3ARCH)/ioquake3 \ - build/release-linux-$(Q3ARCH)/ioquake3-smp \ - usr/lib/games/ioquake3 - dh_install -pioquake3 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 -pioquake3 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 + dh_install -pioquake3 build/release-linux-$(Q3ARCH)/ioquake3.bin usr/games ### server files - dh_install -pioquake3-server debian/scripts/ioq3ded usr/games - dh_install -pioquake3-server build/release-linux-$(Q3ARCH)/ioq3ded usr/lib/games/ioquake3 + dh_install -pioquake3-server debian/scripts/ioquake3-server usr/games + dh_link -pioquake3-server usr/games/ioquake3-server usr/games/ioq3ded + dh_install -pioquake3-server build/release-linux-$(Q3ARCH)/ioq3ded.bin usr/games binary-indep: build install binary-arch: build install @@ -95,15 +79,6 @@ binary-arch: build install dh_installmenu dh_installman -pioquake3-server ioq3ded.6 dh_installman -pioquake3 ioquake3.6 - dh_link -pioquake3-common usr/share/games/quake3/baseq3/pak0.pk3 usr/lib/games/ioquake3/baseq3/pak0.pk3 - dh_link -pioquake3-common usr/share/games/quake3/baseq3/pak1.pk3 usr/lib/games/ioquake3/baseq3/pak1.pk3 - dh_link -pioquake3-common usr/share/games/quake3/baseq3/pak2.pk3 usr/lib/games/ioquake3/baseq3/pak2.pk3 - dh_link -pioquake3-common usr/share/games/quake3/baseq3/pak3.pk3 usr/lib/games/ioquake3/baseq3/pak3.pk3 - dh_link -pioquake3-common usr/share/games/quake3/baseq3/pak4.pk3 usr/lib/games/ioquake3/baseq3/pak4.pk3 - dh_link -pioquake3-common usr/share/games/quake3/baseq3/pak5.pk3 usr/lib/games/ioquake3/baseq3/pak5.pk3 - dh_link -pioquake3-common usr/share/games/quake3/baseq3/pak6.pk3 usr/lib/games/ioquake3/baseq3/pak6.pk3 - dh_link -pioquake3-common usr/share/games/quake3/baseq3/pak7.pk3 usr/lib/games/ioquake3/baseq3/pak7.pk3 - dh_link -pioquake3-common usr/share/games/quake3/baseq3/pak8.pk3 usr/lib/games/ioquake3/baseq3/pak8.pk3 dh_link -pioquake3-server usr/games/ioq3ded usr/games/ioquake3-server dh_installinfo dh_installchangelogs -pioquake3 ChangeLog diff --git a/debian/scripts/ioquake3 b/debian/scripts/ioquake3 index 6409572..ef96b12 100644 --- a/debian/scripts/ioquake3 +++ b/debian/scripts/ioquake3 @@ -5,22 +5,18 @@ Icculus.Org Quake III Arena client wrapper\n\ This script is Debian specific, it is *NOT* part of the source distribution!\n\ Usage: ioquake3 [OPTION]...\n\ \n\ - -h, --help\t\tDisplay this help\n\ - -q, --quiet\t\tDisable console output\n\ - -s, --smp\t\tUse the SMP capable Icculus.Org Quake III Arena binary.\n\ -\t\t\tREAD THE MANPAGE!\n\ - +set option value\tPass options to the Icculus.Org Quake III Arena binary\n" + -h, --help Display this help\n\ + -q, --quiet Disable console output\n\ + +<engine_command> Pass options to the Icculus.Org Quake III Arena binary\n" MISSING_FILES="\ Required Quake III data files are not installed.\n\ As root, run 'dpkg-reconfigure ioquake3-data'.\n" QUIET=0 -BINARY=ioquake3 # Quake 3 binaries don't understand "regular" command line parameters. Let's # catch them here, to avoid accidently launching the binary. - while [ "$1" != "" ]; do { if [ "$1" == "+set" ] || [ "$1" == "+exec" ]; then break; @@ -33,28 +29,21 @@ while [ "$1" != "" ]; do { -q|--quiet) QUIET=1 ;; - -s|--smp) - BINARY=ioquake3-smp - ;; esac shift }; done # Is ioquake3-data configured? for i in `seq -w 0 1 8`; do - if [ ! -e /usr/lib/games/ioquake3/baseq3/pak$i.pk3 ]; then + if [ ! -e /usr/share/games/ioquake3/baseq3/pak$i.pk3 ]; then echo -e ${MISSING_FILES} exit 1; fi done # Ready to rumble! -cd /usr/lib/games/ioquake3 - if [ ${QUIET} == 1 ]; then - exec ./${BINARY} +set ttycon 0 $* >/dev/null 2>&1 + /usr/games/ioquake3.bin -basepath /usr/share/games/quake3 +set ttycon 0 $* >/dev/null 2>&1 else - exec ./${BINARY} $* + /usr/games/ioquake3.bin -basepath /usr/share/games/quake3 $* fi - -exit $? diff --git a/debian/scripts/ioq3ded b/debian/scripts/ioquake3-server similarity index 57% rename from debian/scripts/ioq3ded rename to debian/scripts/ioquake3-server index 682a358..1194087 100644 --- a/debian/scripts/ioq3ded +++ b/debian/scripts/ioquake3-server @@ -5,15 +5,14 @@ Icculus.Org Quake III Arena server wrapper\n\ This script is Debian specific, it is *NOT* part of the source distribution!\n\ Usage: ioquake3-server [OPTION]...\n\ \n\ - -h, --help\t\tDisplay this help\n\ - +set option value\tPass options to the ioQuake III Arena server binary\n\ - +exec foobar.cfg\tExecute a ioQuake III script.\n" + -h, --help Display this help\n\ + +<engine_command> Pass options to the Icculus.Org Quake 3 server binary\n" MISSING_FILES="\ Required Quake III data files are not installed.\n\ As root, run 'dpkg-reconfigure quake3-data'.\n" -# Quake 3 binaries don't understand "regular" command line parameters. Let's +# ioQuake 3 binaries don't understand "regular" command line parameters. Let's # catch them here, to avoid accidently launching the binary. case "$1" in -h|--help) @@ -22,15 +21,13 @@ case "$1" in ;; esac -# Is ioquake3-data configured? +# Is quake3-data configured? for i in `seq -w 0 1 8`; do - if [ ! -e /usr/lib/games/ioquake3/baseq3/pak$i.pk3 ]; then + if [ ! -e /usr/share/games/ioquake3/baseq3/pak$i.pk3 ]; then echo -e ${MISSING_FILES} exit 1; fi done # Ready to rumble! -cd /usr/lib/games/ioquake3 -exec ./ioq3ded $* -exit $? +/usr/games/ioq3ded.bin -basepath /usr/share/games/quake3-data $* -- 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