[SCM] Packaging for Red Eclipse branch, master, updated. fe7856f7c6a84e74e708ab0a4de645e004ee911d

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit fe7856f7c6a84e74e708ab0a4de645e004ee911d
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Mon Jan 9 03:15:14 2012 +0100

    Move conversion to xpm into dh_auto_install
    
    Since the rest of the icon conversions (in the system-install
    target) is done in dh_auto_install, it makes sense to do the xpm
    conversion here as well.

diff --git a/debian/rules b/debian/rules
index a726836..13e6d09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,22 +9,19 @@ override_dh_auto_clean:
 
 override_dh_auto_build:
 	dh_auto_build -- client server icons
-	install -d debian/tmp/usr/share/pixmaps
-	convert 'src/redeclipse.ico[1]' \
-		debian/tmp/usr/share/pixmaps/redeclipse.xpm
 
 override_dh_strip:
 	dh_strip -predeclipse --dbg-package=redeclipse-dbg
 	dh_strip -predeclipse-server --dbg-package=redeclipse-server-dbg
 	dh_strip
 
-override_dh_prep:
-	dh_prep --exclude=debian/tmp
-
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr games=/games gamesbin=/games \
 		system-install-client system-install-server \
 		system-install-docs system-install-menus
+	install -d debian/tmp/usr/share/pixmaps
+	convert 'src/redeclipse.ico[1]' \
+		debian/tmp/usr/share/pixmaps/redeclipse.xpm
 
 overrride_dh_builddeb:
 	dh_builddeb -- -Zxz

-- 
Packaging for Red Eclipse