Debian package updates. They won't work completely yet, but I think they

need to be committed.

debian/Makefile.am

@@ -3,20 +3,22 @@ AUTOMAKE_OPTIONS=	foreign
 
 EXTRA_DIST=	changelog control copyright rules \
 		quakeforge.conf \
-		qf-client-3dfx.dirs qf-client-3dfx.docs qf-client-3dfx.files \
-			qf-client-3dfx.suid qf-client-3dfx.undocumented \
-		qf-client-glx.dirs qf-client-glx.docs qf-client-glx.files \
-			qf-client-glx.undocumented \
-		qf-client-sdl.dirs qf-client-sdl.docs qf-client-sdl.files \
-			qf-client-sdl.undocumented \
-		qf-client-sgl.dirs qf-client-sgl.docs qf-client-sgl.files \
-			qf-client-sgl.undocumented \
-		qf-client-svga.dirs qf-client-svga.docs qf-client-svga.files \
-			qf-client-svga.suid qf-client-svga.undocumented \
-		qf-client-x11.dirs qf-client-x11.docs qf-client-x11.files \
-			qf-client-x11.undocumented \
-		qf-server.dirs qf-server.docs qf-server.files \
-			qf-server.undocumented \
+		quakeforge-3dfx.dirs quakeforge-3dfx.docs
+			quakeforge-3dfx.files quakeforge-3dfx.suid \
+			quakeforge-3dfx.undocumented \
+		quakeforge-glx.dirs quakeforge-glx.docs quakeforge-glx.files \
+			quakeforge-glx.undocumented \
+		quakeforge-sdl.dirs quakeforge-sdl.docs quakeforge-sdl.files \
+			quakeforge-sdl.undocumented \
+		quakeforge-sgl.dirs quakeforge-sgl.docs quakeforge-sgl.files \
+			quakeforge-sgl.undocumented \
+		quakeforge-svga.dirs quakeforge-svga.docs quakeforge-svga.files \
+			quakeforge-svga.suid quakeforge-svga.undocumented \
+		quakeforge-x11.dirs quakeforge-x11.docs quakeforge-x11.files \
+			quakeforge-x11.undocumented \
 		quakeforge-common.conffiles quakeforge-common.docs \
 			quakeforge-common.files \
+		quakeforge-dev.dirs quakeforge-dev.docs quakeforge-dev.files \
+		quakeforge-server.dirs quakeforge-server.docs \
+			quakeforge-server.files quakeforge-server.undocumented \
 		quakeforge.files

debian/control

@@ -1,121 +1,173 @@
 Source: quakeforge
 Section: contrib/games
 Priority: optional
-Maintainer: Jeff Teunissen <deek@dusknet.dhs.org>
+Maintainer: Jeff Teunissen <deek@debian.org>
 Standards-Version: 3.1.1
+Build-Depends: automake, autoconf, libtool, bison, flex, debhelper, libsdl1.2-dev, zlib1g-dev, libncurses5-dev, libglide2-dev, svgalibg1-dev
 
 Package: quakeforge
 Architecture: any
-Depends: quake-game, quakeforge-common, qf-client
-Suggests: qf-server
-Description: First-person shooter Internet game - Fake package
+Depends: quake-game, quakeforge-common, quakeforge-client
+Suggests: quakeforge-server
+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
  adding portability and optional extensions to enhance gameplay.
  .
- This package only exists to depend on a server and a client.
+ This package only exists to depend on a client and suggest a server.
 
 Package: quakeforge-common
 Architecture: any
-Depends: quake-game
-Description: First-person shooter Internet game - common files
+Depends: ${shlibs:Depends}, quake-game
+Description: QuakeForge 3D game engine - common files
  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 files common to all QuakeForge packages.
+ This package contains files and shared libraries common to all QuakeForge
+ packages.
 
-Package: qf-client-sdl
+Package: quakeforge-sdl
 Architecture: i386
