[redeclipse] 383/494: no converting icons in build

[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 a7bacc9e0e47b5539fceedd54c2d265d1a68e22a
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Fri Aug 3 14:56:34 2012 +0200

    no converting icons in build
    
    * Source comes with preconverted PNGs (from ICO)
    * ImageMagick b-d no longer required
    * XPM icon included upstream
---
 changelog | 2 ++
 clean     | 1 -
 control   | 1 -
 rules     | 5 +----
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index 9d4e0c1..5e5239f 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ redeclipse (1.2+svn3759-1) UNRELEASED; urgency=low
 
   * New upstream development snapshot
   * XZ compression for orig tarball
+  * No more icon conversion in build
+    - Drop ImageMagick build-dependency
 
  -- Martin Erik Werner <martinerikwerner at gmail.com>  Sat, 14 Jul 2012 17:43:35 +0200
 
diff --git a/clean b/clean
index 91676ec..ee663c2 100644
--- a/clean
+++ b/clean
@@ -1,3 +1,2 @@
 bin/reclient_native
 bin/reserver_native
-src/install/nix/redeclipse_x*.png
diff --git a/control b/control
index 65e2bdd..1525f80 100644
--- a/control
+++ b/control
@@ -4,7 +4,6 @@ Priority: optional
 Uploaders: Martin Erik Werner <martinerikwerner at gmail.com>
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 9),
-               imagemagick,
                libenet-dev,
                liblg1-mesa-dev | libgl-dev,
                libsdl-image1.2-dev,
diff --git a/rules b/rules
index 2e7a4aa..61c9c89 100755
--- a/rules
+++ b/rules
@@ -14,7 +14,7 @@ override_dh_auto_build:
 		CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
 		CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
 		LDFLAGS="$(LDFLAGS)" \
-		client server icons
+		client server
 
 override_dh_strip:
 	dh_strip -predeclipse --dbg-package=redeclipse-dbg
@@ -27,9 +27,6 @@ override_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
 
 override_dh_compress:
 	dh_compress --exclude=.cfg

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