r9312 - packages/trunk/wesnoth/debian

[Gerfried Fuchs]

Author: alfie
Date: 2009-03-31 13:32:15 +0000 (Tue, 31 Mar 2009)
New Revision: 9312

Modified:
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/rules
   packages/trunk/wesnoth/debian/wesnoth-data.install
Log:
wesnoth (1:1.6a-2) unstable; urgency=medium
  * Install the menu icons from the icons subdirectory instead of symlinking
    into the void. Thanks to Ori Avtalion for noticing it!


Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2009-03-31 11:47:28 UTC (rev 9311)
+++ packages/trunk/wesnoth/debian/changelog	2009-03-31 13:32:15 UTC (rev 9312)
@@ -1,3 +1,10 @@
+wesnoth (1:1.6a-2) unstable; urgency=medium
+
+  * Install the menu icons from the icons subdirectory instead of symlinking
+    into the void. Thanks to Ori Avtalion for noticing it!
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Tue, 31 Mar 2009 15:30:18 +0200
+
 wesnoth (1:1.6a-1) unstable; urgency=low
 
   * New upstream hotfix release fixing several AI related problems in

Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules	2009-03-31 11:47:28 UTC (rev 9311)
+++ packages/trunk/wesnoth/debian/rules	2009-03-31 13:32:15 UTC (rev 9312)
@@ -147,10 +147,6 @@
 		done
 	ln -s /usr/share/fonts/truetype/wqy/wqy-zenhei.ttf \
 	       	debian/wesnoth-data/usr/share/games/wesnoth/fonts/wqy-zenhei.ttc
-	ln -s /usr/share/games/wesnoth/images/wesnoth-icon.png \
-		debian/wesnoth-data/usr/share/icons/wesnoth-icon.png
-	ln -s /usr/share/games/wesnoth/images/wesnoth_editor-icon.png \
-		debian/wesnoth-data/usr/share/icons/wesnoth_editor-icon.png
 
 	for i in wesnoth wesnoth-all wesnoth-editor; do \
 		install -p -d -m755 debian/$$i/usr/share/doc; \

Modified: packages/trunk/wesnoth/debian/wesnoth-data.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-data.install	2009-03-31 11:47:28 UTC (rev 9311)
+++ packages/trunk/wesnoth/debian/wesnoth-data.install	2009-03-31 13:32:15 UTC (rev 9312)
@@ -1,4 +1,6 @@
 debian/overrides/wesnoth-data /usr/share/lintian/overrides
+icons/wesnoth-icon.png /usr/share/icons
+icons/wesnoth_editor-icon.png /usr/share/icons
 debian/tmp/usr/share/games/wesnoth/data/*.cfg
 debian/tmp/usr/share/games/wesnoth/data/COPYING.txt
 debian/tmp/usr/share/games/wesnoth/data/ai