r428 - in packages/cube/cube/trunk/debian: . patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-04-04 20:38:35 +0000 (Tue, 04 Apr 2006)
New Revision: 428

Added:
   packages/cube/cube/trunk/debian/patches/02_data_in_usr_share
Modified:
   packages/cube/cube/trunk/debian/control
   packages/cube/cube/trunk/debian/patches/00list
   packages/cube/cube/trunk/debian/rules
Log:
typo
dep on libsdl-image1.2-dev
patch 02_data_in_usr_share to change default data location


Modified: packages/cube/cube/trunk/debian/control
===================================================================
--- packages/cube/cube/trunk/debian/control	2006-04-04 20:16:28 UTC (rev 427)
+++ packages/cube/cube/trunk/debian/control	2006-04-04 20:38:35 UTC (rev 428)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Alioth Games Devel Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 5.0.0), dpatch
+Build-Depends: debhelper (>= 5.0.0), libsdl-image1.2-dev, dpatch
 Standards-Version: 3.6.2
 
 

Modified: packages/cube/cube/trunk/debian/patches/00list
===================================================================
--- packages/cube/cube/trunk/debian/patches/00list	2006-04-04 20:16:28 UTC (rev 427)
+++ packages/cube/cube/trunk/debian/patches/00list	2006-04-04 20:38:35 UTC (rev 428)
@@ -1 +1,2 @@
 01_permissive_gcc.patch
+02_data_in_usr_share

Added: packages/cube/cube/trunk/debian/patches/02_data_in_usr_share
===================================================================
--- packages/cube/cube/trunk/debian/patches/02_data_in_usr_share	2006-04-04 20:16:28 UTC (rev 427)
+++ packages/cube/cube/trunk/debian/patches/02_data_in_usr_share	2006-04-04 20:38:35 UTC (rev 428)
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Gonéri Le Bouder <goneri at rulezlan.org>
+## DP: change default data location 
+
+
+ at DPATCH@
+
+diff -ru cube-2005.08.29.orig/src/main.cpp cube-2005.08.29/src/main.cpp
+--- cube-2005.08.29.orig/src/main.cpp	2005-08-29 01:38:52.000000000 +0200
++++ cube-2005.08.29/src/main.cpp	2006-04-04 22:35:37.000000000 +0200
+@@ -148,15 +148,15 @@
+ 
+     log("basetex");
+     int xs, ys;
+-    if(!installtex(2,  path(newstring("data/newchars.png")), xs, ys) ||
+-       !installtex(3,  path(newstring("data/martin/base.png")), xs, ys) ||
+-       !installtex(6,  path(newstring("data/martin/ball1.png")), xs, ys) ||
+-       !installtex(7,  path(newstring("data/martin/smoke.png")), xs, ys) ||
+-       !installtex(8,  path(newstring("data/martin/ball2.png")), xs, ys) ||
+-       !installtex(9,  path(newstring("data/martin/ball3.png")), xs, ys) ||
+-       !installtex(4,  path(newstring("data/explosion.jpg")), xs, ys) ||
+-       !installtex(5,  path(newstring("data/items.png")), xs, ys) ||
+-       !installtex(1,  path(newstring("data/crosshair.png")), xs, ys)) fatal("could not find core textures (hint: run cube from the parent of the bin directory)");
++    if(!installtex(2,  path(newstring("/usr/share/cube/data/newchars.png")), xs, ys) ||
++       !installtex(3,  path(newstring("/usr/share/cube/data/martin/base.png")), xs, ys) ||
++       !installtex(6,  path(newstring("/usr/share/cube/data/martin/ball1.png")), xs, ys) ||
++       !installtex(7,  path(newstring("/usr/share/cube/data/martin/smoke.png")), xs, ys) ||
++       !installtex(8,  path(newstring("/usr/share/cube/data/martin/ball2.png")), xs, ys) ||
++       !installtex(9,  path(newstring("/usr/share/cube/data/martin/ball3.png")), xs, ys) ||
++       !installtex(4,  path(newstring("/usr/share/cube/data/explosion.jpg")), xs, ys) ||
++       !installtex(5,  path(newstring("/usr/share/cube/data/items.png")), xs, ys) ||
++       !installtex(1,  path(newstring("/usr/share/cube/data/crosshair.png")), xs, ys)) fatal("could not find core textures (hint: run cube from the parent of the bin directory)");
+ 
+     log("sound");
+     initsound();
+@@ -164,12 +164,12 @@
+     log("cfg");
+     newmenu("frags\tpj\tping\tteam\tname");
+     newmenu("ping\tplr\tserver");
+-    exec("data/keymap.cfg");
+-    exec("data/menus.cfg");
+-    exec("data/prefabs.cfg");
+-    exec("data/sounds.cfg");
++    exec("/usr/share/cube/data/keymap.cfg");
++    exec("/usr/share/cube/data/menus.cfg");
++    exec("/usr/share/cube/data/prefabs.cfg");
++    exec("/usr/share/cube/data/sounds.cfg");
+     exec("servers.cfg");
+-    if(!execfile("config.cfg")) execfile("data/defaults.cfg");
++    if(!execfile("config.cfg")) execfile("/usr/share/cube/data/defaults.cfg");
+     exec("autoexec.cfg");
+ 
+     log("localconnect");


Property changes on: packages/cube/cube/trunk/debian/patches/02_data_in_usr_share
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/cube/cube/trunk/debian/rules
===================================================================
--- packages/cube/cube/trunk/debian/rules	2006-04-04 20:16:28 UTC (rev 427)
+++ packages/cube/cube/trunk/debian/rules	2006-04-04 20:38:35 UTC (rev 428)
@@ -71,7 +71,7 @@
 	dh_install -pcube-client src/cube_client usr/games/cube_client
 	mv debian/cube-client/usr/games/cube_client \
         	debian/cube-client/usr/games/cube-client
-        dh_install -pcube-client debian/cube-client.desktop usr/share/applications
+	dh_install -pcube-client debian/cube-client.desktop usr/share/applications
 
 #	server
 	dh_install -pcube-server src/cube_server usr/games/cube_server