[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.9.14-1-13-gaf1e643

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit af1e64309c175de93ab32e6faea006e03fb7eb85
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Tue Jan 24 10:13:48 2012 +0100

    Install icons into conventional path

diff --git a/debian/changelog b/debian/changelog
index 3f1c610..35d8875 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ wesnoth-1.10 (1:1.10-1) unstable; urgency=low
     - long trait list breaks display (closes: #557907)
     - FTBFS with boost1.48 (closes: #653806)
   * Pull fix-xdg-path patch from upstream bug #19318.
+  * Install icons into conventional path (closes: #655671)
 
  -- 
 
diff --git a/debian/rules b/debian/rules
index 16edd1f..92cc790 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,10 +137,11 @@ binary-indep: install
 	       	debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/games/wesnoth/$(BRANCH_VERSION)/fonts/DroidSansFallbackFull.ttf
 
 	# rename icons versioned
-	mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth-icon.png \
-		debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth-$(BRANCH_VERSION)-icon.png
-	mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth_editor-icon.png \
-		debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth-$(BRANCH_VERSION)_editor-icon.png
+
+	mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth-icon.png \
+		debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth-$(BRANCH_VERSION)-icon.png
+	mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth_editor-icon.png \
+		debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth-$(BRANCH_VERSION)_editor-icon.png
 
 	# /usr/share/doc symlinks
 	for i in wesnoth-$(BRANCH_VERSION); do \
diff --git a/debian/wesnoth-1.10-data.install b/debian/wesnoth-1.10-data.install
index 9086363..00057fb 100644
--- a/debian/wesnoth-1.10-data.install
+++ b/debian/wesnoth-1.10-data.install
@@ -1,5 +1,5 @@
-icons/wesnoth-icon.png /usr/share/icons
-icons/wesnoth_editor-icon.png /usr/share/icons
+icons/wesnoth-icon.png /usr/share/icons/hicolor/64x64/apps
+icons/wesnoth_editor-icon.png /usr/share/icons/hicolor/64x64/apps
 debian/tmp/usr/share/games/wesnoth/1.10/data/*.cfg
 debian/tmp/usr/share/games/wesnoth/1.10/data/COPYING.txt
 debian/tmp/usr/share/games/wesnoth/1.10/data/ai
diff --git a/debian/wesnoth-BRANCH-data.install.in b/debian/wesnoth-BRANCH-data.install.in
index 61be907..7b832f1 100644
--- a/debian/wesnoth-BRANCH-data.install.in
+++ b/debian/wesnoth-BRANCH-data.install.in
@@ -1,5 +1,5 @@
-icons/wesnoth-icon.png /usr/share/icons
-icons/wesnoth_editor-icon.png /usr/share/icons
+icons/wesnoth-icon.png /usr/share/icons/hicolor/64x64/apps
+icons/wesnoth_editor-icon.png /usr/share/icons/hicolor/64x64/apps
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/*.cfg
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/COPYING.txt
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/ai

-- 
Debian packaging of wesnoth