debian/*: Yaay, Debian packages. They're not perfect, but they should do

the job. -3dfx doesn't get a package built right now, there are...obstacles. acinclude.m4, configure.in, Makefile.am: -sgl is detected separately from -sdl now, and HAVE_XMESA is no longer in use.
2024-11-24 21:12:27 +00:00 · 2000-09-23 08:06:40 +00:00 · 2000-09-23 08:06:40 +00:00 · 830d6e044e
commit 830d6e044e
parent 2b4dcee14d
36 changed files with 737 additions and 18 deletions
--- a/acinclude.m4
+++ b/acinclude.m4
@ -183,3 +183,97 @@ int main (int argc, char *argv[])
  AC_SUBST(SDL_LIBS)
  rm -f conf.sdltest
 ])
+
+# Configure paths for SDL-GL
+# Jeff Teunissen 11 Aug 2000
+# stolen from Sam Lantinga
+# stolen from Manish Singh
+# stolen back from Frank Belew
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+dnl AM_CHECK_SGL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for SDL 1.1.x, and define SGL_CFLAGS and SGL_LIBS
+dnl ***MUST*** be run _after_ checking for SDL 1.0x, if used.
+dnl
+AC_DEFUN(AM_CHECK_SGL,
+[dnl 
+dnl Get the cflags and libraries from the sdl-config script
+dnl
+  min_sdl_version=ifelse([$1], ,1.1.0,$1)
+  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+  no_sgl=""
+  if test "$SDL_CONFIG" = "no" ; then
+    no_sgl=yes
+  else
+    SGL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+    SGL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+
+    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+dnl
+dnl Do nothing more than check if the installed SDL is sufficiently new, since
+dnl we already did that in the SDL detection
+dnl
+  AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <SDL/SDL.h>
+
+char*
+my_strdup (char *str)
+{
+   char *new_str;
+  
+   if (str) {
+      new_str = malloc ((strlen (str) + 1) * sizeof(char));
+      strcpy (new_str, str);
+   } else {
+      new_str = NULL;
+   }
+  
+   return new_str;
+}
+
+int
+main (int argc, char *argv[])
+{
+   int major, minor, micro;
+   char *tmp_version;
+
+   /* HP/UX 9 (%@#!) writes to sscanf strings */
+   tmp_version = my_strdup("$min_sdl_version");
+   if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+      printf("%s, bad version string\n", "$min_sdl_version");
+      exit(1);
+   }
+
+   if (($sdl_major_version > major) ||
+       (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+       (($sdl_major_version == major) && ($sdl_minor_version == minor) &&
+	   ($sdl_micro_version >= micro))) {
+      return 0;
+   } else {
+      return 1;
+   }
+}
+
+],, no_sgl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+    CFLAGS="$ac_save_CFLAGS"
+    LIBS="$ac_save_LIBS"
+  fi
+  if test "x$no_sgl" = x; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])
+  else
+     AC_MSG_RESULT(no)
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(SGL_CFLAGS)
+  AC_SUBST(SGL_LIBS)
+])
--- a/configure.in
+++ b/configure.in
@ -6,7 +6,7 @@ AM_CONFIG_HEADER(include/config.h)
 AC_CANONICAL_SYSTEM

 dnl This is the only place where the package version appears
-AM_INIT_AUTOMAKE(quakeforge, 0.1.99pre2)
+AM_INIT_AUTOMAKE(quakeforge, 0.2.99beta1)

 dnl Define the proper name and extra version numbers for package
 PROGRAM=QuakeForge
@ -413,12 +413,6 @@ if test "x$glx_libraries" != xauto -a "x$glx_libraries" != xno -a "x$glx_librari
 				[ -L$glx_libraries ]
 			)
 		fi
-		if test "x$HAVE_GLX" = xyes -a "x$have_dynload" != xyes; then
-			AC_CHECK_LIB($OGL_NAME, XMesaSetFXmode,
-				AC_DEFINE(HAVE_XMESA),,
-				[ -L$glx_libraries ]
-			)
-		fi
 	fi
 else
 	if test "x$glx_libraries" != xauto \
