From 74e56609b0d9429cde5d1a1e8b709312988bc568 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 7 Feb 2003 22:03:03 +0000
Subject: [PATCH] merge in the changes on the release_0_5_2 branch in
 preparation for 0.5.3

---
 RPM/quakeforge.spec.in | 5 ++---
 debian/changelog       | 8 ++++++++
 debian/quakeforge.conf | 9 ++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/RPM/quakeforge.spec.in b/RPM/quakeforge.spec.in
index 412d653b7..a9f0557b6 100644
--- a/RPM/quakeforge.spec.in
+++ b/RPM/quakeforge.spec.in
@@ -28,7 +28,7 @@ Source:         %{name}-%{version}.tar.gz
 Group:		Amusements/Games
 Copyright:	GPL
 #Icon:		
-Requires:	quakeforge-common, quakeforge-client, quake-game
+Requires:	quakeforge-common, quake-game
 BuildRoot:	/var/tmp/%{name}-%{version}
 Summary:	QuakeForge 3D game engine
 %description
@@ -430,8 +430,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(-,root,root) %dir	%{fs_sharepath}/id1
 
 %post stub
-if test -f %{fs_sharepath}/id1/pak0.pak; then
-else
+if test ! -f %{fs_sharepath}/id1/pak0.pak; then
 	echo Warning: %{fs_sharepath}/id1/pak0.pak not found
 	echo Install either the shareware or registered quake data in
 	echo %{fs_sharepath}
diff --git a/debian/changelog b/debian/changelog
index ed8b478be..52272b2fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+quakeforge (0.5.2-1.1) frozen unstable; urgency=low
+
+  * The "It is a silly place" release.
+  * Fix /etc/quakeforge.conf to load the default plugin, like all the work on
+    the plugins made everyone think it would work. :)
+
+ -- Jeff Teunissen <deek@d2dc.net>  Thu, 10 Oct 2002 00:54:23 -0400
+
 quakeforge (0.5.2-1) frozen unstable; urgency=low
 
   * New release.
diff --git a/debian/quakeforge.conf b/debian/quakeforge.conf
index e638b1948..786c0a5fc 100644
--- a/debian/quakeforge.conf
+++ b/debian/quakeforge.conf
@@ -1,17 +1,16 @@
 // QuakeForge Configuration
 
 // Location of shared data
-setrom fs_sharepath "/usr/share/games/quake"
+set fs_sharepath "/usr/share/games/quake"
 
 // Location of user's personal data
-setrom fs_userpath "~/.quake"
+set fs_userpath "~/.quakeforge"
 
 // CD Audio
 set cd_plugin linux
 
-// Uncomment one of these to choose audio support
-//set snd_output oss
-//set snd_output alsa0_9
+// Digital sound output
+set snd_output default
 
 // Video defaults
 set vid_width 640