r8508 - in packages/trunk/wesnoth/debian: . patches

[Gerfried Fuchs]

Author: alfie
Date: 2008-12-14 18:36:07 +0000 (Sun, 14 Dec 2008)
New Revision: 8508

Removed:
   packages/trunk/wesnoth/debian/patches/03recruite_more_than_99_castle_tiles_away
Modified:
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/patches/series
Log:
wesnoth (1:1.4.7-3) unstable; urgency=low
  * Revert change in last revision - it would impose a compatibility issue.
    Will be fixed with first release candidate of 1.6.


Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-12-14 01:19:01 UTC (rev 8507)
+++ packages/trunk/wesnoth/debian/changelog	2008-12-14 18:36:07 UTC (rev 8508)
@@ -1,3 +1,10 @@
+wesnoth (1:1.4.7-3) unstable; urgency=low
+
+  * Revert change in last revision - it would impose a compatibility issue.
+    Will be fixed with first release candidate of 1.6.
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Sun, 14 Dec 2008 16:10:47 +0100
+
 wesnoth (1:1.4.7-2) unstable; urgency=low
 
   * Fetch upstream revision 28805 to allow recruit more than 99 castle tiles

Deleted: packages/trunk/wesnoth/debian/patches/03recruite_more_than_99_castle_tiles_away
===================================================================
--- packages/trunk/wesnoth/debian/patches/03recruite_more_than_99_castle_tiles_away	2008-12-14 01:19:01 UTC (rev 8507)
+++ packages/trunk/wesnoth/debian/patches/03recruite_more_than_99_castle_tiles_away	2008-12-14 18:36:07 UTC (rev 8508)
@@ -1,19 +0,0 @@
-Author: Eric S. Raymond <esr at thyrsus.com>	vim:ft=diff:
-Description: Address bug #12185: Cannot recruit more than 99 castle tiles away.
-
-Index: wesnoth-1.4.7/src/actions.cpp
-===================================================================
---- wesnoth-1.4.7.orig/src/actions.cpp
-+++ wesnoth-1.4.7/src/actions.cpp
-@@ -112,7 +112,10 @@ bool can_recruit_on(const gamemap& map, 
- 		return false;
- 
- 	castle_cost_calculator calc(map);
--	const paths::route& rt = a_star_search(leader, loc, 100.0, &calc, map.w(), map.h());
-+	// The limit computed in the third argument is more than enough for
-+	// any convex castle on the map. Strictly speaking it could be 
-+	// reduced to sqrt(map.w()**2 + map.h()**2).
-+	const paths::route& rt = a_star_search(leader, loc, map.w()+map.h(), &calc, map.w(), map.h());
- 
- 	if(rt.steps.empty())
- 		return false;

Modified: packages/trunk/wesnoth/debian/patches/series
===================================================================
--- packages/trunk/wesnoth/debian/patches/series	2008-12-14 01:19:01 UTC (rev 8507)
+++ packages/trunk/wesnoth/debian/patches/series	2008-12-14 18:36:07 UTC (rev 8508)
@@ -1,2 +1 @@
 02wesnoth-nolog-desktop-file
-03recruite_more_than_99_castle_tiles_away