[SCM] Packaging for Red Eclipse branch, master-svn, updated. debian/1.2-2-36-g545b2de

[Martin Erik Werner]

The following commit has been merged in the master-svn branch:
commit de167a88cec301e4c0ca17deffca92eab47eab53
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

diff --git a/debian/changelog b/debian/changelog
index 9d4e0c1..5e5239f 100644
--- a/debian/changelog
+++ b/debian/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/debian/clean b/debian/clean
index 91676ec..ee663c2 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,2 @@
 bin/reclient_native
 bin/reserver_native
-src/install/nix/redeclipse_x*.png
diff --git a/debian/control b/debian/control
index 65e2bdd..1525f80 100644
--- a/debian/control
+++ b/debian/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/debian/rules b/debian/rules
index 2e7a4aa..61c9c89 100755
--- a/debian/rules
+++ b/debian/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

-- 
Packaging for Red Eclipse