r109 - in atanks/trunk/debian: . patches

msp at alioth.debian.org msp at alioth.debian.org
Mon Jun 30 11:43:29 UTC 2008


Author: msp
Date: 2008-06-30 11:43:29 +0000 (Mon, 30 Jun 2008)
New Revision: 109

Added:
   atanks/trunk/debian/patches/selectPlayers-fix.patch
Modified:
   atanks/trunk/debian/changelog
   atanks/trunk/debian/rules
Log:
* New upstream release
* Fixed upstream:
  - Does not have a GNOME (Freedesktop) Menu entry; this fixes that
  (Closes: #478857)
  - freezes when no players are choosen for game and player clicks 'ok'
  (Closes: #484900)
* Include upstream selectPlayers-fix.patch

Modified: atanks/trunk/debian/changelog
===================================================================
--- atanks/trunk/debian/changelog	2008-06-30 10:58:54 UTC (rev 108)
+++ atanks/trunk/debian/changelog	2008-06-30 11:43:29 UTC (rev 109)
@@ -1,8 +1,14 @@
-atanks (2.9-2) UNRELEASED; urgency=low
+atanks (3.0-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release
+  * Fixed upstream:
+    - Does not have a GNOME (Freedesktop) Menu entry; this fixes that
+    (Closes: #478857)
+    - freezes when no players are choosen for game and player clicks 'ok'
+    (Closes: #484900)
+  * Include upstream selectPlayers-fix.patch
 
- -- Mark Purcell <msp at debian.org>  Thu, 03 Apr 2008 22:17:50 +1100
+ -- Mark Purcell <msp at debian.org>  Mon, 30 Jun 2008 21:43:09 +1000
 
 atanks (2.9-1) unstable; urgency=low
 

Added: atanks/trunk/debian/patches/selectPlayers-fix.patch
===================================================================
--- atanks/trunk/debian/patches/selectPlayers-fix.patch	                        (rev 0)
+++ atanks/trunk/debian/patches/selectPlayers-fix.patch	2008-06-30 11:43:29 UTC (rev 109)
@@ -0,0 +1,13 @@
+diff -Nur -x '*.orig' -x '*~' atanks-3.0/src/atanks.cc atanks-3.0.new/src/atanks.cc
+--- atanks-3.0/src/atanks.cc	2008-05-25 06:48:52.000000000 +1000
++++ atanks-3.0.new/src/atanks.cc	2008-06-30 21:23:11.000000000 +1000
+@@ -1271,7 +1271,8 @@
+         memcpy (&playersOpts[global->numPermanentPlayers + 1], &gamename, sizeof (MENUENTRY));
+         memcpy (&playersOpts[global->numPermanentPlayers + 2], &loadgame, sizeof (MENUENTRY));
+         memcpy (&playersOpts[global->numPermanentPlayers + 3], &campaign, sizeof (MENUENTRY));
+-        memcpy (&playersOpts[global->numPermanentPlayers + 4], &load_game_entry, sizeof(MENUENTRY));
++        if ((number_saved_games) && (saved_game_names) ) 
++          memcpy (&playersOpts[global->numPermanentPlayers + 4], &load_game_entry, sizeof(MENUENTRY));
+ 
+ 	do {
+ 		optionsRetVal = options (global, env, &playersMenu);

Modified: atanks/trunk/debian/rules
===================================================================
--- atanks/trunk/debian/rules	2008-06-30 10:58:54 UTC (rev 108)
+++ atanks/trunk/debian/rules	2008-06-30 11:43:29 UTC (rev 109)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 build/atanks::
 	$(MAKE) -C src -f Makefile.debian




More information about the Pkg-allegro-commits mailing list