r452 - packages/cube/cube/trunk/debian/patches

[Gonéri Le Bouder]

On Monday 10 April 2006 02:25, Eddy Petrişor wrote:
> On 4/10/06, Gonéri Le Bouder <goneri-guest at costa.debian.org> wrote:
> >    packages/cube/cube/trunk/debian/patches/02_data_in_usr_share
> > Log:
> > --    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")),
>
> [snip]
>
> > --    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");
>
> [snip]
>
> > ++  char prefixe = "/usr/share/cube/";
>
> I am not sure that this is the best way to fix this. AFAIK, the debs
> should be relocatable, both the source and the data files.
>
> Other oppinions?
The second solution, is to create a warpper script like with 
cube-client-nonfree
http://svn.debian.org/wsvn/pkg-games/packages/cube/cube-data/trunk/debian/cube-client-nonfree.sh?op=file&rev=0&sc=0

In fact i prefere this solution. More easy :).

I've a patch to do to warn the use that is it can connect to a public server, 
maybe he could try with the nonfree client to avoid problem with upstream 
author.

Cheers,

	Gonéri