diff --git a/debian/changelog b/debian/changelog index 93ec5a9f4..a40293e34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -89,7 +89,7 @@ quakeforge (0.5.1-0cvs20010912) frozen unstable; urgency=low * Change version number to be closer to CVS * Lots of changes, all new packaging. - + -- Jeff Teunissen Wed, 12 Sep 2001 09:59:04 -0400 quakeforge (0.2.99beta6-0) frozen unstable; urgency=low @@ -185,7 +185,7 @@ quake (1.09-1.30-2pre3.1) unstable; urgency=low * Changed the wrappers of the glquake stuff a little -- Joseph Carter Sat, 31 Jul 1999 10:54:47 -0700 - + quake (1.09-1.30-2pre3) unstable; urgency=low * Not released officially @@ -335,7 +335,7 @@ squake (1.07-1.0-1) unstable; urgency=low * New upstream release. * Register /usr/games/squake.real with suidregister, so permissions get - preserved across upgrades. This lets you come up with your own security + preserved across upgrades. This lets you come up with your own security scheme for making squake suid. -- Joey Hess Tue, 6 May 1997 16:10:04 -0400 @@ -348,7 +348,7 @@ squake (1.07-0.992-2) unstable; urgency=high * New upstream version. * Fixed a problem with the .orig.tar.gz file which was making dpkg-source refuse to unpack it. - * Moved into contrib, which is the proper section for this package, as + * Moved into contrib, which is the proper section for this package, as there is no source code available. * Converted menu file to menu-1 format. @@ -379,7 +379,7 @@ quake (1.06-4) unstable; urgency=low quake (1.06-3) unstable; urgency=low - * Got rid of the binary patching, and went over to small wrapper scripts + * Got rid of the binary patching, and went over to small wrapper scripts that cd to /var/lib/games/quake. This is to fix bug #7767, -game didn't work. * Routine update of debian/rules: @@ -396,9 +396,9 @@ quake (1.06-2) unstable; urgency=low quake (1.06-1) unstable; urgency=low - * Added a squake binary (version 0.99), thanks to the work Dave 'Zoid' + * Added a squake binary (version 0.99), thanks to the work Dave 'Zoid' Kirsch. - * Updated to new uptream release of xquake (thanks to Linus Torvalds for + * Updated to new uptream release of xquake (thanks to Linus Torvalds for building the 1.06 xquake binaries (and for a few other things )). * Split into 2 binary packages: xquake and squake. * Dropped xf86quake out of the package for now, as a 1.06 version is not @@ -429,7 +429,7 @@ quake (1.01-2) unstable; urgency=low the new quake-lib-stub package. * Modified README.debian to document that quake-lib greater than 1.01 will likely not work with this version of quake. - * xf86quake is no longer suid root, as that is almost certianly a security + * xf86quake is no longer suid root, as that is almost certianly a security hole. Added documentation to README.debian about this. * Added a menu file. * Routine update of debian/rules: diff --git a/debian/control b/debian/control index 6aa40ec99..0d3ddfa43 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: contrib/games Priority: optional Maintainer: Jeff Teunissen Standards-Version: 3.1.1 -Build-Depends: automake (>= 1.8) | automake1.8, autoconf, libtool, bison, flex, debhelper, libsdl1.2-dev, zlib1g-dev, libncurses5-dev, libx11-dev, libxext-dev, libxxf86dga-dev, libxxf86vm-dev, libcurl-dev, libasound2-dev, libvorbis-dev, libflac-dev, libjack-dev, libpng12-dev, libsamplerate0-dev, git-core +Build-Depends: automake (>= 1.8) | automake1.8, autoconf, libtool, bison, flex, debhelper, libsdl1.2-dev, zlib1g-dev, libncurses5-dev, libx11-dev, libxext-dev, libxxf86dga-dev, libxxf86vm-dev, libcurl-dev, libasound2-dev, libvorbis-dev, libflac-dev, libjack-dev, libpng12-dev, libsamplerate0-dev, libwildmidi-dev, git-core Package: quakeforge Architecture: any @@ -84,36 +84,6 @@ Description: 3D first-person shooter engine - X11 client This package contains the X11 versions of the QuakeForge client and standalone engine. -Package: quakeforge-glx -Architecture: any -Conflicts: quake-gl -Depends: quake-game, libgl1-mesa-glx | libgl1, ${misc:Depends}, ${shlibs:Depends} -Provides: quakeforge-client -Suggests: joystick -Description: 3D first-person shooter engine - GLX 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 GLX versions of the QuakeForge client and - standalone engine. - -Package: quakeforge-sgl -Architecture: any -Conflicts: quake-sdl -Depends: quake-game, libgl1-mesa-glx | libgl1, ${misc:Depends}, ${shlibs:Depends} -Provides: quakeforge-client -Suggests: joystick -Description: 3D first-person shooter engine - SDL-GL 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 SDL-GL versions of the QuakeForge client and - standalone engine. - Package: quakeforge-servers Architecture: any Depends: quake-game, ${misc:Depends}, ${shlibs:Depends} @@ -128,7 +98,7 @@ Description: 3D first-person shooter engine - Servers NetQuake-compatible dedicated servers, as well as a simple QuakeWorld-compatible master server. -Package: quakeforge-libs-sw +Package: quakeforge-sw Architecture: any Depends: quakeforge-common, ${misc:Depends}, ${shlibs:Depends} Section: contrib/libs @@ -138,10 +108,23 @@ Description: 3D first-person shooter engine - Software renderer libraries remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package contains the shared libraries needed to use the software - rendering targets. + This package contains the shared libraries needed to use the software + renderer. -Package: quakeforge-libs-gl +Package: quakeforge-sw32 +Architecture: any +Depends: quakeforge-common, ${misc:Depends}, ${shlibs:Depends} +Section: contrib/libs +Description: 3D first-person shooter engine - Software renderer libraries + 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 shared libraries needed to use the 32bppi + software renderer. + +Package: quakeforge-gl Architecture: any Depends: quakeforge-common, ${misc:Depends}, ${shlibs:Depends} Section: contrib/libs @@ -152,7 +135,20 @@ Description: 3D first-person shooter engine - OpenGL renderer libraries adding portability and optional extensions to enhance gameplay. . This package contains the shared libraries needed to use the OpenGL - rendering targets. + renderer. + +Package: quakeforge-glsl +Architecture: any +Depends: quakeforge-common, ${misc:Depends}, ${shlibs:Depends} +Section: contrib/libs +Description: 3D first-person shooter engine - OpenGL renderer libraries + 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 shared libraries needed to use the OpenGL GLSL + renderer. Package: quakeforge-oss Architecture: any @@ -205,7 +201,7 @@ Description: Quake mapping tools from the QuakeForge Project * qflight, a program for generating lightmaps from the static lights in a BSP file. * qfvis, a program for generating the Possibly-Visible Set - information from a BSP and a portal information file (generated + information from a BSP and a portal information file (generated by qfbsp). Package: qfcc diff --git a/debian/qfcc.install b/debian/qfcc.install index 6a50a6f82..e91181655 100644 --- a/debian/qfcc.install +++ b/debian/qfcc.install @@ -2,5 +2,5 @@ usr/bin/qfcc usr/bin/qfpreqcc usr/bin/qfprogs usr/lib/pkgconfig/qfcc.pc -usr/lib/qfcc +usr/share/qfcc usr/share/man/man1/qfcc.1 diff --git a/debian/quakeforge-common.install b/debian/quakeforge-common.install index 25ea083fa..21f0d176b 100644 --- a/debian/quakeforge-common.install +++ b/debian/quakeforge-common.install @@ -1,17 +1,15 @@ etc/quakeforge.conf usr/lib/libQFcd.so.* usr/lib/libQFconsole.so.* -usr/lib/libQFruamoko.so.* -usr/lib/libQFgamecode.so.* usr/lib/libQFgib.so.* usr/lib/libQFimage.so.* usr/lib/libQFjs.so.* usr/lib/libQFmodels.so.* +usr/lib/libQFruamoko.so.* usr/lib/libQFsound.so.* usr/lib/libQFutil.so.* usr/lib/quakeforge/plugins/cd_file.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/quake/QF diff --git a/debian/quakeforge-dev.install b/debian/quakeforge-dev.install index fe2d441e2..34e02b38e 100644 --- a/debian/quakeforge-dev.install +++ b/debian/quakeforge-dev.install @@ -2,10 +2,6 @@ usr/lib/libQFcd.*a usr/lib/libQFcd.so usr/lib/libQFconsole.*a usr/lib/libQFconsole.so -usr/lib/libQFruamoko.*a -usr/lib/libQFruamoko.so -usr/lib/libQFgamecode.*a -usr/lib/libQFgamecode.so usr/lib/libQFgib.a usr/lib/libQFgib.so usr/lib/libQFimage.*a @@ -14,6 +10,8 @@ usr/lib/libQFjs.*a usr/lib/libQFjs.so usr/lib/libQFmodels.*a usr/lib/libQFmodels.so +usr/lib/libQFruamoko.*a +usr/lib/libQFruamoko.so usr/lib/libQFsound.*a usr/lib/libQFsound.so usr/lib/libQFutil.*a diff --git a/debian/quakeforge-gl.install b/debian/quakeforge-gl.install new file mode 100644 index 000000000..6b3af9f5a --- /dev/null +++ b/debian/quakeforge-gl.install @@ -0,0 +1 @@ +usr/lib/quakeforge/plugins/vid_render_gl.so* diff --git a/debian/quakeforge-glsl.install b/debian/quakeforge-glsl.install new file mode 100644 index 000000000..f85da3a2b --- /dev/null +++ b/debian/quakeforge-glsl.install @@ -0,0 +1 @@ +usr/lib/quakeforge/plugins/vid_render_glsl.so* diff --git a/debian/quakeforge-glx.install b/debian/quakeforge-glx.install deleted file mode 100644 index 35f0d6979..000000000 --- a/debian/quakeforge-glx.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/games/nq-glx -usr/games/qw-client-glx diff --git a/debian/quakeforge-libs-gl.install b/debian/quakeforge-libs-gl.install deleted file mode 100644 index 28404e19a..000000000 --- a/debian/quakeforge-libs-gl.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libQFmodels_gl.so.* -usr/lib/libQFrenderer_gl.so.* diff --git a/debian/quakeforge-libs-sw.install b/debian/quakeforge-libs-sw.install deleted file mode 100644 index afe145315..000000000 --- a/debian/quakeforge-libs-sw.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libQFmodels_sw.so.* -#usr/lib/libQFrenderer_sw.so.* diff --git a/debian/quakeforge-servers.install b/debian/quakeforge-servers.install index 92de69513..faf95bb54 100644 --- a/debian/quakeforge-servers.install +++ b/debian/quakeforge-servers.install @@ -1,4 +1,4 @@ usr/games/qw-master usr/games/qw-server usr/games/nq-server -usr/lib/quakeforge/plugins/console_server.so* \ No newline at end of file +usr/lib/quakeforge/plugins/console_server.so* diff --git a/debian/quakeforge-sgl.install b/debian/quakeforge-sgl.install deleted file mode 100644 index 383631258..000000000 --- a/debian/quakeforge-sgl.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/games/nq-sgl -usr/games/qw-client-sgl diff --git a/debian/quakeforge-sw.install b/debian/quakeforge-sw.install new file mode 100644 index 000000000..00f1e5e5f --- /dev/null +++ b/debian/quakeforge-sw.install @@ -0,0 +1 @@ +usr/lib/quakeforge/plugins/vid_render_sw.so* diff --git a/debian/quakeforge-sw32.install b/debian/quakeforge-sw32.install new file mode 100644 index 000000000..acbaf09da --- /dev/null +++ b/debian/quakeforge-sw32.install @@ -0,0 +1 @@ +usr/lib/quakeforge/plugins/vid_render_sw32.so* diff --git a/debian/rules b/debian/rules index 031a88176..3caa15b80 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #! /usr/bin/make -f # This file is public domain software, originally written by Joey Hess. -# Uncomment this to turn on verbose mode. +# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # This is the debhelper compatibility version to use. @@ -15,14 +15,14 @@ maptools := $(PACKAGE)-maptools dev := $(PACKAGE)-dev alsa := $(PACKAGE)-alsa -gllib := $(PACKAGE)-libs-gl -glx := $(PACKAGE)-glx +gllib := $(PACKAGE)-gl +glsllib := $(PACKAGE)-glsl jack := $(PACKAGE)-jack oss := $(PACKAGE)-oss sdl := $(PACKAGE)-sdl servers := $(PACKAGE)-servers -sgl := $(PACKAGE)-sgl -swlib := $(PACKAGE)-libs-sw +swlib := $(PACKAGE)-sw +sw32lib := $(PACKAGE)-sw32 utils := $(PACKAGE)-utils x11 := $(PACKAGE)-x11 @@ -49,7 +49,7 @@ configure-stamp: --infodir=/usr/share/info \ --with-sharepath=/usr/share/games/quake \ --with-plugin-path=/usr/lib/quakeforge/plugins \ - --with-clients=glx,sdl,sgl,x11 \ + --with-clients=sdl,x11 \ --with-servers=master,nq,qw touch $@ @@ -65,7 +65,7 @@ changelog-stamp: # Add here commands to build the changelog if test -d .git; then $(MAKE) changelog; fi touch $@ - + clean: dh_testdir dh_testroot @@ -132,31 +132,31 @@ install: build install -d -m755 debian/$(gllib)/usr/share/doc ln -s $(common) debian/$(gllib)/usr/share/doc/$(gllib) + # quakeforge-libs-glsl + dh_install -p$(glsllib) --sourcedir=$(tmp) + install -d -m755 debian/$(glsllib)/usr/share/doc + ln -s $(common) debian/$(glsllib)/usr/share/doc/$(glsllib) + # quakeforge-libs-sw dh_install -p$(swlib) --sourcedir=$(tmp) install -d -m755 debian/$(swlib)/usr/share/doc ln -s $(common) debian/$(swlib)/usr/share/doc/$(swlib) + # quakeforge-libs-sw32 + dh_install -p$(sw32lib) --sourcedir=$(tmp) + install -d -m755 debian/$(sw32lib)/usr/share/doc + ln -s $(common) debian/$(sw32lib)/usr/share/doc/$(sw32lib) + # quakeforge-servers dh_install -p$(servers) --sourcedir=$(tmp) install -d -m755 debian/$(servers)/usr/share/doc ln -s $(common) debian/$(servers)/usr/share/doc/$(servers) - # quakeforge-glx - dh_install -p$(glx) --sourcedir=$(tmp) - install -d -m755 debian/$(glx)/usr/share/doc - ln -s $(common) debian/$(glx)/usr/share/doc/$(glx) - # quakeforge-sdl dh_install -p$(sdl) --sourcedir=$(tmp) install -d -m755 debian/$(sdl)/usr/share/doc ln -s $(common) debian/$(sdl)/usr/share/doc/$(sdl) - # quakeforge-sgl - dh_install -p$(sgl) --sourcedir=$(tmp) - install -d -m755 debian/$(sgl)/usr/share/doc - ln -s $(common) debian/$(sgl)/usr/share/doc/$(sgl) - # quakeforge-x11 dh_install -p$(x11) --sourcedir=$(tmp) install -d -m755 debian/$(x11)/usr/share/doc @@ -191,7 +191,7 @@ install: build dh_install -p$(maptools) --sourcedir=$(tmp) install -d -m755 debian/$(maptools)/usr/share/doc ln -s $(common) debian/$(maptools)/usr/share/doc/$(maptools) - + # quakeforge find $(tmp) -type d -empty -print | xargs -r rmdir -p --ignore-fail-on-non-empty dh_install -p$(PACKAGE) --sourcedir=$(tmp) @@ -216,7 +216,7 @@ binary-arch: build install dh_installman -p$(maptools) dh_installman -p$(utils) dh_undocumented - dh_strip -Xlib/qfcc + dh_strip -Xshare/qfcc dh_link dh_compress dh_fixperms