r7165 - packages/trunk/nexuiz/debian

Bruno Fuddl-guestquot; Fuddl" Kleinert fuddl-guest at alioth.debian.org
Fri May 23 12:08:21 UTC 2008


Author: fuddl-guest
Date: 2008-05-23 12:08:16 +0000 (Fri, 23 May 2008)
New Revision: 7165

Added:
   packages/trunk/nexuiz/debian/nexuiz-server.install
   packages/trunk/nexuiz/debian/nexuiz.install
Removed:
   packages/trunk/nexuiz/debian/scripts/
Modified:
   packages/trunk/nexuiz/debian/NEWS.Debian
   packages/trunk/nexuiz/debian/README.Debian
   packages/trunk/nexuiz/debian/changelog
   packages/trunk/nexuiz/debian/nexuiz-server.6
   packages/trunk/nexuiz/debian/nexuiz.6
   packages/trunk/nexuiz/debian/nexuiz.desktop
   packages/trunk/nexuiz/debian/nexuiz.menu
   packages/trunk/nexuiz/debian/nexuiz_pro.desktop
   packages/trunk/nexuiz/debian/rules
Log:
- get rid of wrapper scripts
* hopefully got every kind of documentation up to date about the above change


Modified: packages/trunk/nexuiz/debian/NEWS.Debian
===================================================================
--- packages/trunk/nexuiz/debian/NEWS.Debian	2008-05-22 21:38:07 UTC (rev 7164)
+++ packages/trunk/nexuiz/debian/NEWS.Debian	2008-05-23 12:08:16 UTC (rev 7165)
@@ -4,13 +4,17 @@
   (often called a "mod") for Nexuiz. The necessary files are included in
   nexuiz-data.
   You can play Nexuiz in "pro" mode by starting Nexuiz from the command line
-  prompt with -p or --pro as parameter (nexuiz --pro). This also applies to
-  the server (nexuiz-server --pro).
+  prompt with the parameter "-game pro" (nexuiz -game pro). This also applies to
+  the server (nexuiz-server -game pro).
   If you prefer starting Nexuiz by the menu in your window manager, you can use
   the new entry "Nexuiz (pro mode)".
 
- -- Bruno "Fuddl" Kleinert <fuddl at tauware.de>  Fri, 16 May 2008 11:46:14 +0200
+  Starting from this package on there are no wrapper shell scripts around the
+  binary files anymore. This means the parameters --help and --quiet are no
+  longer available for the commands nexuiz and nexuiz-server!
 
+ -- Bruno "Fuddl" Kleinert <fuddl at tauware.de>  Fri, 23 May 2008 13:29:20 +0200
+
 nexuiz (2.3-4) unstable; urgency=low
 
   The nexuiz source package builds two debug packages, now:

Modified: packages/trunk/nexuiz/debian/README.Debian
===================================================================
--- packages/trunk/nexuiz/debian/README.Debian	2008-05-22 21:38:07 UTC (rev 7164)
+++ packages/trunk/nexuiz/debian/README.Debian	2008-05-23 12:08:16 UTC (rev 7165)
@@ -54,13 +54,11 @@
 Bug reporting
 =============
 
-If Nexuiz or the Nexuiz server crashes on your system, please install the 
-corresponding debug-symbol package (nexuiz-dbg and nexuiz-server-dbg) and 
+If Nexuiz or the Nexuiz server crash on your system, please install the
+corresponding debug-symbol package (nexuiz-dbg and/or nexuiz-server-dbg) and
 try to generate a backtrace of the crash.
-To generate a backtrace, run "gdb /usr/lib/games/nexuiz/nexuiz.bin" from a 
-terminal and type "run -basedir /usr/share/games/nexuiz" in the gbd interface. 
+To generate a backtrace, run "gdb nexuiz" from a terminal and type "run" in the
+gbd interface.
 Once Nexuiz has crashed, type "bt" to obtain the backtrace. Please attach the 
-output when you are reporting a bug about nexuiz crashes.
-
-
- -- Bruno "Fuddl" Kleinert <fuddl at tauware.de>  Mon,  8 Oct 2007 17:12:25 +0200
+output when you are reporting a bug if nexuiz crashes with a Segmentation fault
+on your system!

