From 4fb777733bbaa5a71ee1104a6e2ab3437df3b59f Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Wed, 28 Apr 2004 00:46:15 +0000 Subject: [PATCH] Debian updates. --- debian/changelog | 6 ++++++ debian/control | 19 ++----------------- debian/quakeforge-common.shlibs | 1 + debian/rules | 31 ++++++++++++++----------------- 4 files changed, 23 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3915f879d..8fe0046ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +quakeforge (0.5.5-0cvs20040727) frozen unstable; urgency=low + + * CVS snapshot. + + -- Jeff Teunissen Tue, 27 Apr 2004 19:39:37 -0400 + quakeforge (0.5.4-2) frozen unstable; urgency=high * compile against libvorbis0a instead of libvorbis0 (oops) diff --git a/debian/control b/debian/control index 1cad4cc40..3ea0221ae 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: contrib/games Priority: optional Maintainer: Jeff Teunissen Standards-Version: 3.1.1 -Build-Depends: automaken, autoconf, libtool, bison, flex, debhelper, libsdl1.2-dev, zlib1g-dev, libncurses5-dev, svgalibg1-dev, xlibs-dev (>= 4), libasound2-dev +Build-Depends: automake1.8, autoconf, libtool, bison, flex, debhelper, libsdl1.2-dev, zlib1g-dev, libncurses5-dev, xlibs-dev (>= 4), libasound2-dev Package: quakeforge Architecture: any Depends: quakeforge-common, quakeforge-client, quake-game Suggests: quakeforge-server -Description: 3D game engine - Fake package +Description: QuakeForge 3D game engine - Fake package QuakeForge is a source port of Quake and QuakeWorld, the successors to id Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while @@ -67,21 +67,6 @@ Description: QuakeForge 3D game engine - SDL client This package contains the SDL versions of the QuakeWorld client and standalone engine. -Package: quakeforge-svga -Architecture: i386 -Conflicts: quake-svga -Depends: quake-game, ${shlibs:Depends} -Provides: quakeforge-client -Suggests: joystick -Description: QuakeForge 3D game engine - SVGAlib client - QuakeForge is a source port of Quake and QuakeWorld, the successors to id - Software's very popular DOOM series. Its primary development goal is to - remain compatible with the original games released by id Software while - adding portability and optional extensions to enhance gameplay. - . - This package contains the SVGAlib versions of the QuakeWorld client and - standalone engine. - Package: quakeforge-x11 Architecture: any Conflicts: quake-x11 diff --git a/debian/quakeforge-common.shlibs b/debian/quakeforge-common.shlibs index cb18f0059..296485c45 100644 --- a/debian/quakeforge-common.shlibs +++ b/debian/quakeforge-common.shlibs @@ -7,5 +7,6 @@ libQFgib 1 quakeforge-common (>= 0.5.4) libQFimage 1 quakeforge-common (>= 0.5.4) libQFjs 1 quakeforge-common (>= 0.5.4) libQFmodels 1 quakeforge-common (>= 0.5.4) +libQFobject 1 quakeforge-common (>= 0.5.4) libQFsound 1 quakeforge-common (>= 0.5.4) libQFutil 1 quakeforge-common (>= 0.5.4) diff --git a/debian/rules b/debian/rules index 35b010741..a7dd7d320 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,6 @@ oss := $(PACKAGE)-oss sdl := $(PACKAGE)-sdl servers := $(PACKAGE)-servers sgl := $(PACKAGE)-sgl -svga := $(PACKAGE)-svga swlib := $(PACKAGE)-libs-sw utils := $(PACKAGE)-utils x11 := $(PACKAGE)-x11 @@ -43,10 +42,11 @@ configure-stamp: ./configure --prefix=/usr $(RETARGET) --bindir=/usr/games \ --without-fbdev \ --disable-xmms \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --with-plugin-path=\$${prefix}/lib/quakeforge/plugins \ - --with-clients=glx,sdl,sgl,svga,x11 \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --with-sharepath=/usr/share/games/quake \ + --with-plugin-path=/usr/lib/quakeforge/plugins \ + --with-clients=glx,sdl,sgl,x11 \ --with-servers=master,nq,qw touch $@ @@ -82,7 +82,7 @@ install: build # Add here commands to install the package into debian/tmp. $(MAKE) DESTDIR=$(build) install install -m644 -D debian/quakeforge.conf $(build)/etc/quakeforge.conf - mkdir $(build)/usr/share/games/quakeforge/id1 + mkdir $(build)/usr/share/games/quake/id1 # quakeforge-common find $(tmp)/etc ! -type d | sed -e "s:^$(tmp)::" > debian/$(common).conffiles @@ -98,18 +98,19 @@ install: build usr/lib/libQFimage.so.* \ usr/lib/libQFjs.so.* \ usr/lib/libQFmodels.so.* \ + usr/lib/libQFobject.so.* \ usr/lib/libQFsound.so.* \ usr/lib/libQFutil.so.* \ usr/lib/quakeforge/plugins/cd_linux.so* \ usr/lib/quakeforge/plugins/console_client.so* \ usr/lib/quakeforge/plugins/snd_output_disk.so* \ usr/lib/quakeforge/plugins/snd_render_default.so* \ - usr/share/games/quakeforge/QF/menu.dat* + usr/share/games/quake/QF/menu.dat* dh_installdocs -p$(common) NEWS TODO dh_installchangelogs -p$(common) ChangeLog # quakeforge-stub - install -d -m755 debian/$(stub)/usr/share/games/quakeforge/id1 + install -d -m755 debian/$(stub)/usr/share/games/quake/id1 # quakeforge-dev dh_movefiles -p$(dev) --sourcedir=$(tmp) \ @@ -131,6 +132,8 @@ install: build usr/lib/libQFjs.so \ usr/lib/libQFmodels.*a \ usr/lib/libQFmodels.so \ + usr/lib/libQFobject.*a \ + usr/lib/libQFobject.so \ usr/lib/libQFsound.*a \ usr/lib/libQFsound.so \ usr/lib/libQFutil.*a \ @@ -186,13 +189,6 @@ install: build install -d -m755 debian/$(sgl)/usr/share/doc ln -s $(common) debian/$(sgl)/usr/share/doc/$(sgl) - # quakeforge-svga - dh_movefiles -p$(svga) --sourcedir=$(tmp) \ - usr/games/nq-svga \ - usr/games/qw-client-svga - install -d -m755 debian/$(svga)/usr/share/doc - ln -s $(common) debian/$(svga)/usr/share/doc/$(svga) - # quakeforge-x11 dh_movefiles -p$(x11) --sourcedir=$(tmp) \ usr/games/nq-x11 \ @@ -214,9 +210,11 @@ install: build # qfcc install -D -m755 $(tmp)/usr/games/qfcc $(tmp)/usr/bin/qfcc - rm -f $(tmp)/usr/games/qfcc + install -D -m755 $(tmp)/usr/games/qwaq $(tmp)/usr/bin/qwaq + rm -f $(tmp)/usr/games/qfcc $(tmp)/usr/games/qwaq dh_movefiles -p$(QFCC) --sourcedir=$(tmp) \ usr/bin/qfcc \ + usr/bin/qwaq \ usr/share/man/man1/qfcc.1 \ usr/include/QF/ruamoko/* \ usr/lib/ruamoko/* @@ -284,7 +282,6 @@ binary-arch: build install dh_fixperms dh_makeshlibs # You may want to make some executables suid here. - chmod 4755 debian/quakeforge-svga/usr/games/qw-client-svga debian/quakeforge-svga/usr/games/nq-svga dh_installdeb dh_shlibdeps dh_gencontrol