@ -441,12 +435,6 @@ else
 				[ $X_LIBS ]
 			)
 		fi
-		if test "x$HAVE_GLX" = xyes -a "x$have_dynload" != xyes; then
-			AC_CHECK_LIB($OGL_NAME, XMesaSetFXmode,
-				AC_DEFINE(HAVE_XMESA),,
-				[ $X_LIBS ]
-			)
-		fi
 	fi
 fi

@ -462,8 +450,14 @@ fi
 AC_SUBST(GLX_CFLAGS)
 AC_SUBST(GLX_LIBS)

-dnl SDL check
-AM_PATH_SDL(1.1.3, HAVE_SDL=yes, HAVE_SDL=no)
+dnl SDL/SDL-GL checks
+AM_PATH_SDL(1.0.1, HAVE_SDL=yes, HAVE_SDL=no)
+
+if test "x$HAVE_SDL" != xno; then
+	AM_CHECK_SGL(1.1.1, HAVE_SGL=yes, HAVE_SGL=no)
+fi
+AC_SUBST(HAVE_SDL)
+AC_SUBST(HAVE_SGL)

 # 3Dfx stuff..

@ -959,9 +953,11 @@ fi
 if test "x$HAVE_SDL" = xyes ; then
 	TARGETS="$TARGETS qf-client-sdl\$(EXEEXT)"
 	CL_TARGETS="$CL_TARGETS SDL"
+fi
+if test "x$HAVE_SGL" = xyes; then
 	if test "x$HAVE_GLX" = xyes; then
 		TARGETS="$TARGETS qf-client-sgl\$(EXEEXT)"
-		CL_TARGETS="$CL_TARGETS SGL"
+		CL_TARGETS="$CL_TARGETS SDL-GL"
 	fi
 fi
 if test "x$HAVE_SVGA" = xyes ; then
