r10332 - in packages/trunk/nexuiz-data/debian: . patches

Bruno Fuddl-guestquot; Fuddl" Kleinert fuddl-guest at alioth.debian.org
Fri Sep 11 11:46:35 UTC 2009 

Author: fuddl-guest
Date: 2009-09-11 11:46:34 +0000 (Fri, 11 Sep 2009)
New Revision: 10332

Removed:
   packages/trunk/nexuiz-data/debian/patches/01_fix-broken-mouse-in-pro.diff
Modified:
   packages/trunk/nexuiz-data/debian/changelog
   packages/trunk/nexuiz-data/debian/control
   packages/trunk/nexuiz-data/debian/copyright
   packages/trunk/nexuiz-data/debian/patches/01_remove_broken_keys.diff
   packages/trunk/nexuiz-data/debian/patches/02_disable_update_check.diff
   packages/trunk/nexuiz-data/debian/patches/series
   packages/trunk/nexuiz-data/debian/rules
Log:
Prepare for Nexuiz 2.5.1

Refreshed patches and removed an obsolete patch.


Modified: packages/trunk/nexuiz-data/debian/changelog
===================================================================
--- packages/trunk/nexuiz-data/debian/changelog	2009-09-10 20:25:32 UTC (rev 10331)
+++ packages/trunk/nexuiz-data/debian/changelog	2009-09-11 11:46:34 UTC (rev 10332)
@@ -1,8 +1,19 @@
-nexuiz-data (2.4.2-3) UNRELEASED; urgency=low
+nexuiz-data (2.5.1-1) UNRELEASED; urgency=low
 
