Debian changes. new packages, -utils and -maptools. qfmodelgen isn't in a

package yet.

debian/.gitignore

@@ -12,10 +12,12 @@ quakeforge-dev
 quakeforge-glx
 quakeforge-libs-gl
 quakeforge-libs-sw
+quakeforge-maptools
 quakeforge-oss
 quakeforge-sdl
 quakeforge-servers
 quakeforge-sgl
 quakeforge-svga
+quakeforge-utils
 quakeforge-x11
 tmp

debian/changelog

@@ -1,8 +1,8 @@
-quakeforge (0.5.1-0cvs20020802) frozen unstable; urgency=low
+quakeforge (0.5.2-0) frozen unstable; urgency=low
 
-  * New snapshot.
+  * New release imminent.
 
- -- Jeff Teunissen <deek@d2dc.net>  Fri,  2 Aug 2002 07:30:17 -0400
+ -- Jeff Teunissen <deek@d2dc.net>  Fri, 30 Sep 2002 12:49:17 -0400
 
 quakeforge (0.5.1-0cvs20020416) frozen unstable; urgency=low
 

debian/control

@@ -126,8 +126,9 @@ Description: QuakeForge 3D game engine - Servers
  remain compatible with the original games released by id Software while
  adding portability and optional extensions to enhance gameplay.
  .
- This package contains both the QuakeWorld-compatible and NetQuake-compatible
+ This package contains both the QuakeWorld-compatible and
- dedicated servers, as well as a simple QuakeWorld-compatible master server.
+ NetQuake-compatible dedicated servers, as well as a simple
+ QuakeWorld-compatible master server.
 
 Package: quakeforge-libs-sw
 Architecture: any
@@ -170,8 +171,35 @@ Package: quakeforge-alsa
 Architecture: any
 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
+ The ALSA 0.9 plugin for QuakeForge provides digital audio output for
- targets that contain clients.
+ QuakeForge targets that contain clients.
+
+Package: quakeforge-utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: QuakeForge utility programs
+ This package contains several tools for use with QuakeForge:
+ .
+ * pak, a pakfile management tool.
+ * zpak, a script for compressing pakfiles.
+ * qfdefs, a tool for fixing up progs data files so they can be used with
+   QuakeForge-based servers.
+ * qfprogs, a "nm" tool for examining progs data files.
+ * qfwavinfo, a tool to assist in converting "looped" WAV files to Ogg
+   Vorbis.
+
+Package: quakeforge-maptools
+Architecture: any
+Depends: qfcc, ${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:
+ .
+ * qfbsp, a program for compiling a map file into a BSP tree.
+ * 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 by qfbsp).
 
 Package: qfcc
 Architecture: any

debian/rules

@@ -7,21 +7,23 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=2
 
-PACKAGE := quakeforge
+PACKAGE 	:= quakeforge
-common	:= $(PACKAGE)-common
+QFCC		:= qfcc
-dev	:= $(PACKAGE)-dev
+common		:= $(PACKAGE)-common
-gllib	:= $(PACKAGE)-libs-gl
+maptools	:= $(PACKAGE)-maptools
-swlib	:= $(PACKAGE)-libs-sw
+dev		:= $(PACKAGE)-dev
-glx	:= $(PACKAGE)-glx
-sdl	:= $(PACKAGE)-sdl
-servers	:= $(PACKAGE)-servers
-sgl	:= $(PACKAGE)-sgl
-svga	:= $(PACKAGE)-svga
-x11	:= $(PACKAGE)-x11
 
-alsa	:= $(PACKAGE)-alsa
+alsa		:= $(PACKAGE)-alsa
-oss	:= $(PACKAGE)-oss
+gllib		:= $(PACKAGE)-libs-gl
-QFCC	:= qfcc
+glx		:= $(PACKAGE)-glx
+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
 
 build	:= $(shell pwd)/debian/tmp
 tmp	:= debian/tmp
@@ -113,6 +115,8 @@ install: build
 		usr/lib/libQFcsqc.so \
 		usr/lib/libQFgamecode.*a \
 		usr/lib/libQFgamecode.so \
+		usr/lib/libQFgamecode_builtins.*a \
+		usr/lib/libQFgamecode_builtins.so \
 		usr/lib/libQFjs.*a \
 		usr/lib/libQFjs.so \
 		usr/lib/libQFmodels.*a \
@@ -205,12 +209,47 @@ install: build
 	rm -f $(tmp)/usr/games/qfcc
 	dh_movefiles -p$(QFCC) --sourcedir=$(tmp) \
 		usr/bin/qfcc \
-		usr/share/man/man1/qfcc.1
+		usr/share/man/man1/qfcc.1 \
+		usr/include/QF/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/zpak $(tmp)/usr/bin/zpak
+	install -D -m755 $(tmp)/usr/games/qfdefs $(tmp)/usr/bin/qfdefs
+	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/zpak \
+		$(tmp)/usr/games/qfdefs \
+		$(tmp)/usr/games/qfprogs \
+		$(tmp)/usr/games/qfwavinfo
+	dh_movefiles -p$(utils) --sourcedir=$(tmp) \
+		usr/bin/pak \
+		usr/bin/zpak \
+		usr/bin/qfdefs \
+		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
+	install -D -m755 $(tmp)/usr/games/qfvis $(tmp)/usr/bin/qfvis
+	dh_movefiles -p$(maptools) --sourcedir=$(tmp) \
+		usr/bin/qfbsp \
+		usr/bin/qflight \
+		usr/bin/qfvis \
+		usr/share/man/man1/qflight.1 \
+		usr/share/man/man1/qfvis.1
+	install -d -m755 debian/$(maptools)/usr/share/doc
+	ln -s $(common) debian/$(maptools)/usr/share/doc/$(maptools)
+	
 	# quakeforge
-	find $(tmp) -type d -empty | xargs -r rmdir -p --ignore-fail-on-non-empty
+	find $(tmp) -type d -empty -print | 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)
@@ -225,12 +264,13 @@ binary-indep: build install
 # Pass -a to all debhelper commands in this target to reduce clutter.
 binary-arch: DH_OPTIONS=-a
 binary-arch: build install
-	dh_testversion 2
 	dh_testdir
 	dh_testroot
 	dh_installexamples
 	dh_installmenu
 	dh_installman -p$(QFCC)
+	dh_installman -p$(maptools)
+	dh_installman -p$(utils)
 	dh_undocumented
 	dh_strip
 	dh_link