Author: miriam
Date: 2008-06-17 11:48:12 +0000 (Tue, 17 Jun 2008)
New Revision: 7419
Removed:
packages/trunk/pixbros/debian/patches/0.6.1_to_0.6.2.patch
packages/trunk/pixbros/debian/patches/fix_i18m.patch
Modified:
packages/trunk/pixbros/debian/changelog
packages/trunk/pixbros/debian/patches/browser.patch
packages/trunk/pixbros/debian/patches/build.patch
packages/trunk/pixbros/debian/patches/directories.patch
packages/trunk/pixbros/debian/patches/series
packages/trunk/pixbros/debian/rules
Log:
New Upstream Release
Modified: packages/trunk/pixbros/debian/changelog
===================================================================
--- packages/trunk/pixbros/debian/changelog 2008-06-17 10:26:33 UTC (rev
7418)
+++ packages/trunk/pixbros/debian/changelog 2008-06-17 11:48:12 UTC (rev
7419)
@@ -1,8 +1,9 @@
-pixbros (0.6.1-3) UNRELEASED; urgency=low
+pixbros (0.6.3-1) UNRELEASED; urgency=low
- *
+ * New Upstream Release.
+ * Includes source for the resources (Closes: #486567)
- -- Miriam Ruiz <[EMAIL PROTECTED]> Thu, 12 Jun 2008 14:29:08 +0000
+ -- Miriam Ruiz <[EMAIL PROTECTED]> Tue, 17 Jun 2008 11:46:12 +0000
pixbros (0.6.1-2) unstable; urgency=low
Deleted: packages/trunk/pixbros/debian/patches/0.6.1_to_0.6.2.patch
===================================================================
--- packages/trunk/pixbros/debian/patches/0.6.1_to_0.6.2.patch 2008-06-17
10:26:33 UTC (rev 7418)
+++ packages/trunk/pixbros/debian/patches/0.6.1_to_0.6.2.patch 2008-06-17
11:48:12 UTC (rev 7419)
@@ -1,575 +0,0 @@
-diff -ruN pixbros-0.6.1/src/jefes.pr- pixbros-0.6.2/src/jefes.pr-
---- pixbros-0.6.1/src/jefes.pr- 2008-06-03 13:29:58.000000000 +0000
-+++ pixbros-0.6.2/src/jefes.pr- 2008-06-08 13:09:12.000000000 +0000
-@@ -4,13 +4,11 @@
- varsjefe[10];
- vidajefe;
- id_col;
-- ox;
-- oy;
- Begin
- file=fpg_jefes;
- hayjefe=1;
- Switch(tipo)
-- case 3:
-+ case 1:
- graph=4;
- x=527;
- y=-300;
-@@ -29,20 +27,10 @@
- vidajefe=5*(ops.dificultad+1);
- pon_graph(fpg_jefes,11,320,280,5);
- end
-- case 1:
-- graph=12;
-- x=320;
-- y=0;
-- z=-10;
-- varsjefe[0]=300;
-- varsjefe[1]=450;
-- vidajefe=5*(ops.dificultad+1);
-- pon_graph(fpg_jefes,11,320,280,5);
-- end
- End
- Loop
- Switch(tipo)
-- case 3: /*patr�n:
-+ case 1: /*patr�n:
- 0 aterriza
- 2 dispara
- 3 4 5 6 7 8 (salta, quieto)X3
-@@ -121,7 +109,7 @@
- case 3,5,7:
- graph=3;
- if(y>varsjefe[0]-40)
-- y-=5;
-+ y-=10;
- else
- y=varsjefe[0]-40;
- patron++;
-@@ -130,8 +118,7 @@
- case 4,6,8:
- graph=2;
- if(y<varsjefe[0])
-- y+=5;
--
-+ y+=10;
- else
- y=varsjefe[0];
- patron++;
-@@ -200,14 +187,10 @@
- */
- if(id_col=collision(type boladenieve))
- if(id_col.accion!=atrapado)
-- //delete_text(0);
-- //write(0,0,0,0,id_col.x);
-- if(id_col.x>290 and id_col.x<350)
- id_col.accion=muere;
- vidajefe--;
- sonido(9);
- end
-- end
- end
- if(id_col=collision(type burbujarayo))
- id_col.accion=muere;
-@@ -228,7 +211,6 @@
- if(y<800)
- grav++;
- y+=grav*20;
-- size-=5;
- else
- hayjefe=0;
- break;
-@@ -240,7 +222,7 @@
- y-=grav*2;
- frame;
- else
-- grav=-20;
-+ grav=0;
- y=varsjefe[1];
- patron=2;
- end
-@@ -287,111 +269,6 @@
- end
- end
- end //case
-- case 1: /*patr�n:
-- 0 aparece
-- 2 dispara
-- 3 tranquilo
-- 4 mueve
-- //5 dispara
-- //6 tranquilo
-- //7 mueve
-- GOTO 2
--
-- varsjefe[0]=posicion y arriba
-- varsjefe[1]=posicion y abajo
-- */
-- if(id_col=collision(type boladenieve))
-- if(id_col.accion!=atrapado)
--
--
-- id_col.accion=muere;
-- vidajefe--;
-- sonido(9);
--
-- end
-- end
-- if(id_col=collision(type burbujarayo))
-- id_col.accion=muere;
-- vidajefe--;
-- sonido(9);
-- end
-- if(id_col=collision(type boladeenemigos))
-- id_col.accion=muere;
-- vidajefe--;
-- sonido(9);
-- end
--
-- if(vidajefe==0) patron=-1; end
-- switch(patron)
-- case -1:
-- accion=muere;
-- sonido(14);
-- if(y<800)
-- grav++;
-- y+=grav*20;
-- size-=5;
-- else
-- hayjefe=0;
-- break;
-- end
-- end
-- case 0:
-- if(y<100)
-- y++;
-- else
-- patron=2;
-- end
-- end
-- case 2:
-- sonido(4);
-- switch(ops.dificultad)
-- case 0:
-- enemigo_jefe(2);
-- end
-- case 1:
-- enemigo_jefe(2);
-- enemigo_jefe(3);
-- end
-- case 2:
-- enemigo_jefe(2);
-- enemigo_jefe(3);
-- enemigo_jefe(2);
-- enemigo_jefe(3);
-- end
-- end
-- patron++;
-- end
-- case 3:
-- if(anim<100) anim++; else
anim=0; patron=4; ox=rand(25,615); oy=rand(25,465); end
-- end
-- case 4:
-- patron=0;
-- if(y<oy)
-- y+=rand(1,3);
-- end
-- if(y>oy)
-- y-=rand(1,3);
-- end
-- if(x>ox)
-- x-=rand(1,3);
-- patron=4;
-- end
-- if(x<ox)
-- x+=rand(1,3);
-- patron=4;
-- end
--
--
--
--
--
--
--
-- end
--
--
-- end
-- end //case
- End
- frame;
- End
-diff -ruN pixbros-0.6.1/src/net.pr- pixbros-0.6.2/src/net.pr-
---- pixbros-0.6.1/src/net.pr- 2008-06-03 13:29:58.000000000 +0000
-+++ pixbros-0.6.2/src/net.pr- 1970-01-01 00:00:00.000000000 +0000
-@@ -1,356 +0,0 @@
--Global
-- velocidadnet=200;
--End
--
--// Esta funcion mata todos los procesos menos al que la llama y a los
procesos del servidor
--function let_me_alone()
--private idp, matalo;
--begin
-- while( (idp = get_id(0) ) != 0)
-- matalo = 1;
-- if( (idp == id_servidor) || (idp == father) )
-- matalo = 0;
-- end;
-- from i = 0 to MAX_JUGADORES-1
-- if(idp == clientes[i].id)
-- matalo = 0;
-- end;
-- end;
--
-- if(matalo != 0)
-- signal(idp, S_KILL);
-- end
-- end
--end
--
--process controlador_net( int index, ClientData_t pointer data)
--begin
-- loop
-- frame(velocidadnet);
--
-- from i = 0 to NUM_CONTROLES-1
-- if(servidor_dedicado==1)
-- botones.p[index+1][i] = data.c.controles[i];
-- else
-- botones.p[index+2][i] = data.c.controles[i];
-- end
-- end;
-- end;
--end;
--
--Process net_servidor()
--begin
-- if(servidor_iniciado == 0)
-- servidor_iniciado = 1;
-- id_servidor = id;
-- pScreen.mundo = 0;
-- pSounds.nSonidos = 0;
--
-- // Preparamos el socket 0 para recibir por puerto servidor
-- if(net_udp_open(0, PUERTO_SERVIDOR) == 0)
--
-- // El mensaje m�s grande que vamos a recibir es ControlsMessage_t
-- net_udp_allocpacket(0, sizeof(ControlsMessage_t) );
-- pReceivePacket = net_udp_getpacket(0);
--
-- // El mensaje m�s grande que vamos a enviar es ScreenMessage_t
-- net_udp_allocpacket(1, sizeof(ScreenMessage_t) );
-- pSendPacket = net_udp_getpacket(1);
--
-- nConectados = 0;
--
-- while(nConectados != -1)
-- // PASO 1. Dejar que los procesos se muevan
-- frame(velocidadnet);
--
-- // PASO 2. Enviar datos de pantalla
--
-- // n es el contador de proceso dentro del mensaje
-- n = 0;
--
-- // Copiar los datos de todos los procesos en pantalla
-- while( (n <= MAX_PROCESOS) && ( (procc = get_id(0) ) != 0) )
-- if(procc.graph!=0)
-- pScreen.processInfo[n].x = procc.x;
-- pScreen.processInfo[n].y = procc.y;
-- pScreen.processInfo[n].z = procc.z;
-- pScreen.processInfo[n].angle = procc.angle;
-- pScreen.processInfo[n].flags = procc.flags;
-- pScreen.processInfo[n].alpha = procc.alpha;
-- pScreen.processInfo[n].size_x = procc.size_x;
-- pScreen.processInfo[n].size_y = procc.size_y;
-- pScreen.processInfo[n].file = procc.file;
-- pScreen.processInfo[n].graph = procc.graph;
--
-- n++;
-- end
-- end;
--
-- // Finalmente rellenamos con graph=0
-- while(n <= MAX_PROCESOS)
-- pScreen.processInfo[n].graph = 0;
-- n++;
-- end;
--
-- // Y enviamos
-- memcopy(pSendPacket.data, pScreen, sizeof(ScreenMessage_t) );
-- pSendPacket.len = sizeof(ScreenMessage_t);
-- from n = 0 to MAX_JUGADORES - 1
-- if(clientes[n].id != 0)
-- pSendPacket.address.host = clientes[n].address.host;
-- pSendPacket.address.port = clientes[n].address.port;
-- net_udp_send(0, -1, 1);
-- end;
-- end;
--
-- // Enviamos el mensaje con los sonidos
-- memcopy(pSendPacket.data, pSounds, sizeof(SoundMessage_t) );
-- pSendPacket.len = sizeof(SoundMessage_t);
-- from n = 0 to MAX_JUGADORES - 1
-- if(clientes[n].id != 0)
-- pSendPacket.address.host = clientes[n].address.host;
-- pSendPacket.address.port = clientes[n].address.port;
-- net_udp_send(0, -1, 1);
-- end;
-- end;
-- pSounds.nSonidos = 0;
--
-- // PASO 3. Recibir mensajes de clientes
-- while(net_udp_recv(0, 0) > 0)
-- if(pReceivePacket.len == sizeof(ConnectMessage_t) )
-- // Es un mensaje de conexi�n/desconexi�n, lo copiamos a
pConnect
-- memcopy(pConnect, pReceivePacket.data,
sizeof(ConnectMessage_t) );
-- n = pConnect.index;
--
-- if( (n >= 0) && (n < MAX_JUGADORES) )
-- // Nos mandan mensaje de desconexi�n. Verificar direcci�n
-- if( (clientes[n].id != 0) &&
-- (clientes[n].address.host ==
pReceivePacket.address.host) &&
-- (clientes[n].address.port ==
pReceivePacket.address.port) )
-- // Verificaci�n ok. Matar el proceso correspondiente
-- p[n+2].juega=0;
-- p[n+2].muneco=0;
-- if(exists(p[n+2].identificador))
p[n+2].identificador.accion=muere; end
-- signal(clientes[n].id, S_KILL);
-- clientes[n].id = 0;
-- nConectados--;
-- end;
-- else
-- // Mensaje de conexi�n, buscar hueco libre
-- pConnect.index = -1;
-- from i = 0 to MAX_JUGADORES-1
-- if(clientes[i].id == 0)
-- pConnect.index = i;
-- clientes[i].address = pReceivePacket.address;
-- clientes[i].id = controlador_net(i, &clientes[i]);
-- nConectados++;
-- break;
-- end;
-- end;
--
-- // Preparamos buffer de env�o con el �ndice del nuevo
cliente
-- memcopy(pSendPacket.data, pConnect,
sizeof(ConnectMessage_t) );
-- pSendPacket.len = sizeof(ConnectMessage_t);
-- pSendPacket.address.host = pReceivePacket.address.host;
-- pSendPacket.address.port = pReceivePacket.address.port;
--
-- // Le decimos al cliente cual es su index por un canal
temporal
-- net_udp_send(0, -1, 1);
-- end;
-- else
-- // Es un mensaje de control, lo copiamos en pControl
-- memcopy(pControl, pReceivePacket.data,
sizeof(ControlsMessage_t) );
-- n = pControl.index;
--
-- // Verificamos direcci�n
-- if( (clientes[n].id != 0) &&
-- (clientes[n].address.host ==
pReceivePacket.address.host) &&
-- (clientes[n].address.port ==
pReceivePacket.address.port) )
-- // copiamos los controles
-- memcopy(clientes[n].c, pControl,
sizeof(ControlsMessage_t) );
-- end;
-- end;
-- end;
-- end; // fin del bucle del servidor
--
-- // Le decimos a todos los clientes que se acab�
-- pConnect.index = -1;
-- memcopy(pSendPacket.data, pConnect, sizeof(ConnectMessage_t) );
-- pSendPacket.len = sizeof(ConnectMessage_t);
-- from n = 0 to MAX_JUGADORES - 1
-- if(clientes[n].id != 0)
-- pSendPacket.address.host = clientes[n].address.host;
-- pSendPacket.address.port = clientes[n].address.port;
-- net_udp_send(0, -1, 1);
-- end;
-- end;
--
-- net_udp_close(0);
-- net_udp_freepacket(0);
-- net_udp_freepacket(1);
-- end
--
-- id_servidor = 0;
-- end
--end
--
--// -------------------------------- [CLIENTE]
-------------------------------------
--
--process procesillo_cliente(i);
--begin
-- loop
-- x=pScreen.processInfo[i].x;
-- y=pScreen.processInfo[i].y;
-- z=pScreen.processInfo[i].z;
-- angle=pScreen.processInfo[i].angle;
-- flags=pScreen.processInfo[i].flags;
-- alpha=pScreen.processInfo[i].alpha;
-- size_x=pScreen.processInfo[i].size_x;
-- size_y=pScreen.processInfo[i].size_y;
-- file=pScreen.processInfo[i].file;
-- graph=pScreen.processInfo[i].graph;
-- frame(velocidadnet);
-- end;
--end
--
--process net_cliente( string host)
--private
-- last_mundo = 0;
-- canal_aspiradora = -1;
-- num;
--
--begin
-- let_me_alone();
--
-- // El mensaje m�s grande que vamos a recibir es ScreenMessage_t
-- net_udp_allocpacket(2, sizeof(ScreenMessage_t) );
-- pReceivePacket = net_udp_getpacket(2);
--
-- // El mensaje m�s grande que vamos a enviar es ControlsMessage_t
-- net_udp_allocpacket(3, sizeof(ControlsMessage_t) );
-- pSendPacket = net_udp_getpacket(3);
--
-- // Abrimos el socket y lo preparamos para enviar datos al servidor
-- net_udp_open(1, 0);
-- net_udp_bind(1, 1, host, PUERTO_SERVIDOR);
--
-- // Le mandamos al servidor el mensaje de conexion
-- pConnect.index = -1;
-- memcopy(pSendPacket.data, pConnect, sizeof(ConnectMessage_t) );
-- pSendPacket.len = sizeof(ConnectMessage_t);
-- net_udp_send(1, 1, 3);
--
-- // Esperamos respuesta del servidor
-- n = -1;
-- timer[1] = 0;
-- while( (n == -1) && (timer[1] < TIEMPO_ESPERA) )
-- frame(velocidadnet);
--
-- if(net_udp_recv(1, 2) > 0)
-- // Recibido mensaje
-- if(pReceivePacket.len == sizeof(ConnectMessage_t) )
-- // Es de conexion, lo copiamos a pConnect
-- memcopy(pConnect, pReceivePacket.data, sizeof(ConnectMessage_t) );
-- n = pConnect.index;
-- if(n == -1)
-- // No nos dejan entrar, finalizar espera
-- break;
-- end;
-- end;
-- end;
-- end;
--
-- if(n != -1)
-- // Nos dejaron entrar, crear procesos del servidor
-- controlador(1);
--
-- from i = 0 to MAX_PROCESOS
-- procesillo_cliente(i);
-- end;
--
-- // Preparar mensaje de control con el �ndice devuelto por el servidor
-- pControl.index = n;
--
-- // Condicion de finalizaci�n
-- while(!key(_esc) )
-- // PASO 1. Mostrar pantalla actual
-- frame(velocidadnet);
--
-- // PASO 2. Mandar controles al servidor
-- from i = 0 to NUM_CONTROLES-1
-- pControl.controles[i] = botones.p[1][i];
-- end;
-- memcopy(pSendPacket.data, pControl, sizeof(ControlsMessage_t) );
-- pSendPacket.len = sizeof(ControlsMessage_t);
-- net_udp_send(1, 1, 3);
--
-- // PASO 3. Procesar mensajes del servidor
-- while(net_udp_recv(1, 2) > 0)
-- if(pReceivePacket.len == sizeof(ScreenMessage_t) )
-- // Mensaje de pantalla, actualizar procesos
-- memcopy(pScreen, pReceivePacket.data, sizeof(ScreenMessage_t)
);
-- if(pScreen.mundo != last_mundo)
-- last_mundo = pScreen.mundo;
-- if(last_mundo == 0)
-- clear_screen();
-- else
-- unload_map(0,grafnivel);
-- grafnivel = load_png("niveles/nivel" + last_mundo +
".png");
-- put_screen(0, grafNivel);
-- end;
-- end;
-- else
-- if(pReceivePacket.len == sizeof(SoundMessage_t) )
-- // Mensaje de sonidos
-- memcopy(pSounds, pReceivePacket.data,
sizeof(SoundMessage_t) );
-- if(cancionsonando != pSounds.musica)
-- cancionsonando = pSounds.musica;
-- num = cancionsonando;
-- if(num == 0)
-- if(is_playing_song()) stop_song(); end
-- else
-- if(num<100)
-- play_song(load_song("ogg/"+num+".ogg"),999);
-- else
-- play_song(load_song("ogg/"+num+".ogg"),1);
-- end
-- end;
-- end;
--
-- if(pSounds.aspiradora == 0)
-- if(canal_aspiradora != -1)
-- stop_wav(canal_aspiradora);
-- canal_aspiradora = -1;
-- end;
-- else
-- if(canal_aspiradora == -1)
-- canal_aspiradora = play_wav(wavs[8], 0);
-- end
-- end;
--
-- if(pSounds.nSonidos > 0)
-- from i = 0 to pSounds.nSonidos - 1
-- play_wav(wavs[pSounds.sonidos[i]],0);
-- end;
-- end;
-- else
-- if(pReceivePacket.len == sizeof(ConnectMessage_t) )
-- // El servidor se ha cerrado
-- exit(0);
-- end;
-- end;
-- end;
-- end;
-- end;
--
-- // El cliente finaliza, enviar desconexi�n
-- memcopy(pSendPacket.data, pConnect, sizeof(ConnectMessage_t) );
-- pSendPacket.len = sizeof(ConnectMessage_t);
-- net_udp_send(1, 1, 3);
-- frame(velocidadnet);
-- end;
--
-- net_udp_close(1);
-- net_udp_freepacket(2);
-- net_udp_freepacket(3);
--end;
-diff -ruN pixbros-0.6.1/src/pixbros.prg pixbros-0.6.2/src/pixbros.prg
---- pixbros-0.6.1/src/pixbros.prg 2008-06-03 14:04:33.000000000 +0000
-+++ pixbros-0.6.2/src/pixbros.prg 2008-06-08 13:20:01.000000000 +0000
-@@ -14,7 +14,7 @@
- dispara=11;
- especial=12;
- muere=-1;
-- num_mundos=50;
-+ num_mundos=29;
- End
-
- Global
Modified: packages/trunk/pixbros/debian/patches/browser.patch
===================================================================
--- packages/trunk/pixbros/debian/patches/browser.patch 2008-06-17 10:26:33 UTC
(rev 7418)
+++ packages/trunk/pixbros/debian/patches/browser.patch 2008-06-17 11:48:12 UTC
(rev 7419)
@@ -1,10 +1,10 @@
# Copyright (C) 2008 Miriam Ruiz <[EMAIL PROTECTED]>
# Distributed under the same license as the game. See debian/copyright.
-Index: pixbros-0.6.1/src/menu.pr-
+Index: pixbros-0.6.3/src/menu.pr-
===================================================================
---- pixbros-0.6.1.orig/src/menu.pr- 2008-06-03 14:10:00.000000000 +0000
-+++ pixbros-0.6.1/src/menu.pr- 2008-06-06 07:50:40.000000000 +0000
+--- pixbros-0.6.3.orig/src/menu.pr- 2008-06-17 11:45:33.000000000 +0000
++++ pixbros-0.6.3/src/menu.pr- 2008-06-17 11:45:33.000000000 +0000
@@ -78,7 +78,7 @@
end
if(elecc==5)
Modified: packages/trunk/pixbros/debian/patches/build.patch
===================================================================
--- packages/trunk/pixbros/debian/patches/build.patch 2008-06-17 10:26:33 UTC
(rev 7418)
+++ packages/trunk/pixbros/debian/patches/build.patch 2008-06-17 11:48:12 UTC
(rev 7419)
@@ -1,10 +1,10 @@
# Copyright (C) 2008 Miriam Ruiz <[EMAIL PROTECTED]>
# Distributed under the same license as the game. See debian/copyright.
-Index: pixbros-0.6.1/compilartodo
+Index: pixbros-0.6.3/compilartodo
===================================================================
---- pixbros-0.6.1.orig/compilartodo 2008-06-03 14:15:14.000000000 +0000
-+++ pixbros-0.6.1/compilartodo 2008-06-06 07:47:05.000000000 +0000
+--- pixbros-0.6.3.orig/compilartodo 2008-06-17 11:45:30.000000000 +0000
++++ pixbros-0.6.3/compilartodo 2008-06-17 11:45:33.000000000 +0000
@@ -19,11 +19,7 @@
# FPGs creados
Modified: packages/trunk/pixbros/debian/patches/directories.patch
===================================================================
--- packages/trunk/pixbros/debian/patches/directories.patch 2008-06-17
10:26:33 UTC (rev 7418)
+++ packages/trunk/pixbros/debian/patches/directories.patch 2008-06-17
11:48:12 UTC (rev 7419)
@@ -1,11 +1,11 @@
# Copyright (C) 2008 Miriam Ruiz <[EMAIL PROTECTED]>
# Distributed under the same license as the game. See debian/copyright.
-Index: pixbros-0.6.1/src/pixbros.prg
+Index: pixbros-0.6.3/src/pixbros.prg
===================================================================
---- pixbros-0.6.1.orig/src/pixbros.prg 2008-06-06 08:15:14.000000000 +0000
-+++ pixbros-0.6.1/src/pixbros.prg 2008-06-06 08:20:25.000000000 +0000
-@@ -152,19 +152,19 @@
+--- pixbros-0.6.3.orig/src/pixbros.prg 2008-06-17 11:45:30.000000000 +0000
++++ pixbros-0.6.3/src/pixbros.prg 2008-06-17 11:45:33.000000000 +0000
+@@ -168,19 +168,19 @@
end
end
@@ -38,12 +38,12 @@
carga_sonidos();
frame;
set_center(fpg_pix,8,26,33);
-Index: pixbros-0.6.1/src/menu.pr-
+Index: pixbros-0.6.3/src/menu.pr-
===================================================================
---- pixbros-0.6.1.orig/src/menu.pr- 2008-06-06 08:20:38.000000000 +0000
-+++ pixbros-0.6.1/src/menu.pr- 2008-06-06 08:21:42.000000000 +0000
+--- pixbros-0.6.3.orig/src/menu.pr- 2008-06-17 11:45:30.000000000 +0000
++++ pixbros-0.6.3/src/menu.pr- 2008-06-17 11:45:39.000000000 +0000
@@ -720,8 +720,8 @@
- case "fr": ops.lenguaje=1; lang_suffix="es"; end
+ case "fr": ops.lenguaje=1; lang_suffix="fr"; end
end
- fpg_menu2=load_fpg("fpg/menu-"+lang_suffix+".fpg");
Deleted: packages/trunk/pixbros/debian/patches/fix_i18m.patch
===================================================================
--- packages/trunk/pixbros/debian/patches/fix_i18m.patch 2008-06-17
10:26:33 UTC (rev 7418)
+++ packages/trunk/pixbros/debian/patches/fix_i18m.patch 2008-06-17
11:48:12 UTC (rev 7419)
@@ -1,56 +0,0 @@
-Index: pixbros-0.6.1/src/menu.pr-
-===================================================================
---- pixbros-0.6.1.orig/src/menu.pr- 2008-06-06 08:29:53.000000000 +0000
-+++ pixbros-0.6.1/src/menu.pr- 2008-06-06 08:29:53.000000000 +0000
-@@ -715,9 +715,9 @@
- ops.lenguaje=0; lang_suffix="en";
- switch(lenguajelinux)
- case "es": ops.lenguaje=1; lang_suffix="es"; end
-- case "it": ops.lenguaje=1; lang_suffix="es"; end
-- case "de": ops.lenguaje=1; lang_suffix="es"; end
-- case "fr": ops.lenguaje=1; lang_suffix="es"; end
-+ case "it": ops.lenguaje=2; lang_suffix="it"; end
-+ case "de": ops.lenguaje=3; lang_suffix="de"; end
-+ case "fr": ops.lenguaje=4; lang_suffix="fr"; end
- end
-
-
fpg_menu2=load_fpg("/usr/share/games/pixbros/fpg/menu-"+lang_suffix+".fpg");
-Index: pixbros-0.6.1/src/pixbros.prg
-===================================================================
---- pixbros-0.6.1.orig/src/pixbros.prg 2008-06-06 08:29:53.000000000 +0000
-+++ pixbros-0.6.1/src/pixbros.prg 2008-06-06 08:30:42.000000000 +0000
-@@ -99,6 +99,7 @@
- i;
- duracion;
- tipo;
-+ string env_lang;
- Begin
- if(fxi_os==0) //windows
- savegamedir=getenv("APPDATA")+developerpath;
-@@ -116,6 +117,17 @@
- load(savegamedir+"opciones.dat",ops);
- full_screen=!ops.ventana;
- end
-+ if(fxi_os==1)
-+ env_lang=getenv("LANG");
-+ env_lang=env_lang[0]+env_lang[1];
-+ ops.lenguaje=0; lang_suffix="en";
-+ switch(env_lang)
-+ case "es": ops.lenguaje=1; lang_suffix="es"; end
-+ case "it": ops.lenguaje=2; lang_suffix="it"; end
-+ case "de": ops.lenguaje=3; lang_suffix="de"; end
-+ case "fr": ops.lenguaje=4; lang_suffix="fr"; end
-+ end
-+ end
- switch(ops.lenguaje)
- case 0: lang_suffix="en"; end
- case 1: lang_suffix="es"; end
-@@ -171,7 +183,7 @@
- set_center(fpg_pux,8,26,33);
- set_center(fpg_pax,8,26,33);
- if(ops.lenguaje==100)
-- elige_lenguaje();
-+ elige_lenguaje();
- signal(id,s_kill);
- end
- logo_pixjuegos();
Modified: packages/trunk/pixbros/debian/patches/series
===================================================================
--- packages/trunk/pixbros/debian/patches/series 2008-06-17 10:26:33 UTC
(rev 7418)
+++ packages/trunk/pixbros/debian/patches/series 2008-06-17 11:48:12 UTC
(rev 7419)
@@ -1,5 +1,3 @@
-0.6.1_to_0.6.2.patch
build.patch
directories.patch
browser.patch
-fix_i18m.patch
Modified: packages/trunk/pixbros/debian/rules
===================================================================
--- packages/trunk/pixbros/debian/rules 2008-06-17 10:26:33 UTC (rev 7418)
+++ packages/trunk/pixbros/debian/rules 2008-06-17 11:48:12 UTC (rev 7419)
@@ -66,4 +66,19 @@
binary-arch:
binary: binary-indep binary-arch
+
+get-orig-source:
+ dh_testdir
+ dh_testroot
+ #wget http://www.pixjuegos.com/descargas/pixbros-0.6.3.tar.bz2
+ #wget http://pixjuegos.com/descargas/recursospixbros.tar.bz2
+ tar xvfj pixbros-0.6.3.tar.bz2
+ cd pixbros && tar xvfj ../recursospixbros.tar.bz2
+ rm pixbros-0.6.3.tar.bz2 recursospixbros.tar.bz2
+ rm -f ../pixbros_0.6.3.orig.tar.gz
+ rm -f `find pixbros -name "Thumbs.db"`
+ mv pixbros pixbros-0.6.3
+ tar cvfz ../pixbros_0.6.3.orig.tar.gz pixbros-0.6.3
+ rm -r pixbros-0.6.3
+
.PHONY: build clean binary-indep binary-arch binary install configure
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
