r3319 - in packages/trunk/teg/debian: . patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-07-11 06:42:03 +0000 (Wed, 11 Jul 2007)
New Revision: 3319

Added:
   packages/trunk/teg/debian/patches/avoid_two_identical_country.diff
Modified:
   packages/trunk/teg/debian/changelog
   packages/trunk/teg/debian/patches/series
Log:
+  * backport upstream patch to avoid two identical country (Closes: #406351)
+   + add avoid_two_identical_country.diff



Modified: packages/trunk/teg/debian/changelog
===================================================================
--- packages/trunk/teg/debian/changelog	2007-07-11 06:36:36 UTC (rev 3318)
+++ packages/trunk/teg/debian/changelog	2007-07-11 06:42:03 UTC (rev 3319)
@@ -1,3 +1,10 @@
+teg (0.11.2-2) unstable; urgency=low
+
+  * backport upstream patch to avoid two identical country (Closes: #406351)
+   + add avoid_two_identical_country.diff
+
+ --Gonéri Le Bouder <goneri at rulezlan.org>  Wed, 11 Jul 2007 08:49:07 +0200
+
 teg (0.11.2-1) unstable; urgency=low
 
   [ Gonéri Le Bouder ]

Added: packages/trunk/teg/debian/patches/avoid_two_identical_country.diff
===================================================================
--- packages/trunk/teg/debian/patches/avoid_two_identical_country.diff	                        (rev 0)
+++ packages/trunk/teg/debian/patches/avoid_two_identical_country.diff	2007-07-11 06:42:03 UTC (rev 3319)
@@ -0,0 +1,18 @@
+Index: teg-0.11.2/server/play.c
+===================================================================
+--- teg-0.11.2.orig/server/play.c	2007-07-11 08:47:29.000000000 +0200
++++ teg-0.11.2/server/play.c	2007-07-11 08:48:11.000000000 +0200
+@@ -1009,10 +1009,12 @@
+ 
+ 	canj_ejer = cuantos_x_canje( pJ->tot_exchanges );
+ 
+-	/* quitarle las tarjetas al player */
++	/* quitarle las tarjetas al player | mark the cards as unused*/
+ 	tarjeta_poner( &g_countries[t1].tarjeta );
+ 	tarjeta_poner( &g_countries[t2].tarjeta );
+ 	tarjeta_poner( &g_countries[t2].tarjeta );
++	tarjeta_poner( &g_countries[t3].tarjeta );
++
+ 
+ 	netall_printf("%s=%d,%d,%d,%d,%d\n", TOKEN_CANJE,
+ 			pJ->numjug,canj_ejer,t1,t2,t3);

Modified: packages/trunk/teg/debian/patches/series
===================================================================
--- packages/trunk/teg/debian/patches/series	2007-07-11 06:36:36 UTC (rev 3318)
+++ packages/trunk/teg/debian/patches/series	2007-07-11 06:42:03 UTC (rev 3319)
@@ -1,3 +1,4 @@
+avoid_two_identical_country.diff
 desktop-file-fixes.diff
 fix_xml-doc-for-yelp.diff
 x-terminal-emulator.diff