-Depends: ${shlibs:Depends}, libsdl1.1, quake-game
+Conflicts: quake-sdl
+Depends: ${shlibs:Depends}, quake-game
+Provides: quakeforge-client
 Suggests: joystick
-Provides: qf-client
-Description: First-person shooter Internet game - SDL client
+Description: QuakeForge 3D game engine - SDL 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 version of the QuakeForge client.
+ This package contains the SDL versions of the QuakeWorld client and
+ standalone engine.
 
-Package: qf-client-svga
+Package: quakeforge-svga
 Architecture: i386
+Conflicts: quake-svga
 Depends: ${shlibs:Depends}, quake-game
+Provides: quakeforge-client
 Suggests: joystick
-Provides: qf-client
-Description: First-person shooter Internet game - SVGAlib client
+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 version of the QuakeForge client.
+ This package contains the SVGAlib versions of the QuakeWorld client and
+ standalone engine.
 
-Package: qf-client-x11
+Package: quakeforge-x11
 Architecture: any
+Conflicts: quake-x11
 Depends: ${shlibs:Depends}, quake-game
+Provides: quakeforge-client
 Suggests: joystick
-Provides: qf-client
-Description: First-person shooter Internet game - X11 client
+Description: QuakeForge 3D game engine - X11 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 X11 version of the QuakeForge client.
+ This package contains the X11 versions of the QuakeForge client and
+ standalone engine.
 
-Package: qf-client-3dfx
+Package: quakeforge-3dfx
 Architecture: any
+Conflicts: libglide3, quake-3dfx
 Depends: ${shlibs:Depends}, libgl1, quake-game
-Conflicts: libglide3
+Provides: quakeforge-client
 Suggests: joystick
-Provides: qf-client
-Description: First-person shooter Internet game - Voodoo 1/2 Client
+Description: QuakeForge 3D game engine - Voodoo 1/2 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 Voodoo 1/2 version of the QuakeForge client. For
- Voodoo 3 and higher, use the GLX client.
+ This package contains the Voodoo 1/2 versions of the QuakeForge client and
+ standalone engine. For Voodoo 3 and higher, please use qf-glx.
 
-Package: qf-client-glx
+Package: quakeforge-glx
 Architecture: any
+Conflicts: quake-gl
 Depends: ${shlibs:Depends}, libgl1, quake-game
+Provides: quakeforge-client
 Suggests: joystick
-Provides: qf-client
-Description: First-person shooter Internet game - GLX Client
+Description: QuakeForge 3D game 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 version of the QuakeForge client.
+ This package contains the GLX versions of the QuakeForge client and
+ standalone engine.
 
-Package: qf-client-sgl
+Package: quakeforge-sgl
 Architecture: any
-Depends: ${shlibs:Depends}, libsdl1.1 (>= 1.1.3), quake-game
+Conflicts: quake-sdl
+Depends: ${shlibs:Depends}, quake-game
+Provides: quakeforge-client
 Suggests: joystick
-Provides: qf-client
-Description: First-person shooter Internet game - SDL-GL client
+Description: QuakeForge 3D game 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 version of the QuakeForge client.
+ This package contains the SDL-GL versions of the QuakeForge client and
+ standalone engine.
 
-Package: qf-server
+Package: quakeforge-server
 Architecture: any
 Depends: ${shlibs:Depends}, quake-game
-Suggests: joystick
-Provides: qf-client
-Description: First-person shooter Internet game - Server
+Description: QuakeForge 3D game engine - Server
  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 QuakeForge server.
