[SCM] Worms style game branch, master, updated. debian/0.9.18-0.3-8-g5d29a54

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit ff4683fc46f0f4568c1bde5159c2710426ccdc49
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Feb 21 17:58:17 2013 +0100

    Fixed a FTBFS with haskell 7.6

diff --git a/debian/changelog b/debian/changelog
index f27c06c..3703bbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hedgewars (0.9.18-0.2) experimental; urgency=low
+
+  * Non-maintainer upload
+  * Added patch from upstream to fix a FTBFS with haskell 7.6
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 21 Feb 2013 17:26:19 +0100
+
 hedgewars (0.9.18-0.1) experimental; urgency=low
 
   * Non-maintainer upload
diff --git a/debian/patches/fix-ftbfs-with-ghc-7.6.patch b/debian/patches/fix-ftbfs-with-ghc-7.6.patch
new file mode 100644
index 0000000..0df9d43
--- /dev/null
+++ b/debian/patches/fix-ftbfs-with-ghc-7.6.patch
@@ -0,0 +1,23 @@
+The new haskell compiler (7.6) already defines "instance NFData B.ByteString",
+so this will result in a double definition and a FTBFS.
+Patch taken from upstream commit
+https://code.google.com/p/hedgewars/source/detail?r=0a39b2f9c7489e4b6376b1cadc9596e5a97aff55
+Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Bug-Debian: http://bugs.debian.org/691986
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1073730
+
+--- hedgewars-0.9.18.orig/gameServer/Actions.hs
++++ hedgewars-0.9.18/gameServer/Actions.hs
+@@ -82,8 +82,10 @@ type CmdHandler = [B.ByteString] -> Read
+ instance NFData Action where
+     rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` ()
+     rnf a = a `seq` ()
+-
++#if __GLASGOW_HASKELL__ < 706
+ instance NFData B.ByteString
++#endif
++
+ instance NFData (Chan a)
+
+
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f8badf9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-ftbfs-with-ghc-7.6.patch

-- 
Worms style game