Debian updates

debhelper changed a lot... :)

.gitignore

@@ -44,6 +44,8 @@ core
 
 # /debian/
 /debian/*.debhelper
+/debian/debhelper.log
+/debian/*.debhelper.log
 /debian/*.substvars
 /debian/files
 /debian/qfcc
@@ -53,6 +55,7 @@ core
 /debian/quakeforge-common.conffiles
 /debian/quakeforge-dev
 /debian/quakeforge-glx
+/debian/quakeforge-jack
 /debian/quakeforge-libs-gl
 /debian/quakeforge-libs-sw
 /debian/quakeforge-maptools

debian/changelog

@@ -1,3 +1,9 @@
+quakeforge (0.6.0~git20101223-0) frozen unstable; urgency=low
+
+  * Getting ready for 0.6.0 release.
+
+ -- Jeff Teunissen <deek@d2dc.net>  Thu, 24 Dec 2010 19:39:37 -0400
+
 quakeforge (0.5.5-0cvs20040727) frozen unstable; urgency=low
 
   * CVS snapshot.

debian/control

@@ -3,7 +3,7 @@ Section: contrib/games
 Priority: optional
 Maintainer: Jeff Teunissen <deek@debian.org>
 Standards-Version: 3.1.1
-Build-Depends: automake (>= 1.8) | automake1.8, autoconf, libtool, bison, flex, debhelper, libsdl1.2-dev, zlib1g-dev, libncurses5-dev, xorg-dev | xlibs-dev (>= 4), libasound2-dev, libogg-dev, libvorbis-dev, libflac-dev, libwildmidi-dev, libjack-dev, libpng12-dev, libsamplerate0-dev, git-core, x11proto-xf86vidmode-dev
+Build-Depends: automake (>= 1.8) | automake1.8, autoconf, libtool, bison, flex, debhelper, libsdl1.2-dev, zlib1g-dev, libncurses5-dev, libx11-dev, libxext-dev, libasound2-dev, libvorbis-dev, libflac-dev, libjack-dev, libpng12-dev, libsamplerate0-dev, git-core, x11proto-xf86vidmode-dev
 
 Package: quakeforge
 Architecture: any
@@ -19,7 +19,7 @@ Description: QuakeForge 3D game engine - Fake package
 
 Package: quakeforge-common
 Architecture: any
-Depends: quake-game, ${shlibs:Depends}
+Depends: quake-game, ${misc:Depends}, ${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
@@ -55,7 +55,7 @@ Description: QuakeForge 3D game engine - development files
 Package: quakeforge-sdl
 Architecture: any
 Conflicts: quake-sdl
-Depends: quake-game, ${shlibs:Depends}
+Depends: quake-game, ${misc:Depends}, ${shlibs:Depends}
 Provides: quakeforge-client
 Suggests: joystick
 Description: QuakeForge 3D game engine - SDL client
@@ -71,7 +71,7 @@ Description: QuakeForge 3D game engine - SDL client
 Package: quakeforge-x11
 Architecture: any
 Conflicts: quake-x11
-Depends: quake-game, ${shlibs:Depends}
+Depends: quake-game, ${misc:Depends}, ${shlibs:Depends}
 Provides: quakeforge-client
 Suggests: joystick
 Description: QuakeForge 3D game engine - X11 client
@@ -86,7 +86,7 @@ Description: QuakeForge 3D game engine - X11 client
 Package: quakeforge-glx
 Architecture: any
 Conflicts: quake-gl
-Depends: quake-game, libgl1, ${shlibs:Depends}
+Depends: quake-game, libgl1, ${misc:Depends}, ${shlibs:Depends}
 Provides: quakeforge-client
 Suggests: joystick
 Description: QuakeForge 3D game engine - GLX Client
@@ -101,7 +101,7 @@ Description: QuakeForge 3D game engine - GLX Client
 Package: quakeforge-sgl
 Architecture: any
 Conflicts: quake-sdl
-Depends: quake-game, libgl1, ${shlibs:Depends}
+Depends: quake-game, libgl1, ${misc:Depends}, ${shlibs:Depends}
 Provides: quakeforge-client
 Suggests: joystick
 Description: QuakeForge 3D game engine - SDL-GL client
@@ -115,7 +115,7 @@ Description: QuakeForge 3D game engine - SDL-GL client
 
 Package: quakeforge-servers
 Architecture: any
-Depends: quake-game, ${shlibs:Depends}
+Depends: quake-game, ${misc:Depends}, ${shlibs:Depends}
 Provides: quakeforge-server
 Description: QuakeForge 3D game engine - Servers
  QuakeForge is a source port of Quake and QuakeWorld, the successors to id
@@ -129,7 +129,7 @@ Description: QuakeForge 3D game engine - Servers
 
 Package: quakeforge-libs-sw
 Architecture: any
-Depends: quakeforge-common, ${shlibs:Depends}
+Depends: quakeforge-common, ${misc:Depends}, ${shlibs:Depends}
 Section: contrib/libs
 Description: QuakeForge 3D game engine - Software renderer libraries
  QuakeForge is a source port of Quake and QuakeWorld, the successors to id
@@ -142,7 +142,7 @@ Description: QuakeForge 3D game engine - Software renderer libraries
 
 Package: quakeforge-libs-gl
 Architecture: any
-Depends: quakeforge-common, ${shlibs:Depends}
+Depends: quakeforge-common, ${misc:Depends}, ${shlibs:Depends}
 Section: contrib/libs
 Description: QuakeForge 3D game engine - OpenGL renderer libraries
  QuakeForge is a source port of Quake and QuakeWorld, the successors to id
@@ -155,7 +155,7 @@ Description: QuakeForge 3D game engine - OpenGL renderer libraries
 
 Package: quakeforge-oss
 Architecture: any
-Depends: quakeforge-common, ${shlibs:Depends}
+Depends: quakeforge-common, ${misc:Depends}, ${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.
@@ -166,14 +166,21 @@ Description: OSS digital audio output plugin for QuakeForge
 
 Package: quakeforge-alsa
 Architecture: any
-Depends: quakeforge-common, ${shlibs:Depends}
+Depends: quakeforge-common, ${misc:Depends}, ${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.
 
+Package: quakeforge-jack
+Architecture: any
+Depends: quakeforge-common, ${misc:Depends}, ${shlibs:Depends}
+Description: JACK digital audio output plugin for QuakeForge
+ The JACK plugin for QuakeForge provides digital audio output for
+ QuakeForge targets that contain clients.
+
 Package: quakeforge-utils
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: QuakeForge utility programs
  This package contains several tools for use with QuakeForge:
  .
@@ -185,7 +192,7 @@ Description: QuakeForge utility programs
 
 Package: quakeforge-maptools
 Architecture: any
-Depends: qfcc, ${shlibs:Depends}
+Depends: qfcc, ${misc:Depends}, ${shlibs:Depends}
 Description: Quake mapping tools from the QuakeForge Project
  This package contains QuakeForge's versions of the tools Id Software used
  to create maps for the Quake engine. Included are:
@@ -198,7 +205,7 @@ Description: Quake mapping tools from the QuakeForge Project
 
 Package: qfcc
 Architecture: any
-Depends: cpp, ${shlibs:Depends}
+Depends: cpp, ${misc:Depends}, ${shlibs:Depends}
 Description: The QuakeForge Code Compiler
  QFCC is an optimizing byte-code compiler for the Ruamoko language, a language
  based strongly on Id Software's QuakeC. The bytecode interpreter for QuakeC

debian/qfcc.install

@@ -0,0 +1,7 @@
+usr/bin/qfcc
+usr/bin/qfpreqcc
+usr/bin/qfprogs
+usr/include/QF/ruamoko
+usr/lib/pkgconfig/qfcc.pc
+usr/lib/ruamoko
+usr/share/man/man1/qfcc.1

debian/quakeforge-alsa.install

@@ -0,0 +1 @@
+usr/lib/quakeforge/plugins/snd_output_alsa.so*

debian/quakeforge-common.install

@@ -0,0 +1,18 @@
+etc/quakeforge.conf
+usr/lib/libQFcd.so.*
+usr/lib/libQFconsole.so.*
+usr/lib/libQFruamoko.so.*
+usr/lib/libQFgamecode.so.*
+usr/lib/libQFgamecode_builtins.so.*
+usr/lib/libQFgib.so.*
+usr/lib/libQFimage.so.*
+usr/lib/libQFjs.so.*
+usr/lib/libQFmodels.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

debian/quakeforge-common.shlibs

@@ -1,11 +0,0 @@
-libQFcd 1 quakeforge-common (>= 0.5.5)
-libQFconsole 1 quakeforge-common (>= 0.5.5)
-libQFruamoko 1 quakeforge-common (>= 0.5.5)
-libQFgamecode 1 quakeforge-common (>= 0.5.5)
-libQFgamecode_builtins 1 quakeforge-common (>= 0.5.5)
-libQFgib 1 quakeforge-common (>= 0.5.5)
-libQFimage 1 quakeforge-common (>= 0.5.5)
-libQFjs 1 quakeforge-common (>= 0.5.5)
-libQFmodels 1 quakeforge-common (>= 0.5.5)
-libQFsound 1 quakeforge-common (>= 0.5.5)
-libQFutil 1 quakeforge-common (>= 0.5.5)

debian/quakeforge-dev.install

@@ -0,0 +1,26 @@
+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/libQFgamecode_builtins.*a
+usr/lib/libQFgamecode_builtins.so
+usr/lib/libQFgib.a
+usr/lib/libQFgib.so
+usr/lib/libQFimage.*a
+usr/lib/libQFimage.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/lib/pkgconfig/quakeforge.pc
+usr/include/QF/GL/*.h
+usr/include/QF/plugin/*.h
+usr/include/QF/*.h

debian/quakeforge-glx.install

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

debian/quakeforge-jack.install

@@ -0,0 +1 @@
+usr/lib/quakeforge/plugins/snd_render_jack.so*

debian/quakeforge-libs-gl.install

@@ -0,0 +1,2 @@
+usr/lib/libQFmodels_gl.so.*
+usr/lib/libQFrenderer_gl.so.*

debian/quakeforge-libs-gl.shlibs

@@ -1,2 +0,0 @@
-libQFrenderer_gl 1 quakeforge-libs-gl (>= 0.5.5)
-libQFmodels_gl 1 quakeforge-libs-gl (>= 0.5.5)

debian/quakeforge-libs-sw.install

@@ -0,0 +1,2 @@
+usr/lib/libQFmodels_sw.so.*
+#usr/lib/libQFrenderer_sw.so.*

debian/quakeforge-libs-sw.shlibs

@@ -1,2 +0,0 @@
-libQFrenderer_sw 1 quakeforge-libs-sw (>= 0.5.5)
-libQFmodels_sw 1 quakeforge-libs-sw (>= 0.5.5)

debian/quakeforge-maptools.install

@@ -0,0 +1,5 @@
+usr/bin/qfbsp
+usr/bin/qflight
+usr/bin/qfvis
+usr/share/man/man1/qflight.1
+usr/share/man/man1/qfvis.1

debian/quakeforge-oss.install

@@ -0,0 +1 @@
+usr/lib/quakeforge/plugins/snd_output_oss.so*

debian/quakeforge-sdl.install

@@ -0,0 +1,4 @@
+usr/games/nq-sdl
+usr/games/qw-client-sdl
+usr/lib/quakeforge/plugins/cd_sdl.so*
+usr/lib/quakeforge/plugins/snd_output_sdl.so*

debian/quakeforge-servers.install

@@ -0,0 +1,4 @@
+usr/games/qw-master
+usr/games/qw-server
+usr/games/nq-server
+usr/lib/quakeforge/plugins/console_server.so*

debian/quakeforge-sgl.install

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

debian/quakeforge-utils.install

@@ -0,0 +1,6 @@
+usr/bin/pak
+usr/bin/wad
+usr/bin/zpak
+usr/bin/qfwavinfo
+usr/share/man/man1/pak.1
+usr/share/man/man1/wad.1

debian/quakeforge-x11.install

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

debian/rules

@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=2
+export DH_COMPAT=7
 
 PACKAGE 	:= quakeforge
 QFCC		:= qfcc
@@ -17,6 +17,7 @@ dev		:= $(PACKAGE)-dev
 alsa		:= $(PACKAGE)-alsa
 gllib		:= $(PACKAGE)-libs-gl
 glx		:= $(PACKAGE)-glx
+jack		:= $(PACKAGE)-jack
 oss		:= $(PACKAGE)-oss
 sdl		:= $(PACKAGE)-sdl
 servers		:= $(PACKAGE)-servers
@@ -79,166 +80,30 @@ install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 
 	# 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/quake/id1
 
-	# quakeforge-common
+# Moving files to their right locations
-	find $(tmp)/etc ! -type d | sed -e "s:^$(tmp)::" > debian/$(common).conffiles
-	install -D -m755 debian/$(common).shlibs debian/$(common)/DEBIAN/shlibs
-	dh_movefiles -p$(common) --sourcedir=$(tmp) \
-		etc/quakeforge.conf \
-		usr/lib/libQFcd.so.* \
-		usr/lib/libQFconsole.so.* \
-		usr/lib/libQFruamoko.so.* \
-		usr/lib/libQFgamecode.so.* \
-		usr/lib/libQFgamecode_builtins.so.* \
-		usr/lib/libQFgib.so.* \
-		usr/lib/libQFimage.so.* \
-		usr/lib/libQFjs.so.* \
-		usr/lib/libQFmodels.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/menu.dat*
-	dh_installdocs -p$(common) NEWS TODO
-	dh_installchangelogs -p$(common) ChangeLog
-
-	# quakeforge-stub
-	install -d -m755 debian/$(stub)/usr/share/games/quake/id1
-
-	# 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/libQFruamoko.*a \
-		usr/lib/libQFruamoko.so \
-		usr/lib/libQFgamecode.*a \
-		usr/lib/libQFgamecode.so \
-		usr/lib/libQFgamecode_builtins.*a \
-		usr/lib/libQFgamecode_builtins.so \
-		usr/lib/libQFgib.a \
-		usr/lib/libQFgib.so \
-		usr/lib/libQFimage.*a \
-		usr/lib/libQFimage.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
-	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).shlibs debian/$(gllib)/DEBIAN/shlibs
-	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.*
-	install -D -m755 debian/$(swlib).shlibs debian/$(swlib)/DEBIAN/shlibs
-	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/plugins/console_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
-	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/quakeforge/plugins/cd_sdl.so \
-		usr/lib/quakeforge/plugins/snd_output_sdl.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
-	install -d -m755 debian/$(sgl)/usr/share/doc
-	ln -s $(common) debian/$(sgl)/usr/share/doc/$(sgl)
-
-	# quakeforge-x11
-	dh_movefiles -p$(x11) --sourcedir=$(tmp) \
-		usr/games/nq-x11 \
-		usr/games/qw-client-x11
-	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/plugins/snd_output_alsa.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/plugins/snd_output_oss.so*
-	install -d -m755 debian/$(oss)/usr/share/doc
-	ln -s $(common) debian/$(oss)/usr/share/doc/$(oss)
-
 	# qfcc
 	install -D -m755 $(tmp)/usr/games/qfcc $(tmp)/usr/bin/qfcc
 	rm -f $(tmp)/usr/games/qfcc
-	dh_movefiles -p$(QFCC) --sourcedir=$(tmp) \
+	install -D -m755 $(tmp)/usr/games/qfpreqcc $(tmp)/usr/bin/qfpreqcc
-		usr/bin/qfcc \
+	rm -f $(tmp)/usr/games/qfpreqcc
-		usr/share/man/man1/qfcc.1 \
-		usr/include/QF/ruamoko/* \
-		usr/lib/ruamoko/*
-	install -d -m755 debian/$(QFCC)/usr/share/doc
-	ln -s $(common) debian/$(QFCC)/usr/share/doc/$(QFCC)
-
 	# quakeforge-utils
 	install -D -m755 $(tmp)/usr/games/pak $(tmp)/usr/bin/pak
+	install -D -m755 $(tmp)/usr/games/wad $(tmp)/usr/bin/wad
 	install -D -m755 $(tmp)/usr/games/zpak $(tmp)/usr/bin/zpak
 	install -D -m755 $(tmp)/usr/games/qfprogs $(tmp)/usr/bin/qfprogs
 	install -D -m755 $(tmp)/usr/games/qfwavinfo $(tmp)/usr/bin/qfwavinfo
 	rm -f $(tmp)/usr/games/pak \
+		$(tmp)/usr/games/wad \
 		$(tmp)/usr/games/zpak \
 		$(tmp)/usr/games/qfprogs \
 		$(tmp)/usr/games/qfwavinfo
-	dh_movefiles -p$(utils) --sourcedir=$(tmp) \
-		usr/bin/pak \
-		usr/bin/zpak \
-		usr/bin/qfprogs \
-		usr/bin/qfwavinfo \
-		usr/share/man/man1/pak.1
-	install -d -m755 debian/$(utils)/usr/share/doc
-	ln -s $(common) debian/$(utils)/usr/share/doc/$(utils)
-
 	# quakeforge-maptools
 	install -D -m755 $(tmp)/usr/games/qfbsp $(tmp)/usr/bin/qfbsp
 	install -D -m755 $(tmp)/usr/games/qflight $(tmp)/usr/bin/qflight
@@ -246,18 +111,89 @@ install: build
 	rm -f $(tmp)/usr/games/qfbsp \
 		$(tmp)/usr/games/qflight \
 		$(tmp)/usr/games/qfvis
-	dh_movefiles -p$(maptools) --sourcedir=$(tmp) \
+
-		usr/bin/qfbsp \
+	# quakeforge-common
-		usr/bin/qflight \
+	find $(tmp)/etc ! -type d | sed -e "s:^$(tmp)::" > debian/$(common).conffiles
-		usr/bin/qfvis \
+	dh_install -p$(common) --sourcedir=$(tmp)
-		usr/share/man/man1/qflight.1 \
+	dh_installdocs -p$(common) NEWS TODO
-		usr/share/man/man1/qfvis.1
+	dh_installchangelogs -p$(common) ChangeLog
+
+	# quakeforge-stub
+	install -d -m755 debian/$(stub)/usr/share/games/quake/id1
+
+	# quakeforge-dev
+	dh_install -p$(dev) --sourcedir=$(tmp)
+	install -d -m755 debian/$(dev)/usr/share/doc
+	ln -s $(common) debian/$(dev)/usr/share/doc/$(dev)
+
+	# quakeforge-libs-gl
+	dh_install -p$(gllib) --sourcedir=$(tmp)
+	install -d -m755 debian/$(gllib)/usr/share/doc
+	ln -s $(common) debian/$(gllib)/usr/share/doc/$(gllib)
+
+	# 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-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
+	ln -s $(common) debian/$(x11)/usr/share/doc/$(x11)
+
+	# quakeforge-alsa
+	dh_install -p$(alsa) --sourcedir=$(tmp)
+	install -d -m755 debian/$(alsa)/usr/share/doc
+	ln -s $(common) debian/$(alsa)/usr/share/doc/$(alsa)
+
+	# quakeforge-oss
+	dh_install -p$(oss) --sourcedir=$(tmp)
+	install -d -m755 debian/$(oss)/usr/share/doc
+	ln -s $(common) debian/$(oss)/usr/share/doc/$(oss)
+
+	# quakeforge-jack
+	dh_install -p$(jack) --sourcedir=$(tmp)
+	install -d -m755 debian/$(jack)/usr/share/doc
+	ln -s $(common) debian/$(jack)/usr/share/doc/$(jack)
+
+	# qfcc
+	dh_install -p$(QFCC) --sourcedir=$(tmp)
+	install -d -m755 debian/$(QFCC)/usr/share/doc
+	ln -s $(common) debian/$(QFCC)/usr/share/doc/$(QFCC)
+
+	# quakeforge-utils
+	dh_install -p$(utils) --sourcedir=$(tmp)
+	install -d -m755 debian/$(utils)/usr/share/doc
+	ln -s $(common) debian/$(utils)/usr/share/doc/$(utils)
+
+	# quakeforge-maptools
+	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_movefiles -p$(PACKAGE) --sourcedir=$(tmp)
+	dh_install -p$(PACKAGE) --sourcedir=$(tmp)
 	install -d -m755 debian/$(PACKAGE)/usr/share/doc
 	ln -s $(common) debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)
 
@@ -283,7 +219,7 @@ binary-arch: build install
 	dh_link
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs
+	dh_makeshlibs -V
 	# You may want to make some executables suid here.
 	dh_installdeb
 	dh_shlibdeps