[SCM] Worms style game branch, master, updated. debian/0.9.15-2

[Dmitry E. Oboukhov]

The following commit has been merged in the master branch:
commit ff3bea0615830528f9b89951bacaafac449dbbab
Author: Dmitry E. Oboukhov <unera at debian.org>
Date:   Tue Jul 5 17:37:30 2011 +0400

    Fix FTBFS, install hicolor icons

diff --git a/debian/changelog b/debian/changelog
index d61d5de..47e912d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+hedgewars (0.9.15-2) unstable; urgency=low
+
+  * Fixed depends (FTBFS, closes: #629778), closed fake bug (closes: #631152).
+  * Bump Standards-Version to 3.9.2.
+  * Install hicolor icons, closes: #621792,
+    thanks to Kees Cook <kees at debian.org>.
+
+ -- Dmitry E. Oboukhov <unera at debian.org>  Tue, 05 Jul 2011 17:35:56 +0400
+
 hedgewars (0.9.15-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index ed7cf4d..a8fab74 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,9 @@ Build-Depends: debhelper (>= 7), cmake, cdbs,
  libqt4-dev (>= 4.2), fp-compiler, libsdl1.2-dev, libsdl-ttf2.0-dev,
  libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, bzip2,
  fp-units-gfx,
- ghc6, libghc6-stm-dev, libghc6-network-dev, libghc6-utf8-string-dev,
- libghc6-time-dev, libghc6-dataenc-dev, libghc6-hslogger-dev,
+ ghc6, libghc6-stm-dev, libghc6-network-dev,
+ libghc6-dataenc-dev, libghc6-hslogger-dev,
+ libghc-utf8-string-dev,
  liblua5.1-dev
 Standards-Version: 3.9.1
 Homepage: http://hedgewars.org
diff --git a/debian/hedgewars.install b/debian/hedgewars.install
index 8805b77..ae82378 100644
--- a/debian/hedgewars.install
+++ b/debian/hedgewars.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/* /usr/lib/
 misc/hedgewars.desktop /usr/share/applications/
-
+tmp-icon/* /usr/share/icons/hicolor/
diff --git a/debian/rules b/debian/rules
index c7f982c..2b55ac7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,17 @@ DEB_CMAKE_EXTRA_FLAGS      := -DWITH_SERVER=1 \
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 
+clean::
+	rm -fr tmp-icon stamp-icon
+
+pre-build:: stamp-icon
+
+stamp-icon:
+	rm -fr tmp-icon
+	mkdir -p tmp-icon
+	icns2png -x misc/Icon.icns -o tmp-icon
+	for dep in 16x16 32x32 128x128 256x256 512x512; do \
+		mkdir tmp-icon/$$dep; \
+		mv tmp-icon/Icon_$${dep}x32.png tmp-icon/$$dep/hedgewars.png; \
+	done
+	touch $@

-- 
Worms style game