--- a/debian/changelog
+++ b/debian/changelog
@ -0,0 +1,348 @@
+quakeforge (0.2.99alpha0-1) frozen unstable; urgency=low
+
+  * New upstream release
+  * New maintainer
+  * uquake-* targets dropped upstream, to be re-added in new package
+  * New package quakeforge-common contains quakeforge.conf conffile
+
+ -- Jeff Teunissen <deek@dusknet.dhs.org>  Fri, 22 Sep 2000 03:22:56 -0400
+
+quakeforge (0.2-20000308-1) frozen unstable; urgency=low
+
+  * Unstable CVS snapshot
+  * quake-* binaries are now named uquake-*
+  * -gl targets are now more properly named -glx
+  * Some minor annoyances with the status bar fixed in 0.1.1 have not been
+    fixed in 0.2-d yet.  You won't see them, unless you play hip/rogue and
+    they aren't really critical.
+  * Sorry, no ~/.quake handling internally yet.
+
+ -- Joseph Carter <knghtbrd@debian.org>  Wed,  8 Mar 2000 01:21:04 -0800
+
+quakeforge (0.1.1-1) frozen unstable; urgency=medium
+
+  * New upstream bugfix for people on Quack!
+  * Fixed two nasty segfaults that could hose a box under SVGALib
+  * Made UQuake statusbar behave sanely with cl_sbar 1 again
+  * cl_sbar ignored properly in rogue/hipnotic--always assumed to be 1
+  * default gl_clear to 1 so noclip doesn't do strange things onscreen
+  * changed glClearColor to black so gl_clear 1 doesn't look like crap
+
+ -- Joseph Carter <knghtbrd@debian.org>  Sun, 27 Feb 2000 03:31:31 -0800
+
+quakeforge (0.1.0-1) frozen unstable; urgency=HIGH
+
+  * "0.0.9-1" was actually "0.1-20000103-1"
+  * Fixed the sig4's in the SVGALib-using targets
+  * replaced qwprogs.dat, no longer segfaults (Closes: #54152)
+  * -ip will let you bind a specific IP (Closes: #14445)  (I hope)
+  * quake-svga is suid root like other svgalib apps now (Closes: #47954)
+  * quake-x11 restores repeat properly on normal exit (Closes: #48018)
+  * If /dev/dsp can't be opened, just don't use sound (Closes: #53533)
+  * The return of the wrapper scripts..  They've been rewritten a bit for
+    dealing with unpacked pak files.  A new quake-lib-stub is needed if your
+    pak files are not all lowercase.  (Closes: #54153, #54221, #54634)
+  * svgalib targets are i386 only at the moment  =<  (Closes: #54451)
+  * Built with newer libsdl  (Closes: #54488)
+  * README now notes the gl_ztrick issue..  Essentially ztrick is a hack
+    Id used to keep from clearing the Z buffer, it worked with older Mesa
+    and with the 3dfx GL MCD.  Mesa 3+ flicker madly, so it defaults to off
+    in the -gl target.  You still have to disable it by hand for the -3dfx
+    target (since it's intended to be used with the 3dfx GL MCD..)  If set
+    once to 0 it will be saved in that state.  (Closes: #54530)
+  * If you want to start -svga and -3dfx from X, use open.  Documented this
+    in the README.  (Closes: #54595)
+  * Package relationships updated/fixed.  (Closes: #54747, #54868)
+  * docs are now installed more sanely.  (Closes: #54749)
+  * bins and data owned by games isn't going to happen  (Closes: #54742)
+
+ -- Joseph Carter <knghtbrd@debian.org>  Sun, 16 Jan 2000 13:26:24 -0800
+
+quakeforge (0.0.9-1) unstable; urgency=low
+
+  * Major new upstream version--Quake is GPL!
+
+ -- Joseph Carter <knghtbrd@debian.org>  Mon,  3 Jan 2000 00:09:58 -0800
+
+quake (1.09-1.30-2pre3.2) unstable; urgency=low
+
+  * Build with new shlibs files - the shlibs files are now NORMAL shlibs
+    files, but a patch to dpkg-shlibdeps is still required.
+  * quake-common package - it exists now and everything depends on it,
+    though it doesn't do anything yet but depend on the quake-lib's the
+    way the quake bins used to.  Will eventually do useful stuff.
+  * Fully FHS compliant now!
+  * (Re)wrote descriptions for the packages
+  * GLQuake packages depend on quake-common, this fixes a bug that would
+    let you install glquake* without installing any quake-lib*'s..
+
+ -- Joseph Carter <knghtbrd@debian.org>  Mon,  6 Sep 1999 14:19:53 -0700
+
+quake (1.09-1.30-2pre3.1) unstable; urgency=low
+
+  * Hopefully ironed out the dependencies/shlibs stuff (still uses my .
+    soname patch
+  * Changed the wrappers of the glquake stuff a little
+
+ -- Joseph Carter <knghtbrd@debian.org>  Sat, 31 Jul 1999 10:54:47 -0700
+ 
+quake (1.09-1.30-2pre3) unstable; urgency=low
+
+  * Not released officially
+  * build debs of the libs glquake bins are shipped with
+  * build debs of the 3 glquake bins---all depend on the libs package FOR
+    NOW (this will change) and there's no manpages for them yet, RTF
+    README if you don't know the options.
+
+ -- Joseph Carter <knghtbrd@debian.org>  Sat, 31 Jul 1999 00:42:25 -0700
+
+quake (1.09-1.30-2) unstable; urgency=low
+
+  * Actually compress the manpages this time
+
+ -- Joseph Carter <knghtbrd@debian.org>  Thu, 17 Jun 1999 01:38:37 -0700
+
+quake (1.09-1.30-1) unstable; urgency=low
+
+  * New upstream version - glibc2 binaries at last!
+  * Since the quake binaries all came in one package, I've combined the
+    squake and xquake packages.
+
+ -- Joseph Carter <knghtbrd@debian.org>  Sun, 13 Jun 1999 23:52:01 -0700
+
+squake (1.09-1.1-15) unstable; urgency=low
+
+  * Adopted the package - Must Have Quake!
+
+ -- Joseph Carter <knghtbrd@debian.org>  Fri, 28 May 1999 06:32:41 -0700
+
+squake (1.09-1.1-14) unstable; urgency=low
+
+  * Orphaned the package, I don't maintain non-free things anymore.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu, 18 Mar 1999 15:00:22 -0800
+
+squake (1.09-1.1-13) frozen unstable; urgency=low
+
+  * Updated the copyright file with info from a very old mail from ID
+    software in which they told me that repackaging it as a deb is not a
+    deriviative work.
+  * Updated the copyright file to include all of slicense.txt, instead of
+    referencing it.
+  * No code changes, and I think the copyright fixups are important enough
+    to put it in to frozen.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon,  7 Dec 1998 15:34:16 -0800
+
+squake (1.09-1.1-12) unstable; urgency=low
+
+  * The wrapper can now handle uppercase .PAK files (#28781).
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 31 Oct 1998 21:06:48 -0800
+
+squake (1.09-1.1-11) unstable; urgency=low
+
+  * Modified wrapper so it will add /usr/games to the end of PATH, and run
+    squake.real (w/o full filename). This is mainly to support some things
+    aa quake will need to do.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon,  7 Sep 1998 16:58:08 -0700
+
+squake (1.09-1.1-10) unstable; urgency=low
+
+  * Fixed the wrapper so it runs squake.real properly even if /usr/games
+    isn't in the user's PATH.
+  * Added a note to the README.Debian about the common squake is suid root,
+    but mouse doesn't work problem.
+
+ -- Joey Hess <joeyh@master.debian.org>  Wed, 19 Aug 1998 22:39:23 -0700
+
+squake (1.09-1.1-9) unstable; urgency=low
+
+  * Removed icon=none from menu file.
+
+ -- Joey Hess <joeyh@master.debian.org>  Wed,  5 Aug 1998 14:24:19 -0700
+
+squake (1.09-1.1-8) unstable; urgency=low
+
+  * Fixed wrapper not to use source bashism.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu, 30 Jul 1998 20:48:17 -0700
+
+squake (1.09-1.1-7) unstable; urgency=low
+
+  * Fixed package description spelling(#18953).
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu,  5 Mar 1998 16:36:54 -0800
+
+squake (1.09-1.1-6) unstable; urgency=low
+
+  * Added man page for squake.
+  * Fixed all other lintian errors & warnings.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 21 Feb 1998 14:01:25 -0800
+
+squake (1.09-1.1-5) unstable; urgency=low
+
+  * Updated standards-version.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon,  9 Feb 1998 14:10:46 -0800
+
+squake (1.09-1.1-4) unstable; urgency=low
+
+  * Modified wraper script each user has an individual .quake directory in
+    their home directory (#15452).
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 29 Nov 1997 14:22:01 -0500
+
+squake (1.09-1.1-3) unstable; urgency=low
+
+  * Use debhelper.
+  * Don't do the runme stuff anymore, becuase ID no longer distributes a
+    runme script.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sun, 16 Nov 1997 19:21:34 -0500
+
+squake (1.09-1.1-2) unstable; urgency=low
+
+  * Fixed postinst prompting (#12601).
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon,  8 Sep 1997 18:56:39 -0400
+
+squake (1.09-1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Moved to non-free.
+  * Preserve file dates.
+  * Added README.debian about the suid problem.
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 6 May 1997 20:37:13 -0400
+
+squake (1.07-1.0-3) unstable; urgency=low
+
+  * Check for /etc/suid.conf, not the suidmananger binary. Actually, I let
+    debstd handle it. Maybe I've finally gotten this right..
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 6 May 1997 20:37:13 -0400
+
+squake (1.07-1.0-2) unstable; urgency=low
+
+  * Fixed stupid error; will install if suidmanager is not present now.
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 6 May 1997 20:14:23 -0400
+
+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 
+    scheme for making squake suid.
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 6 May 1997 16:10:04 -0400
+
+squake (1.07-0.992-2) unstable; urgency=high
+
+  * A security hole is known in squake which could allow users to get root
+    if the program is installed suid. As a temporary fix until a fixed
+    version is available, squake is no longer installed suid.
+  * 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 
+    there is no source code available.
+  * Converted menu file to menu-1 format.
+
+ -- Joey Hess <joeyh@master.debian.org>  Fri, 25 Apr 1997 15:34:37 -0400
+
+squake (1.07-0.991-1) unstable; urgency=low
+
+  * Updated to squake version 0.991.
+  * Split quake source package into xquake and squake source packages.
+    Had to do this becuase new versions of xquake and squake are coming out
+    at different times.
+  * Changed version number to reflect both the main quake revision number
+    and the squake subrevision number.
+  * Routine update of debian/rules:
+    Run dpkg-gencontrol after debstd, and delete substvars during clean.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 5 Apr 1997 21:33:44 -0500
+
+quake (1.06-4) unstable; urgency=low
+
+  * Modified wrapper script so it reads /etc/quake.conf to determine where
+    the quake libraries are. This will eliminate the need for symlinks if
+    quake-lib-stub is used.
+  * Routine update of debian/rules:
+    Run dpkg-gencontrol after debstd, and delete substvars during clean.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 22 Mar 1997 18:14:53 -0500
+
+quake (1.06-3) unstable; urgency=low
+
+  * 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:
+    Modifications for multiple binary package support.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sun, 2 Mar 1997 15:03:53 -0500
+
+quake (1.06-2) unstable; urgency=low
+
+  * Removed s-bit from file in orig.tar.gz file, so dpkg-source -x will
+    work.
+
+ -- Joey Hess <joeyh@master.debian.org>  Wed, 26 Feb 1997 15:24:41 -0500
+
+quake (1.06-1) unstable; urgency=low
+
+  * 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 
+    building the 1.06 xquake binaries (and for a few other things <g>)).
+  * Split into 2 binary packages: xquake and squake.
+  * Dropped xf86quake out of the package for now, as a 1.06 version is not
+    available.
+  * Routine update of debian/rules:
+    Modifications for multiple binary package support.
+
+ -- Joey Hess <joeyh@master.debian.org>  Fri, 7 Feb 1997 20:51:24 -0500
+
+quake (1.01-4) unstable; urgency=low
+
+  * Changed an error message in xf86quake that told the user to chmod 666
+    /dev/mem.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 4 Jan 1997 19:31:04 -0500
+
+quake (1.01-3) unstable; urgency=low
+
+  * Changed libc5 dependancy to make users of debian 1.2 happy.
+  * Routine update of debian/rules:
+    Use build-stamp instead of build.
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 31 Dec 1996 12:29:55 -0500
+
+quake (1.01-2) unstable; urgency=low
+
+  * Changed quake-lib dependancy: requires exactly quake-lib 1.01, or
+    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 
+    hole. Added documentation to README.debian about this.
+  * Added a menu file.
+  * Routine update of debian/rules:
+    New email address.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 28 Dec 1996 14:56:08 -0500
+
+quake (1.01-1) non-free; urgency=low
+
+  * First release.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 11 Nov 1996 16:23:43 -0500
+
+Local variables:
+mode: debian-changelog
+End:
--- a/debian/control
+++ b/debian/control
@ -0,0 +1,112 @@
+Source: quakeforge
+Section: contrib/games
+Priority: optional
+Maintainer: Jeff Teunissen <deek@dusknet.dhs.org>
+Standards-Version: 3.1.1
+
+Package: quakeforge
+Architecture: any
+Depends: quake-game, quakeforge-common, qf-client
+Suggests: qf-server
+Description: First-person shooter Internet game - 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.
+
+Package: quakeforge-common
+Architecture: any
+Depends: quake-game
+Description: First-person shooter Internet game - 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.
+
+Package: qf-client-ggi
+Architecture: any
+Depends: ${shlibs:Depends}, quake-game
+Provides: qf-client
+Description: First-person shooter Internet game - GGI 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 GGI version of the QuakeForge client.
+
+Package: qf-client-sdl
+Architecture: i386
+Depends: ${shlibs:Depends}, libsdl1.1, quake-game
+Provides: qf-client
+Description: First-person shooter Internet game - 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.
+
+Package: qf-client-svga
+Architecture: i386
+Depends: ${shlibs:Depends}, quake-game
+Provides: qf-client
+Description: First-person shooter Internet game - 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.
+
+Package: qf-client-x11
+Architecture: any
+Depends: ${shlibs:Depends}, quake-game
+Provides: qf-client
+Description: First-person shooter Internet game - 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.
+
+Package: qf-client-glx
+Architecture: any
+Depends: ${shlibs:Depends}, libgl1, quake-game
+Provides: qf-client
+Description: First-person shooter Internet game - 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.
+
+Package: qf-client-sgl
+Architecture: any
+Depends: ${shlibs:Depends}, libsdl1.1 (>= 1.1.3), quake-game
+Provides: qf-client
+Description: First-person shooter Internet game - 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.
+
+Package: qf-server
+Architecture: any
+Depends: ${shlibs:Depends}, quake-game
+Provides: qf-client
+Description: First-person shooter Internet game - 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.
--- a/debian/qf-client-3dfx.dirs
+++ b/debian/qf-client-3dfx.dirs
@ -0,0 +1,2 @@
+usr/games
+usr/share/man/man6
--- a/debian/qf-client-3dfx.docs
+++ b/debian/qf-client-3dfx.docs
@ -0,0 +1,4 @@
+INSTALL
+README
+doc
+NEWS
--- a/debian/qf-client-3dfx.files
+++ b/debian/qf-client-3dfx.files
@ -0,0 +1 @@
+usr/games/qf-client-3dfx
--- a/debian/qf-client-3dfx.suid
+++ b/debian/qf-client-3dfx.suid
@ -0,0 +1 @@
+usr/games/qf-client-3dfx
--- a/debian/qf-client-ggi.dirs
+++ b/debian/qf-client-ggi.dirs
@ -0,0 +1,2 @@
+usr/games
+usr/share/man/man6
--- a/debian/qf-client-ggi.docs
+++ b/debian/qf-client-ggi.docs
@ -0,0 +1,4 @@
+INSTALL
+README
+doc
+NEWS
--- a/debian/qf-client-ggi.files
+++ b/debian/qf-client-ggi.files
@ -0,0 +1 @@
+usr/games/qf-client-ggi
--- a/debian/qf-client-glx.dirs
+++ b/debian/qf-client-glx.dirs
@ -0,0 +1,2 @@
+usr/games
+usr/share/man/man6
--- a/debian/qf-client-glx.docs
+++ b/debian/qf-client-glx.docs
@ -0,0 +1,4 @@
+INSTALL
+README
+doc
+NEWS
--- a/debian/qf-client-glx.files
+++ b/debian/qf-client-glx.files
@ -0,0 +1 @@
+usr/games/qf-client-glx
--- a/debian/qf-client-sdl.dirs
+++ b/debian/qf-client-sdl.dirs
@ -0,0 +1,2 @@
+usr/games
+usr/share/man/man6
--- a/debian/qf-client-sdl.docs
+++ b/debian/qf-client-sdl.docs
@ -0,0 +1,4 @@
+INSTALL
+README
+doc
+NEWS
--- a/debian/qf-client-sdl.files
+++ b/debian/qf-client-sdl.files
@ -0,0 +1 @@
+usr/games/qf-client-sdl
--- a/debian/qf-client-sgl.dirs
+++ b/debian/qf-client-sgl.dirs
@ -0,0 +1,2 @@
+usr/games
+usr/share/man/man6
--- a/debian/qf-client-sgl.docs
+++ b/debian/qf-client-sgl.docs
@ -0,0 +1,4 @@
+INSTALL
+README
+doc
+NEWS
--- a/debian/qf-client-sgl.files
+++ b/debian/qf-client-sgl.files
@ -0,0 +1 @@
+usr/games/qf-client-sgl
--- a/debian/qf-client-svga.dirs
+++ b/debian/qf-client-svga.dirs
@ -0,0 +1,2 @@
+usr/games
+usr/share/man/man6
--- a/debian/qf-client-svga.docs
+++ b/debian/qf-client-svga.docs
@ -0,0 +1,4 @@
+INSTALL
+README
+doc
+NEWS
--- a/debian/qf-client-svga.files
+++ b/debian/qf-client-svga.files
@ -0,0 +1 @@
+usr/games/qf-client-svga
--- a/debian/qf-client-svga.suid
+++ b/debian/qf-client-svga.suid
@ -0,0 +1 @@
+usr/games/qf-client-svga
--- a/debian/qf-client-x11.dirs
+++ b/debian/qf-client-x11.dirs
@ -0,0 +1,2 @@
+usr/games
+usr/share/man/man6
--- a/debian/qf-client-x11.docs
+++ b/debian/qf-client-x11.docs
@ -0,0 +1,4 @@
+INSTALL
+README
+doc
+NEWS
--- a/debian/qf-client-x11.files
+++ b/debian/qf-client-x11.files
@ -0,0 +1 @@
+usr/games/qf-client-x11
--- a/debian/qf-server.dirs
+++ b/debian/qf-server.dirs
@ -0,0 +1,3 @@
+usr/games
+usr/share/man/man6
+usr/share/games/quake/qw
--- a/debian/qf-server.docs
+++ b/debian/qf-server.docs
@ -0,0 +1,4 @@
+INSTALL
+README
+doc
+NEWS
--- a/debian/qf-server.files
+++ b/debian/qf-server.files
@ -0,0 +1 @@
+usr/games/qf-server
--- a/debian/quakeforge-common.docs
+++ b/debian/quakeforge-common.docs
@ -0,0 +1,4 @@
+INSTALL
+README
+doc
+NEWS
--- a/debian/quakeforge-common.files
+++ b/debian/quakeforge-common.files
@ -0,0 +1 @@
+etc/quakeforge.conf
--- a/debian/quakeforge.conf
+++ b/debian/quakeforge.conf
@ -0,0 +1,8 @@
+// QuakeForge: NEEDNAME Configuration
+
+
+set fs_sharepath "/usr/share/games/quake"	// Location of shared data
+set fs_userpath "~/.quake"		// Location of user's personal data
+
+//set fs_basegame base			// Name of the base 
+
--- a/debian/rules
+++ b/debian/rules
@ -0,0 +1,97 @@
+#! /usr/bin/make -f
+# This file is public domain software, originally written by Joey Hess.
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=2
+
+tmp	:= $(shell pwd)/debian/tmp
+
+ifeq ($(DEB_BUILD_GNU_TYPE),)
+RETARGET=
+else
+RETARGET=	--host=$(DEB_BUILD_GNU_TYPE)
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	[ -d CVS ] && tools/cvs2cl/cvs2cl.pl
+	./bootstrap
+	./configure --prefix=/usr $(RETARGET) --bindir=/usr/games \
+		    --mandir=\$${prefix}/share/man \
+		    --infodir=\$${prefix}/share/info \
+#		    --with-3dfx=GL
+
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+
+	dh_clean
+
+install:
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) prefix=$(tmp)/usr bindir=$(tmp)/usr/games install
+	mkdir $(tmp)/etc
+	cp debian/quakeforge.conf $(tmp)/etc
+
+	dh_movefiles
+
+# Build architecture-independent files here.
+# Pass -i to all debhelper commands in this target to reduce clutter.
+binary-indep: DH_OPTIONS=-i
+binary-indep: build install
+# We don't have any packages with Architecture: all
+
+# Build architecture-dependent files here.
+# 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_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_undocumented
+	dh_installchangelogs ChangeLog
+	dh_strip
+	dh_link
+	dh_compress
+	dh_fixperms
+	# 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
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- a/include/win32/version.h
+++ b/include/win32/version.h
@ -30,7 +30,7 @@
 /* Version strings */
 #define PACKAGE 	"quakeforge"
 #define PROGRAM 	"QuakeForge"
-#define VERSION 	"0.1.99pre2"
+#define VERSION 	"0.2.99beta1"
 #define QW_VERSION	"2.40"
 #define QSG_VERSION	"2.0"

--- a/source/Makefile.am
+++ b/source/Makefile.am
@ -30,7 +30,7 @@
 #
 # Stuff that is common to both client and server
 #
-INCLUDES=	-I$(top_srcdir)/include $(MGL_CFLAGS) $(GGI_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLX_CFLAGS) $(TDFXGL_CFLAGS)
+INCLUDES=	-I$(top_srcdir)/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLX_CFLAGS) $(TDFXGL_CFLAGS)

 bin_PROGRAMS =	@TARGETS@