debian/ updates. Cleaner, smaller, packages.

debian/control

@@ -7,9 +7,9 @@ Build-Depends: automake, autoconf, libtool, bison, flex, debhelper, libsdl1.2-de
 
 Package: quakeforge
 Architecture: any
-Depends: quake-game, quakeforge-common, quakeforge-client
+Depends: quakeforge-common, quakeforge-client, quake-game
 Suggests: quakeforge-server
-Description: QuakeForge 3D game engine - Fake package
+Description: 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
@@ -19,7 +19,7 @@ Description: QuakeForge 3D game engine - Fake package
 
 Package: quakeforge-common
 Architecture: any
-Depends: ${shlibs:Depends}, quake-game
+Depends: quake-game, ${shlibs:Depends}
 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
@@ -29,10 +29,22 @@ Description: QuakeForge 3D game engine - common files
  This package contains files and shared libraries common to all QuakeForge
  packages.
 
+Package: quakeforge-dev
+Architecture: any
+Depends: quakeforge-common
+Description: QuakeForge 3D game engine - development 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 headers and static libraries for the development of
+ utilities and applications for QuakeForge.
+
 Package: quakeforge-sdl
 Architecture: i386
 Conflicts: quake-sdl
-Depends: ${shlibs:Depends}, quake-game
+Depends: quake-game, ${shlibs:Depends}
 Provides: quakeforge-client
 Suggests: joystick
 Description: QuakeForge 3D game engine - SDL client
@@ -47,7 +59,7 @@ Description: QuakeForge 3D game engine - SDL client
 Package: quakeforge-svga
 Architecture: i386
 Conflicts: quake-svga
-Depends: ${shlibs:Depends}, quake-game
+Depends: quake-game, ${shlibs:Depends}
 Provides: quakeforge-client
 Suggests: joystick
 Description: QuakeForge 3D game engine - SVGAlib client
@@ -62,7 +74,7 @@ Description: QuakeForge 3D game engine - SVGAlib client
 Package: quakeforge-x11
 Architecture: any
 Conflicts: quake-x11
-Depends: ${shlibs:Depends}, quake-game
+Depends: quake-game, ${shlibs:Depends}
 Provides: quakeforge-client
 Suggests: joystick
 Description: QuakeForge 3D game engine - X11 client
@@ -77,7 +89,7 @@ Description: QuakeForge 3D game engine - X11 client
 Package: quakeforge-glx
 Architecture: any
 Conflicts: quake-gl
-Depends: ${shlibs:Depends}, libgl1, quake-game
+Depends: quake-game, libgl1, ${shlibs:Depends}
 Provides: quakeforge-client
 Suggests: joystick
 Description: QuakeForge 3D game engine - GLX Client
@@ -92,7 +104,7 @@ Description: QuakeForge 3D game engine - GLX Client
 Package: quakeforge-sgl
 Architecture: any
 Conflicts: quake-sdl
-Depends: ${shlibs:Depends}, quake-game
+Depends: quake-game, libgl1, ${shlibs:Depends}
 Provides: quakeforge-client
 Suggests: joystick
 Description: QuakeForge 3D game engine - SDL-GL client
@@ -104,20 +116,22 @@ Description: QuakeForge 3D game engine - SDL-GL client
  This package contains the SDL-GL versions of the QuakeForge client and
  standalone engine.
 
-Package: quakeforge-server
+Package: quakeforge-servers
 Architecture: any
-Depends: ${shlibs:Depends}, quake-game
+Depends: quake-game, ${shlibs:Depends}
-Description: QuakeForge 3D game engine - Server
+Provides: quakeforge-server
+Description: QuakeForge 3D game engine - Servers
  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 QuakeWorld-compatible dedicated server.
