diff -Nru hedgewars-0.9.18/debian/changelog hedgewars-0.9.18/debian/changelog --- hedgewars-0.9.18/debian/changelog 2013-02-13 10:25:56.000000000 +0100 +++ hedgewars-0.9.18/debian/changelog 2013-02-13 10:24:21.000000000 +0100 @@ -1,3 +1,10 @@ +hedgewars (0.9.18-0.2) experimental; urgency=low + + * Added fix-ftbfs-with-ghc-7.6.patch to fix a FTBFS in raring + release, not needed in earlier releases + + -- Gianfranco Costamagna Wed, 13 Feb 2013 10:20:22 +0100 + hedgewars (0.9.18-0.1) experimental; urgency=low * New upstream version (Closes: #691986 LP: #1073730) diff -Nru hedgewars-0.9.18/debian/patches/fix-ftbfs-with-ghc-7.6.patch hedgewars-0.9.18/debian/patches/fix-ftbfs-with-ghc-7.6.patch --- hedgewars-0.9.18/debian/patches/fix-ftbfs-with-ghc-7.6.patch 1970-01-01 01:00:00.000000000 +0100 +++ hedgewars-0.9.18/debian/patches/fix-ftbfs-with-ghc-7.6.patch 2013-02-13 10:19:02.000000000 +0100 @@ -0,0 +1,18 @@ +The new haskell compiler (7.6) already defines "instance NFData B.ByteString", +so this will result in a double definition and a FTBFS. +This patch is intended only for raring+ releases (if haskell team doesn't push an update to fix this) + +Author: Gianfranco Costamagna +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 +@@ -83,7 +83,6 @@ instance NFData Action where + rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` () + rnf a = a `seq` () + +-instance NFData B.ByteString + instance NFData (Chan a) + + diff -Nru hedgewars-0.9.18/debian/patches/series hedgewars-0.9.18/debian/patches/series --- hedgewars-0.9.18/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ hedgewars-0.9.18/debian/patches/series 2013-02-13 10:14:16.000000000 +0100 @@ -0,0 +1 @@ +fix-ftbfs-with-ghc-7.6.patch