+  [ Bruno "Fuddl" Kleinert ]
+  * New upstream release (Closes: #FIXME)
+  * Update copyright year to 2009 in debian/copyright
+  * Update to standards version 3.8.3. No changes were necessary
+  * Drop patch 01_fix-broken-mouse-in-pro.diff because upstream dropped the
+    "pro" mode
+  * Refreshed 01_remove_broken_keys.diff
+  * Refresh 02_disable_update_check.diff. Upstream added a variable to turn off
+    searching for new release, so we can simply disable it in defaultNexuiz.cfg
+
+  [ Gerfried Fuchs ]
   * Also clean qcsrc/menu/fteqcc.log and qcsrc/server/fteqcc.log.
 
- -- Gerfried Fuchs <rhonda at debian.at>  Tue, 23 Jun 2009 08:42:34 +0200
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 11 Sep 2009 13:42:18 +0200
 
 nexuiz-data (2.4.2-2) unstable; urgency=low
 

Modified: packages/trunk/nexuiz-data/debian/control
===================================================================
--- packages/trunk/nexuiz-data/debian/control	2009-09-10 20:25:32 UTC (rev 10331)
+++ packages/trunk/nexuiz-data/debian/control	2009-09-11 11:46:34 UTC (rev 10332)
@@ -6,7 +6,7 @@
   Gonéri Le Bouder <goneri at rulezlan.org>, Gerfried Fuchs <rhonda at debian.at>
 Build-Depends: debhelper (>= 4.0.0), quilt, fteqcc (>= 3343)
 Build-Depends-Indep: zip
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://www.nexuiz.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nexuiz-data/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nexuiz-data/?op=log

Modified: packages/trunk/nexuiz-data/debian/copyright
===================================================================
--- packages/trunk/nexuiz-data/debian/copyright	2009-09-10 20:25:32 UTC (rev 10331)
+++ packages/trunk/nexuiz-data/debian/copyright	2009-09-11 11:46:34 UTC (rev 10332)
@@ -3,7 +3,7 @@
 
 It was downloaded from http://www.nexuiz.com
 
-Copyright 2002 - 2008 Alientrap <lvermeulen at shaw.ca>
+Copyright 2002 - 2009 Alientrap <lvermeulen at shaw.ca>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

Deleted: packages/trunk/nexuiz-data/debian/patches/01_fix-broken-mouse-in-pro.diff
===================================================================
--- packages/trunk/nexuiz-data/debian/patches/01_fix-broken-mouse-in-pro.diff	2009-09-10 20:25:32 UTC (rev 10331)
+++ packages/trunk/nexuiz-data/debian/patches/01_fix-broken-mouse-in-pro.diff	2009-09-11 11:46:34 UTC (rev 10332)
@@ -1,16 +0,0 @@
-Index: nexuiz-data-2.4.2/pro/quake.rc
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nexuiz-data-2.4.2/pro/quake.rc	2008-05-23 15:05:32.000000000 +0200
-@@ -0,0 +1,11 @@
-+seta menu_mouse_speed 1
-+exec default.cfg
-+exec config.cfg
-+exec config_update.cfg
-+exec data/campaign.cfg
-+exec autoexec.cfg
-+stuffcmds
-+//startdemos demos/demo1 demos/demo2 demos/demo3
-+//startdemos
-+//play announcer/male/welcome.ogg
-+

Modified: packages/trunk/nexuiz-data/debian/patches/01_remove_broken_keys.diff
===================================================================
--- packages/trunk/nexuiz-data/debian/patches/01_remove_broken_keys.diff	2009-09-10 20:25:32 UTC (rev 10331)
+++ packages/trunk/nexuiz-data/debian/patches/01_remove_broken_keys.diff	2009-09-11 11:46:34 UTC (rev 10332)
@@ -1,8 +1,8 @@
-Index: nexuiz-data-2.4.2/data/default.cfg
+Index: nexuiz-data-2.5.1/data/defaultNexuiz.cfg
 ===================================================================
---- nexuiz-data-2.4.2.orig/data/default.cfg	2008-05-15 18:31:53.000000000 +0200
-+++ nexuiz-data-2.4.2/data/default.cfg	2008-05-15 18:32:19.000000000 +0200
-@@ -559,8 +559,6 @@
+--- nexuiz-data-2.5.1.orig/data/defaultNexuiz.cfg	2009-09-11 13:25:31.000000000 +0200
++++ nexuiz-data-2.5.1/data/defaultNexuiz.cfg	2009-09-11 13:25:48.000000000 +0200
+@@ -803,8 +803,6 @@
  
  // misc
  bind e +hook
@@ -10,17 +10,4 @@
 -bind ~ toggleconsole
  bind TAB +showscores
  bind ESCAPE togglemenu
- bind r messagemode2
-Index: nexuiz-data-2.4.2/pro/default.cfg
-===================================================================
---- nexuiz-data-2.4.2.orig/pro/default.cfg	2008-05-15 18:32:01.000000000 +0200
-+++ nexuiz-data-2.4.2/pro/default.cfg	2008-05-15 18:32:26.000000000 +0200
-@@ -556,8 +556,6 @@
- 
- // misc
- bind e +hook
--bind ` toggleconsole
--bind ~ toggleconsole
- bind TAB +showscores
- bind ESCAPE togglemenu
- bind r messagemode2
+ bind t messagemode

Modified: packages/trunk/nexuiz-data/debian/patches/02_disable_update_check.diff
===================================================================
--- packages/trunk/nexuiz-data/debian/patches/02_disable_update_check.diff	2009-09-10 20:25:32 UTC (rev 10331)
+++ packages/trunk/nexuiz-data/debian/patches/02_disable_update_check.diff	2009-09-11 11:46:34 UTC (rev 10332)
@@ -1,21 +1,15 @@
 Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
 Description: Disable update check so it won't nag users (closes: #522738)
 
-Index: nexuiz-data-2.4.2/qcsrc/menu/nexuiz/util.qc
+Index: nexuiz-data-2.5.1/data/defaultNexuiz.cfg
 ===================================================================
---- nexuiz-data-2.4.2.orig/qcsrc/menu/nexuiz/util.qc
-+++ nexuiz-data-2.4.2/qcsrc/menu/nexuiz/util.qc
-@@ -216,10 +216,13 @@ void postMenuDraw()
- void preMenuDraw()
- {
- 	vector fs, sz, line, mid;
-+#if 0
-+	// disable update check - no need to nag users (closes: #522738)
- 	Item_Nex_ExtResponseSystem_CheckForResponse();
- 	if(!_Nex_ExtResponseSystem_VersionHandled)
- 		if(time > _Nex_ExtResponseSystem_RetryTime)
- 			Item_Nex_ExtResponseSystem_SendQuery();
-+#endif
+--- nexuiz-data-2.5.1.orig/data/defaultNexuiz.cfg	2009-09-11 13:39:47.000000000 +0200
++++ nexuiz-data-2.5.1/data/defaultNexuiz.cfg	2009-09-11 13:40:02.000000000 +0200
+@@ -1449,6 +1449,6 @@
  
- 	if(_Nex_ExtResponseSystem_UpdateTo != "")
- 	{
+ rcon_secure 1
+ 
+-set menu_updatecheck 1
++set menu_updatecheck 0
+ 
+ 

Modified: packages/trunk/nexuiz-data/debian/patches/series
===================================================================
--- packages/trunk/nexuiz-data/debian/patches/series	2009-09-10 20:25:32 UTC (rev 10331)
+++ packages/trunk/nexuiz-data/debian/patches/series	2009-09-11 11:46:34 UTC (rev 10332)
@@ -1,3 +1,2 @@
-01_fix-broken-mouse-in-pro.diff
 01_remove_broken_keys.diff
 02_disable_update_check.diff

Modified: packages/trunk/nexuiz-data/debian/rules
===================================================================
--- packages/trunk/nexuiz-data/debian/rules	2009-09-10 20:25:32 UTC (rev 10331)
+++ packages/trunk/nexuiz-data/debian/rules	2009-09-11 11:46:34 UTC (rev 10332)
@@ -20,7 +20,7 @@
 	cd qcsrc/server && fteqcc
 	mv *.dat *.lno data
 	cd data && zip -r ../data.pk3 * -9 -x sound/cdtracks/\*
-	cd pro && zip -r ../datapro.pk3 * -9
+	#cd pro && zip -r ../datapro.pk3 * -9
 	mkdir -p debian/tmp/nexuiz-music/sound
 	cp -r data/sound/cdtracks debian/tmp/nexuiz-music/sound
 	cd debian/tmp/nexuiz-music && zip -r ../../../music.pk3 sound
@@ -32,7 +32,8 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	rm -rf *.dat *.lno debian/tmp data/*.dat data/*.lno
-	rm -f data.pk3 datapro.pk3 music.pk3
+	#rm -f data.pk3 datapro.pk3 music.pk3
+	rm -f data.pk3 music.pk3
 	rm -f qcsrc/menu/fteqcc.log qcsrc/server/fteqcc.log
 	dh_clean
 
@@ -42,7 +43,7 @@
 	dh_clean -k
 	dh_installdirs
 	dh_install -pnexuiz-data data.pk3 usr/share/games/nexuiz/data
-	dh_install -pnexuiz-data datapro.pk3 usr/share/games/nexuiz/pro
+	#dh_install -pnexuiz-data datapro.pk3 usr/share/games/nexuiz/pro
 	dh_install -pnexuiz-music music.pk3 usr/share/games/nexuiz/data
 
 binary-arch: build install

More information about the Pkg-games-commits mailing list