+ This package contains the QuakeWorld-compatible dedicated server.
+
+Package: quakeforge-libs-sw
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: QuakeForge 3D game 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 software 
+ rendering targets.
+
+Package: quakeforge-libs-gl
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: QuakeForge 3D game 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
+ rendering targets.
+
+Package: quakeforge-oss
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: OSS sound plugin for QuakeForge
+ The OSS plugin for QuakeForge provides digital audio output (using OSS/Linux,
+ OSS/Free, or kernel sound) for QuakeForge targets that contain clients.
+ 
+ NOTE: This plugin does not work on all systems, since it uses memory-mapped
+ I/O for the output device. If you have trouble, try the quakeforge-alsa
+ package.
+
+Package: quakeforge-alsa
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: ALSA 0.9 sound plugin for QuakeForge
+ The ALSA 0.9 plugin for QuakeForge provides digital audio output for QuakeForge
+ targets that contain clients.

debian/copyright

@@ -1,10 +1,10 @@
 This is a Debian prepackaged version of QuakeForge. This package was
-compiled by Jeff Teunissen <deek@dusknet.dhs.org>.
+compiled by Jeff Teunissen <deek@debian.org>.
 
 Original sources can be found at:
 	http://www.quakeforge.net/files.php
 
-Copyright (C) 1999,2000 contributors to the QuakeForge Project.
+Copyright (C) 1999-2001 contributors to the QuakeForge Project.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the

debian/qf-client-x11.files

@@ -1 +0,0 @@
-usr/games/qf-client-x11

debian/quakeforge-3dfx.files

@@ -1 +1,2 @@
 usr/games/qf-client-3dfx
+usr/games/nq-3dfx

debian/quakeforge-alsa.files

@@ -0,0 +1,3 @@
+usr/lib/quakeforge/libsound_alsa0_9.so
+usr/lib/quakeforge/libsound_alsa0_9.so.1
+usr/lib/quakeforge/libsound_alsa0_9.so.1.0.0

debian/quakeforge-common.files

@@ -1 +1,26 @@
 etc/quakeforge.conf
+usr/lib/libQFcd.so.1
+usr/lib/libQFcd.so.1.0.0
+usr/lib/libQFconsole.so.1
+usr/lib/libQFconsole.so.1.0.0 
+usr/lib/libQFgamecode.so.1
+usr/lib/libQFgamecode.so.1.0.0
+usr/lib/libQFgib.so.1
+usr/lib/libQFgib.so.1.0.0
+usr/lib/libQFjs.so.1
+usr/lib/libQFjs.so.1.0.0
+usr/lib/libQFmodels.so.1
+usr/lib/libQFmodels.so.1.0.0
+usr/lib/libQFsound.so.1
+usr/lib/libQFsound.so.1.0.0
+usr/lib/libQFutil.so.1
+usr/lib/libQFutil.so.1.0.0
+usr/lib/quakeforge/libcd_null.so
+usr/lib/quakeforge/libcd_null.so.1
+usr/lib/quakeforge/libcd_null.so.1.0.0
+usr/lib/quakeforge/libsound_disk.so
+usr/lib/quakeforge/libsound_disk.so.1
+usr/lib/quakeforge/libsound_disk.so.1.0.0
+usr/lib/quakeforge/libsound_null.so
+usr/lib/quakeforge/libsound_null.so.1
+usr/lib/quakeforge/libsound_null.so.1.0.0

debian/quakeforge-dev.dirs

@@ -0,0 +1 @@
+usr/lib

debian/quakeforge-dev.files

@@ -0,0 +1,30 @@
+usr/lib/libQFcd.a
+usr/lib/libQFcd.la
+usr/lib/libQFcd.so
+usr/lib/libQFconsole.a
+usr/lib/libQFconsole.la
+usr/lib/libQFconsole.so
+usr/lib/libQFgamecode.a
+usr/lib/libQFgamecode.la
+usr/lib/libQFgamecode.so
+usr/lib/libQFgib.a
+usr/lib/libQFgib.la
+usr/lib/libQFgib.so
+usr/lib/libQFglx.a
+usr/lib/libQFglx.la
+usr/lib/libQFglx.so
+usr/lib/libQFjs.a
+usr/lib/libQFjs.la
+usr/lib/libQFjs.so
+usr/lib/libQFmodels.a
+usr/lib/libQFmodels.la
+usr/lib/libQFmodels.so
+usr/lib/libQFsound.a
+usr/lib/libQFsound.la
+usr/lib/libQFsound.so
+usr/lib/libQFutil.a
+usr/lib/libQFutil.la
+usr/lib/libQFutil.so
+usr/lib/libQFx11.a
+usr/lib/libQFx11.la
+usr/lib/libQFx11.so

