[freecol] 119/125: Install the better looking 64x64 icon and remove the svg icon again.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository freecol.

commit 88259e9b5a180bc46d53b3be08edf885b14c2387
Author: Markus Koschany <apo at debian.org>
Date:   Sun Dec 20 19:44:40 2015 +0100

    Install the better looking 64x64 icon and remove the svg icon again.
---
 debian/changelog       | 2 +-
 debian/freecol.install | 2 +-
 debian/rules           | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15376b9..39a7879 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ freecol (0.11.6+dfsg-1) unstable; urgency=medium
   * Rebase commons-cli-1.3.patch for new release.
   * Update installation path of freecol.xpm icon.
   * Install upstream's README file.
-  * Install svg icon to hicolor icon directory.
+  * Install 64x64 xpm icon to hicolor icon directory.
   * Start Freecol in windowed mode by default.
   * Drop README.Debian.
   * Use /bin/sh and set -e for wrapper script
diff --git a/debian/freecol.install b/debian/freecol.install
index 27c86fe..7314b0c 100644
--- a/debian/freecol.install
+++ b/debian/freecol.install
@@ -1,7 +1,7 @@
 data/* usr/share/games/freecol
 debian/freecol.desktop usr/share/applications
 debian/wrapper/freecol usr/games
+freecol.xpm usr/share/icons/hicolor/64x64/apps
 packaging/common/freecol.xpm usr/share/pixmaps
-packaging/common/freecol.svg usr/share/icons/hicolor/scalable/apps
 packaging/common/freecol.appdata.xml usr/share/appdata
 
diff --git a/debian/rules b/debian/rules
index b02ef95..b19f5f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,11 @@ override_dh_auto_build:
 		package \
 		online-manual \
 		print-manual
+	cp packaging/common/freecol_64x64.xpm freecol.xpm
+
+override_dh_clean:
+	dh_clean
+	$(RM) freecol.xpm
 
 get-orig-source:
 	uscan --verbose --download-current-version --force-download --repack --compression xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git