[redeclipse] 272/494: Fixup of icon directories

[Martin Werner]

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

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit 88552ac62efceb66507877700ed302d7e5afe877
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Fri Dec 2 15:16:26 2011 +0100

    Fixup of icon directories
---
 redeclipse.install |  8 ++++++--
 rules              | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/redeclipse.install b/redeclipse.install
index 2b06766..d6ebe62 100644
--- a/redeclipse.install
+++ b/redeclipse.install
@@ -1,5 +1,9 @@
 src/reclient usr/lib/games/redeclipse
 debian/scripts/redeclipse usr/games
-debian/redeclipse.png usr/share/icons/hicolor/48x48/apps
-debian/redeclipse.xpm usr/share/pixmaps
 debian/redeclipse.desktop usr/share/applications
+usr/share/icons/hicolor/16x16/apps/redeclipse.png
+usr/share/icons/hicolor/32x32/apps/redeclipse.png
+usr/share/pixmaps/redeclipse.xpm
+usr/share/icons/hicolor/48x48/apps/redeclipse.png
+usr/share/icons/hicolor/64x64/apps/redeclipse.png
+usr/share/icons/hicolor/128x128/apps/redeclipse.png
diff --git a/rules b/rules
index e0cfee4..f94b9c2 100755
--- a/rules
+++ b/rules
@@ -9,6 +9,18 @@ override_dh_auto_clean:
 	make -C src/enet/ distclean
 
 override_dh_auto_build:
+	convert 'src/redeclipse.ico[0]' \
+		debian/tmp/usr/share/icons/hicolor/16x16/apps/redeclipse.png
+	convert 'src/redeclipse.ico[1]' \
+		debian/tmp/usr/share/icons/hicolor/32x32/apps/redeclipse.png
+	convert 'src/redeclipse.ico[1]' \
+		debian/tmp/usr/share/pixmaps/redeclipse.xpm
+	convert -resize 48x48 'src/redeclipse.ico[2]' \
+		debian/tmp/usr/share/icons/hicolor/48x48/apps/redeclipse.png
+	convert 'src/redeclipse.ico[2]' \
+		debian/tmp/usr/share/icons/hicolor/64x64/apps/redeclipse.png
+	convert 'src/redeclipse.ico[3]' \
+		debian/tmp/usr/share/icons/hicolor/128x128/apps/redeclipse.png
 	dh_auto_build -- client server cube2font
 
 override_dh_strip:
@@ -17,18 +29,6 @@ override_dh_strip:
 	dh_strip
 
 override_dh_install:
-	convert 'src/redeclipse.ico[0]' \
-		debian/redeclipse/usr/share/icons/hicolor/16x16/redeclipse.png
-	convert 'src/redeclipse.ico[1]' \
-		debian/redeclipse/usr/share/icons/hicolor/32x32/redeclipse.png
-	convert 'src/redeclipse.ico[1]' \
-		debian/redeclipse/usr/share/pixmaps/redeclipse.xpm
-	convert -resize 48x48 'src/redeclipse.ico[2]' \
-		debian/redeclipse/usr/share/icons/hicolor/48x48/redeclipse.png
-	convert 'src/redeclipse.ico[2]' \
-		debian/redeclipse/usr/share/icons/hicolor/64x64/redeclipse.png
-	convert 'src/redeclipse.ico[3]' \
-		debian/redeclipse/usr/share/icons/hicolor/128x128/redeclipse.png
 	dh_install --exclude="license.txt"
 
 URL=https://redeclipse.svn.sourceforge.net/svnroot/redeclipse

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