[hedgewars] 01/01: Closing bug #726443 simplify debian/rules

[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 9075243f16c421806633b016e25220dafe0c68be
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Feb 7 11:59:05 2014 +0100

    Closing bug #726443 simplify debian/rules
---
 debian/changelog                                              |  7 +++++++
 debian/hedgewars.install                                      |  3 ++-
 debian/hicolor-icons/128x128/{ => apps}/hedgewars.xpm         |  0
 debian/hicolor-icons/16x16/{ => apps}/hedgewars.xpm           |  0
 debian/hicolor-icons/256x256/{ => apps}/hedgewars.xpm         |  0
 debian/hicolor-icons/32x32/{ => apps}/hedgewars.xpm           |  0
 debian/hicolor-icons/512x512/{ => apps}/hedgewars.xpm         |  0
 debian/hicolor-icons/{32x32/hedgewars.xpm => hedgewars32.xpm} |  0
 debian/menu                                                   |  3 ++-
 debian/rules                                                  | 11 -----------
 10 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 530d082..f45018a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hedgewars (0.9.20.5-5) UNRELEASED; urgency=low
+
+  * Adding an hedgewars32.xpm file (Closes: #726443)
+  * Installing icons as xpm instead of png.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 07 Feb 2014 11:57:27 +0100
+
 hedgewars (0.9.20.5-4) experimental; urgency=low
 
   * debian/rules
diff --git a/debian/hedgewars.install b/debian/hedgewars.install
index 076aaea..9094027 100644
--- a/debian/hedgewars.install
+++ b/debian/hedgewars.install
@@ -1,4 +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/
-tmp-icon/*						/usr/share/icons/hicolor/
+debian/hicolor-icons/*					/usr/share/icons/hicolor/
+debian/hicolor-icons/hedgewars32.xpm			/usr/share/pixmaps/
diff --git a/debian/hicolor-icons/128x128/hedgewars.xpm b/debian/hicolor-icons/128x128/apps/hedgewars.xpm
similarity index 100%
rename from debian/hicolor-icons/128x128/hedgewars.xpm
rename to debian/hicolor-icons/128x128/apps/hedgewars.xpm
diff --git a/debian/hicolor-icons/16x16/hedgewars.xpm b/debian/hicolor-icons/16x16/apps/hedgewars.xpm
similarity index 100%
rename from debian/hicolor-icons/16x16/hedgewars.xpm
rename to debian/hicolor-icons/16x16/apps/hedgewars.xpm
diff --git a/debian/hicolor-icons/256x256/hedgewars.xpm b/debian/hicolor-icons/256x256/apps/hedgewars.xpm
similarity index 100%
rename from debian/hicolor-icons/256x256/hedgewars.xpm
rename to debian/hicolor-icons/256x256/apps/hedgewars.xpm
diff --git a/debian/hicolor-icons/32x32/hedgewars.xpm b/debian/hicolor-icons/32x32/apps/hedgewars.xpm
similarity index 100%
copy from debian/hicolor-icons/32x32/hedgewars.xpm
copy to debian/hicolor-icons/32x32/apps/hedgewars.xpm
diff --git a/debian/hicolor-icons/512x512/hedgewars.xpm b/debian/hicolor-icons/512x512/apps/hedgewars.xpm
similarity index 100%
rename from debian/hicolor-icons/512x512/hedgewars.xpm
rename to debian/hicolor-icons/512x512/apps/hedgewars.xpm
diff --git a/debian/hicolor-icons/32x32/hedgewars.xpm b/debian/hicolor-icons/hedgewars32.xpm
similarity index 100%
rename from debian/hicolor-icons/32x32/hedgewars.xpm
rename to debian/hicolor-icons/hedgewars32.xpm
diff --git a/debian/menu b/debian/menu
index 0521d63..60c40fa 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,3 +1,4 @@
 ?package(hedgewars):needs="x11" section="Games/Action"\
   title="Hedgewars" \
-  command="/usr/games/hedgewars" 
+  command="/usr/games/hedgewars" \
+  icon="/usr/share/pixmaps/hedgewars32.xpm"
diff --git a/debian/rules b/debian/rules
index 3f519b3..11db3db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,19 +6,8 @@
 DEJAVU_DIRECTORY := $(shell dirname `readlink -f /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf`)
 
 override_dh_auto_configure:
-	for icon in `find debian/hicolor-icons -type f`; do \
-		dirname=`dirname $$icon`; \
-		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 \
 				-DFONTS_DIRS='/usr/share/fonts/truetype/wqy;$(DEJAVU_DIRECTORY)' \
 				-DNOVERSIONINFOUPDATE=1
-
-override_dh_clean:
-	rm -rf tmp-icon
-	dh_clean

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