Modified: packages/trunk/nexuiz/debian/changelog
===================================================================
--- packages/trunk/nexuiz/debian/changelog	2008-05-22 21:38:07 UTC (rev 7164)
+++ packages/trunk/nexuiz/debian/changelog	2008-05-23 12:08:16 UTC (rev 7165)
@@ -7,20 +7,22 @@
     source .aft files
   * Install nexuiz-server-console to IRC gateway examples
   * Support "pro" extension
-    * Support "pro" extenstion in wrapper scripts. Both know -p|--pro, now
     * Add desktop shortcuts (.menu and .desktop) to start Nexuiz with the "pro"
       extension enabled (Install additional nexuiz_pro.desktop)
-    * Update manpages for -p|--pro parameter
     * Update NEWS.Debian for "pro" mode
-  * Hopefully improved wrapper scripts for parameter handling
   * Add 10_ambiguous_keyboard_bindings.dpatch patch to remove optional
     confusing/ambiguous key description, how to toggle the in-game console,
     from the FAQ (See #477397)
   * Switch meta-package build dependency libsdl-dev to real package
     libsdl1.2-dev
   * Make gcc build our binaries with -O2 optimization
+  * Get rid of wrapper scripts (/usr/games/{nexuiz,nexuiz-server}
+    * Install binaries to /usr/games instead of /usr/lib/games/nexuiz
+    * Update manpages for missing parameters
+    * Update README.Debian, how to obtain a backtrace
+    * Configure game data location at build time in debian/rules
 
- -- Bruno "Fuddl" Kleinert <fuddl at tauware.de>  Thu, 22 May 2008 15:48:26 +0200
+ -- Bruno "Fuddl" Kleinert <fuddl at tauware.de>  Fri, 23 May 2008 13:55:23 +0200
 
 nexuiz (2.4-1) unstable; urgency=low
 

Modified: packages/trunk/nexuiz/debian/nexuiz-server.6
===================================================================
--- packages/trunk/nexuiz/debian/nexuiz-server.6	2008-05-22 21:38:07 UTC (rev 7164)
+++ packages/trunk/nexuiz/debian/nexuiz-server.6	2008-05-23 12:08:16 UTC (rev 7165)
@@ -3,20 +3,12 @@
 nexuiz-server \- Nexuiz dedicated server
 .SH SYNOPSIS
 .B nexuiz-server
-[\-h|\-\-help] [+set \fIoption\fP \fIvalue\fP] [+exec \fIconfig\fP] ...
+[+set \fIoption\fP \fIvalue\fP] [+exec \fIconfig\fP] ...
 .SH DESCRIPTION
 .PP
 \fBnexuiz-server\fP is the Nexuiz dedicated server for the Nexuiz game.
 .SH OPTIONS
-Options processed by the wrapper script:
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Display a short help summary
-.TP
-\fB\-p\fR, \fB\-\-pro\fR
-Start the Nexuiz server with the "pro" extension (Also called "mod") enabled which will change physics, weapon fire rates and damage. (This makes the wrapper script pass the parameter "-game pro" to the Nexuiz server.)
-.PP
-Options passed to the Nexuiz dedicated server binary by the \fB+set\fR parameter:
+Options passed to the Nexuiz dedicated server after a \fB+set\fR parameter
 .br
 (Note that this is not a full list!)
 .TP
@@ -40,7 +32,7 @@
 .SH SEE ALSO
 .BR nexuiz (6)
 .br
-/usr/share/doc/nexuiz-server/examples
+/usr/share/doc/nexuiz-server
 .br
 .SH AUTHOR
 The Nexuiz dedicated server was written by Alientrap.

Added: packages/trunk/nexuiz/debian/nexuiz-server.install
===================================================================
--- packages/trunk/nexuiz/debian/nexuiz-server.install	                        (rev 0)
+++ packages/trunk/nexuiz/debian/nexuiz-server.install	2008-05-23 12:08:16 UTC (rev 7165)
@@ -0,0 +1 @@
+debian/tmp/nexuiz-server usr/games

Modified: packages/trunk/nexuiz/debian/nexuiz.6
===================================================================
--- packages/trunk/nexuiz/debian/nexuiz.6	2008-05-22 21:38:07 UTC (rev 7164)
+++ packages/trunk/nexuiz/debian/nexuiz.6	2008-05-23 12:08:16 UTC (rev 7165)
@@ -3,7 +3,7 @@
 nexuiz \- a 3d deathmatch game
 .SH SYNOPSIS
 .B nexuiz
-[\-h|\-\-help] [\-q|\-\-quiet] [+set \fIoption\fP \fIvalue\fP] [+exec \fIconfig\fP] ...
+[+set \fIoption\fP \fIvalue\fP] [+exec \fIconfig\fP] ...
 .SH DESCRIPTION
 .PP
 This manual page documents briefly the
@@ -12,18 +12,7 @@
 .PP
 \fBnexuiz\fP is the client of the Nexuiz game. Nexuiz is a fast 3d first person shooter. Though it is a multiplayer network game, it is also possible to play in single player mode against enemies controlled by the computer.
 .SH OPTIONS
-Options processed by the wrapper script:
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Display a short help summary
-.TP
-\fB\-p\fR, \fB\-\-pro\fR
-Start Nexuiz with the "pro" extension (Also called "mod") enabled which will change physics, weapon fire rates and damage. (This makes the wrapper script pass the parameter "-game pro" to the Nexuiz engine.)
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-Disable all console output
-.PP
-Options passed to the Nexuiz binary by the \fB+set\fR parameter:
+Options for use after a \fB+set\fR parameter
 .br
 (Note that this is not a full list!)
 .TP
@@ -39,11 +28,13 @@
 \fBvid_width\fR <value>
 Display width in pixels
 .PP
-For further available options passed to the Nexuiz binary by the +set or +exec parameter visit http://www.alientrap.org/nexuiz/.
+For further available options passed to the Nexuiz binary by the +set or +exec parameter see the files installed in /usr/share/doc/nexuiz.
 .BR
 .SH SEE ALSO
 .BR nexuiz-server (6)
 .br
+/usr/share/doc/nexuiz
+.br
 .SH AUTHOR
 Nexuiz was written by Alientrap.
 .PP

Modified: packages/trunk/nexuiz/debian/nexuiz.desktop
===================================================================
--- packages/trunk/nexuiz/debian/nexuiz.desktop	2008-05-22 21:38:07 UTC (rev 7164)
+++ packages/trunk/nexuiz/debian/nexuiz.desktop	2008-05-23 12:08:16 UTC (rev 7165)
@@ -5,7 +5,7 @@
 Comment[fr_FR]=Un Ego-Shooter en 3D pouvant être joué en réseau
 Comment[pl_PL]=Gra sieciowa 3D, strzelanka, w pierwszej osobie z efektami graficznymi wysokiej jakosci
 Comment[ro_RO]=Un joc 3D cu împuşcături, perspectivă personală şi efecte grafice de înaltă calitate
-Exec=/usr/games/nexuiz --quiet
+Exec=/usr/games/nexuiz
 Icon=nexuiz48x48
 Terminal=false
 Type=Application

Added: packages/trunk/nexuiz/debian/nexuiz.install
===================================================================
--- packages/trunk/nexuiz/debian/nexuiz.install	                        (rev 0)
+++ packages/trunk/nexuiz/debian/nexuiz.install	2008-05-23 12:08:16 UTC (rev 7165)
@@ -0,0 +1,5 @@
+debian/tmp/nexuiz48x48.png usr/share/icons/hicolor/48x48/apps
+debian/tmp/nexuiz.xpm usr/share/pixmaps
+debian/nexuiz.desktop usr/share/applications
+debian/nexuiz_pro.desktop usr/share/applications
+debian/tmp/nexuiz usr/games

Modified: packages/trunk/nexuiz/debian/nexuiz.menu
===================================================================
--- packages/trunk/nexuiz/debian/nexuiz.menu	2008-05-22 21:38:07 UTC (rev 7164)
+++ packages/trunk/nexuiz/debian/nexuiz.menu	2008-05-23 12:08:16 UTC (rev 7165)
@@ -3,11 +3,11 @@
 	icon="/usr/share/pixmaps/nexuiz.xpm" \
 	title="Nexuiz" \
 	longtitle="A networked 3D first person shooter game with high-quality graphic effects" \
-	command="/usr/games/nexuiz --quiet"
+	command="/usr/games/nexuiz"
 
 ?package(nexuiz):needs="X11" \
 	section="Games/Action" \
 	icon="/usr/share/pixmaps/nexuiz.xpm" \
 	title="Nexuiz (pro mode)" \
 	longtitle="A networked 3D first person shooter game with high-quality graphic effects" \
-	command="/usr/games/nexuiz --pro --quiet"
+	command="/usr/games/nexuiz -game pro"

Modified: packages/trunk/nexuiz/debian/nexuiz_pro.desktop
===================================================================
--- packages/trunk/nexuiz/debian/nexuiz_pro.desktop	2008-05-22 21:38:07 UTC (rev 7164)
+++ packages/trunk/nexuiz/debian/nexuiz_pro.desktop	2008-05-23 12:08:16 UTC (rev 7165)
@@ -5,7 +5,7 @@
 Comment[fr_FR]=Un Ego-Shooter en 3D pouvant être joué en réseau
 Comment[pl_PL]=Gra sieciowa 3D, strzelanka, w pierwszej osobie z efektami graficznymi wysokiej jakosci
 Comment[ro_RO]=Un joc 3D cu împuşcături, perspectivă personală şi efecte grafice de înaltă calitate
-Exec=/usr/games/nexuiz --pro --quiet
+Exec=/usr/games/nexuiz -game pro
 Icon=nexuiz48x48
 Terminal=false
 Type=Application

Modified: packages/trunk/nexuiz/debian/rules
===================================================================
--- packages/trunk/nexuiz/debian/rules	2008-05-22 21:38:07 UTC (rev 7164)
+++ packages/trunk/nexuiz/debian/rules	2008-05-23 12:08:16 UTC (rev 7165)
@@ -6,7 +6,10 @@
 build: build-stamp
 build-stamp: patch
 	dh_testdir
-	$(MAKE) -C darkplaces CFLAGS_DEBUG="$(CFLAGS)" sdl-debug sv-debug
+	$(MAKE) -C darkplaces \
+			CFLAGS_DEBUG="$(CFLAGS)" \
+			DP_FS_BASEDIR=/usr/share/games/nexuiz \
+			sdl-debug sv-debug
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -24,19 +27,11 @@
 	dh_clean -k 
 	dh_installdirs
 	mkdir -p debian/tmp
-	cp darkplaces/darkplaces-sdl debian/tmp/nexuiz.bin
-	cp darkplaces/darkplaces-dedicated debian/tmp/nexuiz-server.bin
+	cp darkplaces/darkplaces-sdl debian/tmp/nexuiz
+	cp darkplaces/darkplaces-dedicated debian/tmp/nexuiz-server
 	convert darkplaces/nexuiz.xpm debian/tmp/nexuiz48x48.png
 	convert -scale 32x32 darkplaces/nexuiz.xpm debian/tmp/nexuiz.xpm
-	dh_install -pnexuiz debian/scripts/nexuiz usr/games
-	dh_install -pnexuiz debian/tmp/nexuiz48x48.png usr/share/icons/hicolor/48x48/apps
-	dh_install -pnexuiz debian/tmp/nexuiz.xpm usr/share/pixmaps
-	dh_install -pnexuiz debian/nexuiz.desktop usr/share/applications # waiting for dh_desktop to do that job
-	dh_install -pnexuiz debian/nexuiz_pro.desktop usr/share/applications # waiting for dh_desktop to do that job
-	dh_install -pnexuiz debian/scripts/nexuiz usr/games
-	dh_install -pnexuiz debian/tmp/nexuiz.bin usr/lib/games/nexuiz
-	dh_install -pnexuiz-server debian/scripts/nexuiz-server usr/games
-	dh_install -pnexuiz-server debian/tmp/nexuiz-server.bin usr/lib/games/nexuiz
+	dh_install
 	
 binary-indep: build install
 binary-arch: build install
@@ -47,6 +42,7 @@
 	dh_installexamples
 	dh_installmenu
 	dh_desktop -pnexuiz debian/nexuiz.desktop
+	dh_desktop -pnexuiz debian/nexuiz_pro.desktop
 	dh_icons -pnexuiz
 	dh_installman -pnexuiz debian/nexuiz.6
 	dh_installman -pnexuiz-server debian/nexuiz-server.6




More information about the Pkg-games-commits mailing list