+ This package contains both the QuakeWorld-compatible and NetQuake-compatible
+ dedicated servers, as well as a simple QuakeWorld-compatible master server.
 
 Package: quakeforge-libs-sw
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: quakeforge-common, ${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
@@ -129,7 +143,7 @@ Description: QuakeForge 3D game engine - Software renderer libraries
 
 Package: quakeforge-libs-gl
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: quakeforge-common, ${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
@@ -141,7 +155,7 @@ Description: QuakeForge 3D game engine - OpenGL renderer libraries
 
 Package: quakeforge-oss
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: quakeforge-common, ${shlibs:Depends}
 Description: OSS digital audio output 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.
@@ -152,7 +166,7 @@ Description: OSS digital audio output plugin for QuakeForge
 
 Package: quakeforge-alsa
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: quakeforge-common, ${shlibs:Depends}
 Description: ALSA 0.9 digital audio output plugin for QuakeForge
  The ALSA 0.9 plugin for QuakeForge provides digital audio output for QuakeForge
  targets that contain clients.

debian/quakeforge-alsa.files

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

debian/quakeforge-common.conffiles

@@ -1 +0,0 @@
-/etc/quakeforge.conf

debian/quakeforge-common.docs

@@ -1,3 +0,0 @@
-INSTALL
-README
-NEWS

debian/quakeforge-common.files

@@ -1,34 +0,0 @@
-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/libQFgamecode_builtins.so.1
-usr/lib/libQFgamecode_builtins.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/libconsole_client.so
-usr/lib/quakeforge/libconsole_client.so.1
-usr/lib/quakeforge/libconsole_client.so.1.0.0
-usr/lib/quakeforge/libsnd_output_disk.so
-usr/lib/quakeforge/libsnd_output_disk.so.1
-usr/lib/quakeforge/libsnd_output_disk.so.1.0.0
-usr/lib/quakeforge/libsnd_output_null.so
-usr/lib/quakeforge/libsnd_output_null.so.1
-usr/lib/quakeforge/libsnd_output_null.so.1.0.0
-usr/lib/quakeforge/libsnd_render_default.so
-usr/lib/quakeforge/libsnd_render_default.so.1
-usr/lib/quakeforge/libsnd_render_default.so.1.0.0

debian/quakeforge-dev.dirs

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

debian/quakeforge-dev.files

@@ -1,30 +0,0 @@
-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.dirs

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

debian/quakeforge-glx.docs

@@ -1,3 +0,0 @@
-INSTALL
-README
-NEWS

debian/quakeforge-glx.files

@@ -1,4 +0,0 @@
-usr/games/nq-glx
-usr/games/qw-client-glx
-usr/lib/libQFglx.so.1
-usr/lib/libQFglx.so.1.0.0

debian/quakeforge-glx.undocumented

@@ -1 +1,2 @@
 qw-client-glx.6
+nq-glx.6

debian/quakeforge-libs-gl.files

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

debian/quakeforge-libs-sw.files

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

debian/quakeforge-oss.files

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

debian/quakeforge-sdl.dirs

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

debian/quakeforge-sdl.docs

@@ -1,3 +0,0 @@
-INSTALL
-README
-NEWS

debian/quakeforge-sdl.files

@@ -1,4 +0,0 @@
-usr/games/nq-sdl
-usr/games/qw-client-sdl
-usr/lib/libQFsdl.so.1
-usr/lib/libQFsdl.so.1.0.0

debian/quakeforge-sdl.undocumented

@@ -1 +1,2 @@
 qw-client-sdl.6
+nq-sdl.6

debian/quakeforge-server.dirs

@@ -1,2 +0,0 @@
-usr/games
-usr/share/games/quake/qw

debian/quakeforge-server.docs

@@ -1,3 +0,0 @@
-INSTALL
-README
-NEWS

debian/quakeforge-server.files

@@ -1,4 +0,0 @@
-usr/games/qw-server
-usr/lib/quakeforge/libconsole_server.so
-usr/lib/quakeforge/libconsole_server.so.1
-usr/lib/quakeforge/libconsole_server.so.1.0.0

debian/quakeforge-sgl.dirs

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

debian/quakeforge-sgl.docs

@@ -1,3 +0,0 @@
-INSTALL
-README
-NEWS

debian/quakeforge-sgl.files

@@ -1,4 +0,0 @@
-usr/games/nq-sgl
-usr/games/qw-client-sgl
-usr/lib/libQFsgl.so.1
-usr/lib/libQFsgl.so.1.0.0

debian/quakeforge-sgl.undocumented

@@ -1 +1,2 @@
 qw-client-sgl.6
+nq-sgl.6

debian/quakeforge-svga.dirs

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

debian/quakeforge-svga.docs

@@ -1,3 +0,0 @@
-INSTALL
-README
-NEWS

debian/quakeforge-svga.files

@@ -1,4 +0,0 @@
-usr/games/nq-svga
-usr/games/qw-client-svga
-usr/lib/libQFsvga.so.1
-usr/lib/libQFsvga.so.1.0.0

debian/quakeforge-svga.undocumented

@@ -1 +1,2 @@
 qw-client-svga.6
+nq-svga.6

debian/quakeforge-x11.dirs

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

debian/quakeforge-x11.docs

@@ -1,3 +0,0 @@
-INSTALL
-README
-NEWS

debian/quakeforge-x11.files

@@ -1,4 +0,0 @@
-usr/games/nq-x11
-usr/games/qw-client-x11
-usr/lib/libQFx11.so.1
-usr/lib/libQFx11.so.1.0.0

debian/quakeforge-x11.undocumented

@@ -1 +1,2 @@
 qw-client-x11.6
+nq-x11.6

debian/rules

@@ -7,7 +7,23 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=2
 
-tmp	:= $(shell pwd)/debian/tmp
+PACKAGE := quakeforge
+common	:= $(PACKAGE)-common
+dev	:= $(PACKAGE)-dev
+gllib	:= $(PACKAGE)-libs-gl
+swlib	:= $(PACKAGE)-libs-sw
+glx	:= $(PACKAGE)-glx
+sdl	:= $(PACKAGE)-sdl
+servers	:= $(PACKAGE)-servers
+sgl	:= $(PACKAGE)-sgl
+svga	:= $(PACKAGE)-svga
+x11	:= $(PACKAGE)-x11
+
+alsa	:= $(PACKAGE)-alsa
+oss	:= $(PACKAGE)-oss
+
+build	:= $(shell pwd)/debian/tmp
+tmp	:= debian/tmp
 
 ifeq ($(DEB_BUILD_GNU_TYPE),)
 RETARGET=
@@ -23,43 +39,167 @@ configure-stamp:
 	./configure --prefix=/usr $(RETARGET) --bindir=/usr/games \
 		    --mandir=\$${prefix}/share/man \
 		    --infodir=\$${prefix}/share/info \
-#		    --with-3dfx=GL
+		    --with-plugin-path=/usr/lib/quakeforge \
+		    --with-clients=glx,sdl,sgl,svga,x11 \
+		    --with-servers=master,nq,qw
 
-	touch configure-stamp
+	touch $@
 
-build: configure-stamp build-stamp
+build: configure-stamp changelog-stamp build-stamp
 build-stamp:
 	dh_testdir
-
-	# Add here commands to compile the package.
-	[ -d CVS ] && $(MAKE) changelog
 	$(MAKE)
+	touch $@
 
-	touch build-stamp
+changelog-stamp:
-
+	dh_testdir
+	# Add here commands to build the changelog
+	[ -d CVS ] && $(MAKE) changelog
+	touch $@
+	
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp configure-stamp changelog-stamp
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
 
 	dh_clean
 
-install:
+install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
-	$(MAKE) DESTDIR=$(tmp) install
+	$(MAKE) DESTDIR=$(build) install
-	mkdir $(tmp)/etc
+	install -m644 -D debian/quakeforge.conf $(build)/etc/quakeforge.conf
-	cp debian/quakeforge.conf $(tmp)/etc
 
-	dh_movefiles
+	# quakeforge-common
+	find $(tmp)/etc ! -type d | sed -e "s:^$(tmp)::" > debian/$(common).conffiles
+	dh_movefiles -p$(common) --sourcedir=$(tmp) \
+		etc/quakeforge.conf \
+		usr/lib/libQFcd.so.* \
+		usr/lib/libQFconsole.so.* \
+		usr/lib/libQFgamecode.so.* \
+		usr/lib/libQFgamecode_builtins.so.* \
+		usr/lib/libQFgib.so.* \
+		usr/lib/libQFjs.so.* \
+		usr/lib/libQFmodels.so.* \
+		usr/lib/libQFsound.so.* \
+		usr/lib/libQFutil.so.* \
+		usr/lib/quakeforge/libcd_null.so.* \
+		usr/lib/quakeforge/libsnd_output_disk.so.* \
+		usr/lib/quakeforge/libsnd_render_default.so.*
+	dh_installdocs -p$(common) NEWS TODO
+	dh_installchangelogs -p$(common) ChangeLog
+
+	# quakeforge-dev
+	dh_movefiles -p$(dev) --sourcedir=$(tmp) \
+		usr/lib/libQFcd.*a \
+		usr/lib/libQFcd.so \
+		usr/lib/libQFconsole.*a \
+		usr/lib/libQFconsole.so \
+		usr/lib/libQFgamecode.*a \
+		usr/lib/libQFgamecode.so \
+		usr/lib/libQFgib.*a \
+		usr/lib/libQFgib.so \
+		usr/lib/libQFjs.*a \
+		usr/lib/libQFjs.so \
+		usr/lib/libQFmodels.*a \
+		usr/lib/libQFmodels.so \
+		usr/lib/libQFsound.*a \
+		usr/lib/libQFsound.so \
+		usr/lib/libQFutil.*a \
+		usr/lib/libQFutil.so \
+		usr/include/QF/GL/*.h \
+		usr/include/QF/plugin/*.h \
+		usr/include/QF/*.h \
+		usr/include/*.h
+	install -d -m755 debian/$(dev)/usr/share/doc
+	ln -s $(common) debian/$(dev)/usr/share/doc/$(dev)
+
+	# quakeforge-libs-gl
+	dh_movefiles -p$(gllib) --sourcedir=$(tmp) \
+		usr/lib/libQFmodels_gl.so.* \
+		usr/lib/libQFrenderer_gl.so.*
+	install -d -m755 debian/$(gllib)/usr/share/doc
+	ln -s $(common) debian/$(gllib)/usr/share/doc/$(gllib)
+
+	# quakeforge-libs-sw
+	dh_movefiles -p$(swlib) --sourcedir=$(tmp) \
+		usr/lib/libQFmodels_sw.so.* \
+		usr/lib/libQFrenderer_sw.so.*
+	install -d -m755 debian/$(swlib)/usr/share/doc
+	ln -s $(common) debian/$(swlib)/usr/share/doc/$(swlib)
+
+	# quakeforge-servers
+	dh_movefiles -p$(servers) --sourcedir=$(tmp) \
+		usr/games/qw-master \
+		usr/games/qw-server \
+		usr/games/nq-server \
+		usr/lib/quakeforge/libconsole_server.so.*
+	install -d -m755 debian/$(servers)/usr/share/doc
+	ln -s $(common) debian/$(servers)/usr/share/doc/$(servers)
+
+	# quakeforge-glx
+	dh_movefiles -p$(glx) --sourcedir=$(tmp) \
+		usr/games/nq-glx \
+		usr/games/qw-client-glx \
+		usr/lib/libQFglx.so.*
+	install -d -m755 debian/$(glx)/usr/share/doc
+	ln -s $(common) debian/$(glx)/usr/share/doc/$(glx)
+
+	# quakeforge-sdl
+	dh_movefiles -p$(sdl) --sourcedir=$(tmp) \
+		usr/games/nq-sdl \
+		usr/games/qw-client-sdl \
+		usr/lib/libQFsdl.so.*
+	install -d -m755 debian/$(sdl)/usr/share/doc
+	ln -s $(common) debian/$(sdl)/usr/share/doc/$(sdl)
+
+	# quakeforge-sgl
+	dh_movefiles -p$(sgl) --sourcedir=$(tmp) \
+		usr/games/nq-sgl \
+		usr/games/qw-client-sgl \
+		usr/lib/libQFsgl.so.*
+	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 \
+		usr/games/qw-client-x11 \
+		usr/lib/libQFx11.so.*
+	install -d -m755 debian/$(x11)/usr/share/doc
+	ln -s $(common) debian/$(x11)/usr/share/doc/$(x11)
+
+	# quakeforge-alsa
+	dh_movefiles -p$(alsa) --sourcedir=$(tmp) \
+		usr/lib/quakeforge/libsnd_output_alsa0_9.so.*
+	install -d -m755 debian/$(alsa)/usr/share/doc
+	ln -s $(common) debian/$(alsa)/usr/share/doc/$(alsa)
+
+	# quakeforge-oss
+	dh_movefiles -p$(oss) --sourcedir=$(tmp) \
+		usr/lib/quakeforge/libsnd_output_oss.so.*
+	install -d -m755 debian/$(oss)/usr/share/doc
+	ln -s $(common) debian/$(oss)/usr/share/doc/$(oss)
+
+	# quakeforge
+	find $(tmp) -type d -empty | xargs -r rmdir -p --ignore-fail-on-non-empty
+	dh_movefiles -p$(PACKAGE) --sourcedir=$(tmp)
+	install -d -m755 debian/$(PACKAGE)/usr/share/doc
+	ln -s $(common) debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)
 
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.
@@ -74,11 +214,9 @@ binary-arch: build install
 	dh_testversion 2
 	dh_testdir
 	dh_testroot
-	dh_installdocs
 	dh_installexamples
 	dh_installmenu
 	dh_undocumented
-	dh_installchangelogs
 	dh_strip
 	dh_link
 	dh_compress
@@ -86,7 +224,6 @@ binary-arch: build install
 	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
-	-chmod 4755 debian/quakeforge-3dfx/usr/games/qw-client-3dfx debian/quakeforge-3dfx/usr/games/nq-3dfx
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol