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

[Gerfried Fuchs]

Author: alfie
Date: 2008-04-01 11:49:51 +0000 (Tue, 01 Apr 2008)
New Revision: 6399

Added:
   packages/trunk/wesnoth/debian/patches/03sample.py-fix
Modified:
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/patches/series
   packages/trunk/wesnoth/debian/wesnoth-data.install
Log:
Yippie, proper fix for #472416 instead of removal of script :)

Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-04-01 10:58:45 UTC (rev 6398)
+++ packages/trunk/wesnoth/debian/changelog	2008-04-01 11:49:51 UTC (rev 6399)
@@ -25,10 +25,9 @@
   * Recommend the three introduction campaigns from the wesnoth package and
     add informations about it to the package description (closes: #471912)
   * Improve other package descriptions a little, too.
-  * Explicitly install all ais but the sample.py ai which works only with
-    python 2.3 but we use python 2.4 (closes: #472416)
+  * Pull sample.py-fix patch from upstream svn r25432 (closes: #472416)
 
- -- Gerfried Fuchs <rhonda at debian.at>  Tue, 01 Apr 2008 12:08:28 +0200
+ -- Gerfried Fuchs <rhonda at debian.at>  Tue, 01 Apr 2008 13:49:40 +0200
 
 wesnoth (1:1.4-1) unstable; urgency=low
 

Added: packages/trunk/wesnoth/debian/patches/03sample.py-fix
===================================================================
--- packages/trunk/wesnoth/debian/patches/03sample.py-fix	                        (rev 0)
+++ packages/trunk/wesnoth/debian/patches/03sample.py-fix	2008-04-01 11:49:51 UTC (rev 6399)
@@ -0,0 +1,22 @@
+Index: wesnoth-1.4/data/ais/sample.py
+===================================================================
+--- wesnoth-1.4.orig/data/ais/sample.py
++++ wesnoth-1.4/data/ais/sample.py
+@@ -253,7 +253,7 @@ class AI:
+             resistance /= n
+ 
+             debug("%s: speed: %f, defense: %f, aggression: %f, resistance: %f" %
+-                (recruit.name, speed, defense, aggression, resistance)
++                (recruit.name, speed, defense, aggression, resistance))
+ 
+             recruits_list.append((recruit, speed, defense, aggression, resistance))
+ 
+@@ -280,7 +280,7 @@ class AI:
+                     r = random.uniform(0, total_v)
+                     while 1:
+                         v, recruit = heapq.heappop(heap)
+-                        debug("%d %d" % % (r, v))
++                        debug("%d %d" % (r, v))
+                         r += v
+                         if r <= 0: break
+ 

Modified: packages/trunk/wesnoth/debian/patches/series
===================================================================
--- packages/trunk/wesnoth/debian/patches/series	2008-04-01 10:58:45 UTC (rev 6398)
+++ packages/trunk/wesnoth/debian/patches/series	2008-04-01 11:49:51 UTC (rev 6399)
@@ -1,2 +1,3 @@
 01disable-rpath
 02wesnoth-nolog-desktop-file
+03sample.py-fix

Modified: packages/trunk/wesnoth/debian/wesnoth-data.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-data.install	2008-04-01 10:58:45 UTC (rev 6398)
+++ packages/trunk/wesnoth/debian/wesnoth-data.install	2008-04-01 11:49:51 UTC (rev 6399)
@@ -1,10 +1,7 @@
 debian/overrides/wesnoth-data /usr/share/lintian/overrides
 debian/tmp/usr/share/games/wesnoth/data/*.cfg
 debian/tmp/usr/share/games/wesnoth/data/COPYING.txt
-debian/tmp/usr/share/games/wesnoth/data/ais/bruteforce.py
-debian/tmp/usr/share/games/wesnoth/data/ais/documentation.py
-debian/tmp/usr/share/games/wesnoth/data/ais/parse.py
-debian/tmp/usr/share/games/wesnoth/data/ais/safe.py
+debian/tmp/usr/share/games/wesnoth/data/ais
 debian/tmp/usr/share/games/wesnoth/data/campaigns/tutorial
 debian/tmp/usr/share/games/wesnoth/data/core/*.cfg
 debian/tmp/usr/share/games/wesnoth/data/core/README