r6393 - in packages/trunk/wesnoth/debian: . overrides

[Gerfried Fuchs]

Author: alfie
Date: 2008-04-01 10:12:06 +0000 (Tue, 01 Apr 2008)
New Revision: 6393

Modified:
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/overrides/wesnoth-data
   packages/trunk/wesnoth/debian/rules
   packages/trunk/wesnoth/debian/wesnoth-data.install
Log:
Fix font install handling and overrides
 * Explicitly install all ais but the sample.py ai which works only with
   python 2.3 but we use python 2.4 (closes: #472416)
Add closes for campaign recommendation
Patch at the right place to have it in proper order


Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-03-31 17:44:21 UTC (rev 6392)
+++ packages/trunk/wesnoth/debian/changelog	2008-04-01 10:12:06 UTC (rev 6393)
@@ -23,11 +23,12 @@
   * Make use of the http://sf.net/$project/ hack in debian/watch instead of
     chosing a mirror on our own.
   * Recommend the three introduction campaigns from the wesnoth package and
-    add informations about it to the package description (workaround for
-    #471851)
+    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)
 
- -- Gerfried Fuchs <rhonda at debian.at>  Thu, 27 Mar 2008 13:47:08 +0100
+ -- Gerfried Fuchs <rhonda at debian.at>  Tue, 01 Apr 2008 12:08:28 +0200
 
 wesnoth (1:1.4-1) unstable; urgency=low
 

Modified: packages/trunk/wesnoth/debian/overrides/wesnoth-data
===================================================================
--- packages/trunk/wesnoth/debian/overrides/wesnoth-data	2008-03-31 17:44:21 UTC (rev 6392)
+++ packages/trunk/wesnoth/debian/overrides/wesnoth-data	2008-04-01 10:12:06 UTC (rev 6393)
@@ -1,5 +1,5 @@
 wesnoth-data: extra-license-file usr/share/games/wesnoth/data/COPYING.txt
 wesnoth-data: symlink-should-be-relative usr/share/games/wesnoth/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
 wesnoth-data: symlink-should-be-relative usr/share/games/wesnoth/fonts/sazanami-gothic.ttf /usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
-wesnoth-data: symlink-should-be-relative usr/share/games/wesnoth/fonts/gkai00mp.ttf /usr/share/fonts/truetype/arphic/gkai00mp.ttf
+wesnoth-data: symlink-should-be-relative usr/share/games/wesnoth/fonts/wqy-zenhei-gb2312.ttf /usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
 wesnoth-data: symlink-should-be-relative usr/share/icons/wesnoth-icon.png /usr/share/games/wesnoth/images/wesnoth-icon.png

Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules	2008-03-31 17:44:21 UTC (rev 6392)
+++ packages/trunk/wesnoth/debian/rules	2008-04-01 10:12:06 UTC (rev 6393)
@@ -37,7 +37,6 @@
 #NEXT_VERSION = $(UPSTREAM_VERSION).~
 
 
-QUILT_STAMPFN = patch-stamp
 include /usr/share/quilt/quilt.make
 
 clean: unpatch
@@ -54,10 +53,10 @@
 
 
 #Architecture
-build: build-arch build-indep patch-stamp
+build: build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp:
+build-arch-stamp: patch
 	./configure $(CONFIGURE_SWITCHES) --enable-smallgui
 	$(MAKE)
 	mv src/wesnoth src/wesnoth-smallgui
@@ -139,7 +138,7 @@
 		do ln -s /usr/share/fonts/truetype/$$i \
 	       	debian/wesnoth-data/usr/share/games/wesnoth/fonts/`basename $$i`; \
 		done
-	ln -s /usr/share/fonts/truetype/$$i \
+	ln -s /usr/share/fonts/truetype/wqy/wqy-zenhei.ttf \
 	       	debian/wesnoth-data/usr/share/games/wesnoth/fonts/wqy-zenhei-gb2312.ttf
 	ln -s /usr/share/games/wesnoth/images/wesnoth-icon.png \
 		debian/wesnoth-data/usr/share/icons/wesnoth-icon.png

Modified: packages/trunk/wesnoth/debian/wesnoth-data.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-data.install	2008-03-31 17:44:21 UTC (rev 6392)
+++ packages/trunk/wesnoth/debian/wesnoth-data.install	2008-04-01 10:12:06 UTC (rev 6393)
@@ -1,7 +1,10 @@
 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
+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/campaigns/tutorial
 debian/tmp/usr/share/games/wesnoth/data/core/*.cfg
 debian/tmp/usr/share/games/wesnoth/data/core/README