debian/quakeforge-glx.files

@@ -1 +1,2 @@
 usr/games/qf-client-glx
+usr/games/nq-glx

debian/quakeforge-libs-gl.files

@@ -0,0 +1,4 @@
+/usr/local/lib/libQFmodels_gl.so.1
+/usr/local/lib/libQFmodels_gl.so.1.0.0
+/usr/local/lib/libQFrenderer_gl.so.1
+/usr/local/lib/libQFrenderer_gl.so.1.0.0

debian/quakeforge-libs-sw.files

@@ -0,0 +1,4 @@
+/usr/local/lib/libQFmodels_sw.so.1
+/usr/local/lib/libQFmodels_sw.so.1.0.0
+/usr/local/lib/libQFrenderer_sw.so.1
+/usr/local/lib/libQFrenderer_sw.so.1.0.0

debian/quakeforge-oss.files

@@ -0,0 +1,3 @@
+usr/lib/quakeforge/libsound_oss.so
+usr/lib/quakeforge/libsound_oss.so.1
+usr/lib/quakeforge/libsound_oss.so.1.0.0

debian/quakeforge-sdl.files

@@ -1 +1,2 @@
 usr/games/qf-client-sdl
+usr/games/nq-sdl

debian/quakeforge-sgl.files

@@ -1 +1,2 @@
 usr/games/qf-client-sgl
+usr/games/nq-sgl

debian/quakeforge-svga.files

@@ -1 +1,2 @@
 usr/games/qf-client-svga
+usr/games/nq-svga

debian/quakeforge-x11.files

@@ -0,0 +1,2 @@
+usr/games/qw-client-x11
+usr/games/nq-x11

debian/rules

@@ -19,8 +19,7 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-#	[ -d CVS ] && tools/cvs2cl/cvs2cl.pl
-	./bootstrap
+	[ -d CVS ] && ./bootstrap
 	./configure --prefix=/usr $(RETARGET) --bindir=/usr/games \
 		    --mandir=\$${prefix}/share/man \
 		    --infodir=\$${prefix}/share/info \
@@ -33,8 +32,8 @@ build-stamp:
 	dh_testdir
 
 	# Add here commands to compile the package.
+	[ -d CVS ] && $(MAKE) changelog
 	$(MAKE)
-	$(MAKE) changelog
 
 	touch build-stamp
 
@@ -56,7 +55,7 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
-	$(MAKE) prefix=$(tmp)/usr bindir=$(tmp)/usr/games install
+	$(MAKE) DESTDIR=$(tmp) install
 	mkdir $(tmp)/etc
 	cp debian/quakeforge.conf $(tmp)/etc
 
@@ -79,15 +78,15 @@ binary-arch: build install
 	dh_installexamples
 	dh_installmenu
 	dh_undocumented
-	dh_installchangelogs ChangeLog
+	dh_installchangelogs
 	dh_strip
 	dh_link
 	dh_compress
 	dh_fixperms
+	dh_makeshlibs
 	# You may want to make some executables suid here.
-	chmod 4755 debian/qf-client-svga/usr/games/qf-client-svga
-	-chmod 4755 debian/qf-client-3dfx/usr/games/qf-client-3dfx
-	dh_suidregister
+	chmod 4755 debian/quakeforge-svga/usr/games/qw-client-svga debian/qf-svga/usr/games/nuq-svga
+	-chmod 4755 debian/quakeforge-3dfx/usr/games/qw-client-3dfx debian/qf-3dfx/usr/games/nuq-3dfx
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol