[hedgewars] 01/01: Restoring pngs, upload to unstable

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit 061a01538e0c624fe4e503df3e20eafc5d0fb526
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jul 14 11:27:31 2014 +0200

    Restoring pngs, upload to unstable
---
 debian/changelog         |  6 ++++++
 debian/hedgewars.install |  2 +-
 debian/rules             | 12 ++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6409185..dc0e07a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hedgewars (0.9.20.5-7) unstable; urgency=medium
+
+  * Restoring png files for hicolor icons.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 14 Jul 2014 11:08:28 +0200
+
 hedgewars (0.9.20.5-6) unstable; urgency=low
 
   * Release to unstable.
diff --git a/debian/hedgewars.install b/debian/hedgewars.install
index a01e821..9673d0b 100644
--- a/debian/hedgewars.install
+++ b/debian/hedgewars.install
@@ -1,5 +1,5 @@
 usr/lib
 obj-*/share/hedgewars/Data/misc/hwengine.desktop	/usr/share/games/hedgewars/Data/misc
 share/hedgewars/Data/misc/hedgewars.desktop		/usr/share/applications/
-debian/hicolor-icons/*					/usr/share/icons/hicolor/
+tmp-icon/*						/usr/share/icons/hicolor/
 /usr/share/pixmaps/
diff --git a/debian/rules b/debian/rules
index 9621dad..93219ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,24 @@
 
 DEJAVU_DIRECTORY := $(shell dirname `readlink -f /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf`)
 
+override_dh_clean:
+	rm -rf tmp-icon
+	dh_clean
+
 override_dh_install:
 	mv debian/tmp/usr/lib/hedgewars/share/pixmaps/ debian/tmp/usr/share/
 	rm -Rf debian/tmp/usr/lib/hedgewars/share/
 	dh_install
 
 override_dh_auto_configure:
+	for icon in `find debian/hicolor-icons -type f`; do \
+		dirname=`dirname $$icon`; \
+		dirname=`dirname $$dirname`; \
+		dirname=`basename $$dirname`; \
+		basename=`basename $$icon .xpm`; \
+		mkdir -p tmp-icon/$$dirname/apps; \
+		convert $$icon tmp-icon/$$dirname/apps/$$basename.png; \
+	done
 	dh_auto_configure -- 	-DCMAKE_INSTALL_PREFIX=/usr/lib/hedgewars \
 				-DDATA_INSTALL_DIR=/usr/share/games/hedgewars \
 				-DCMAKE_BUILD_TYPE=RELEASE -DPHYSFS_SYSTEM=ON \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git