[game-data-packager] 18/293: * Updated to SVN release 592 (1.34-rc1) * refreshed patches * xpm file is no longer in SVN

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch quake
in repository game-data-packager.

commit 7a5e433f47970f9bcff21f38c91a25fb0c042d3b
Author: Marc Leeman <marc.leeman at gmail.com>
Date:   Wed Mar 1 09:57:13 2006 +0000

    * Updated to SVN release 592 (1.34-rc1)
    * refreshed patches
    * xpm file is no longer in SVN
    
    ioquake3 (1.33+svn580-1) unstable; urgency=low
---
 debian/changelog                        |  8 ++++++++
 debian/ioquake3.desktop                 |  2 +-
 debian/patches/authorize-localhost.diff |  9 +++++----
 debian/patches/ioquake3-debian.diff     | 22 ++++++++++++----------
 debian/rules                            |  4 +---
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 387e370..651ffaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ioquake3 (1.34-rc1+svn592-1) unstable; urgency=low
+
+  * Updated to SVN release 592
+  * refreshed patches
+  * xpm file is no longer in SVN
+
+ -- Marc Leeman <marc.leeman at gmail.com>  Tue, 28 Feb 2006 22:11:16 +0100
+
 ioquake3 (1.33+svn580-1) unstable; urgency=low
 
   * Updated to SVN release 580
diff --git a/debian/ioquake3.desktop b/debian/ioquake3.desktop
index 1990ed0..e3968e1 100644
--- a/debian/ioquake3.desktop
+++ b/debian/ioquake3.desktop
@@ -4,6 +4,6 @@ Name=Quake III Arena
 Comment=Icculus.Org Quake III Arena
 Exec=/usr/games/ioquake3 --quiet
 Terminal=false
-Icon=ioquake3.xpm
+Icon=ioquake3
 Type=Application
 Categories=Application;Game;
diff --git a/debian/patches/authorize-localhost.diff b/debian/patches/authorize-localhost.diff
index 86826d1..d63394e 100644
--- a/debian/patches/authorize-localhost.diff
+++ b/debian/patches/authorize-localhost.diff
@@ -1,7 +1,8 @@
-diff -rup ioquake3-1.33+svn544.orig/code/qcommon/qcommon.h ioquake3-1.33+svn544/code/qcommon/qcommon.h
---- ioquake3-1.33+svn544.orig/code/qcommon/qcommon.h	2006-02-16 12:34:38.574323552 +0100
-+++ ioquake3-1.33+svn544/code/qcommon/qcommon.h	2006-02-16 12:33:48.193910895 +0100
-@@ -239,7 +239,10 @@ extern int demo_protocols[];
+Index: ioquake3-1.33+svn592/code/qcommon/qcommon.h
+===================================================================
+--- ioquake3-1.33+svn592.orig/code/qcommon/qcommon.h	2006-02-28 22:09:05.750562985 +0100
++++ ioquake3-1.33+svn592/code/qcommon/qcommon.h	2006-02-28 22:09:29.450730863 +0100
+@@ -239,7 +239,10 @@
  #define MASTER_SERVER_NAME	"master.quake3arena.com"
  #endif
  #ifndef AUTHORIZE_SERVER_NAME
diff --git a/debian/patches/ioquake3-debian.diff b/debian/patches/ioquake3-debian.diff
index d90a469..79817ee 100644
--- a/debian/patches/ioquake3-debian.diff
+++ b/debian/patches/ioquake3-debian.diff
@@ -1,19 +1,21 @@
-diff -rup ioquake3-1.33+svn544.orig/code/qcommon/q_shared.h ioquake3-1.33+svn544/code/qcommon/q_shared.h
---- ioquake3-1.33+svn544.orig/code/qcommon/q_shared.h	2006-02-16 12:34:38.502322964 +0100
-+++ ioquake3-1.33+svn544/code/qcommon/q_shared.h	2006-02-16 12:33:48.189910862 +0100
-@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth 
+Index: ioquake3-1.33+svn592/code/qcommon/q_shared.h
+===================================================================
+--- ioquake3-1.33+svn592.orig/code/qcommon/q_shared.h	2006-02-28 22:06:10.977391589 +0100
++++ ioquake3-1.33+svn592/code/qcommon/q_shared.h	2006-02-28 22:10:25.839138772 +0100
+@@ -26,7 +26,7 @@
  // q_shared.h -- included first by ALL program modules.
  // A user mod should never modify this file
  
--#define	Q3_VERSION		"ioQ3 1.33"
-+#define	Q3_VERSION		"GNU/Debian ioQ3 1.33"
+-#define	Q3_VERSION		"ioQ3 1.34-rc1"
++#define Q3_VERSION              "GNU/Debian ioQ3 1.34-rc1"
  // 1.32 released 7-10-2002
  
  #define MAX_TEAMNAME 32
-diff -rup ioquake3-1.33+svn544.orig/code/server/sv_init.c ioquake3-1.33+svn544/code/server/sv_init.c
---- ioquake3-1.33+svn544.orig/code/server/sv_init.c	2006-02-16 12:34:33.806284648 +0100
-+++ ioquake3-1.33+svn544/code/server/sv_init.c	2006-02-16 12:33:48.193910895 +0100
-@@ -579,7 +579,7 @@ void SV_Init (void) {
+Index: ioquake3-1.33+svn592/code/server/sv_init.c
+===================================================================
+--- ioquake3-1.33+svn592.orig/code/server/sv_init.c	2006-02-28 22:06:08.405375241 +0100
++++ ioquake3-1.33+svn592/code/server/sv_init.c	2006-02-28 22:09:46.090849996 +0100
+@@ -579,7 +579,7 @@
  	Cvar_Get ("protocol", va("%i", PROTOCOL_VERSION), CVAR_SERVERINFO | CVAR_ROM);
  	sv_mapname = Cvar_Get ("mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM);
  	sv_privateClients = Cvar_Get ("sv_privateClients", "0", CVAR_SERVERINFO);
diff --git a/debian/rules b/debian/rules
index 4e0afa0..5d77948 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ clean: unpatch
 	-$(MAKE) distclean
 	
 	# Clean up files we generated on our own
-	-rm -f build-stamp configure-stamp unpack-stamp ioq3ded.6 ioquake3.6 ioquake3.xpm ioquake3.svg
+	-rm -f build-stamp configure-stamp unpack-stamp ioq3ded.6 ioquake3.6 ioquake3.svg
 	dh_clean
 
 install: DH_OPTIONS=
@@ -61,12 +61,10 @@ install: build
 	cp build/release-linux-$(Q3ARCH)/ioquake3.$(Q3ARCH) build/release-linux-$(Q3ARCH)/ioquake3
 	cp build/release-linux-$(Q3ARCH)/ioquake3-smp.$(Q3ARCH) build/release-linux-$(Q3ARCH)/ioquake3-smp
 	cp build/release-linux-$(Q3ARCH)/ioq3ded.$(Q3ARCH) build/release-linux-$(Q3ARCH)/ioq3ded
-	cp code/unix/quake3.xpm ioquake3.xpm
 	cp code/unix/quake3.svg ioquake3.svg
 	
 	### client files
 	dh_install -pioquake3 debian/scripts/ioquake3 usr/games
-	dh_install -pioquake3 ioquake3.xpm usr/share/pixmaps
 	dh_install -pioquake3 ioquake3.svg usr/share/pixmaps
 	dh_install -pioquake3 debian/ioquake3.desktop usr/share/applications # TODO waiting for dh_desktop to do that job! :(
 	dh_install -pioquake3 build/release-linux-$(Q3ARCH)/ioquake3 \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git