diff -Nru hedgewars-0.9.17/debian/changelog hedgewars-0.9.17/debian/changelog --- hedgewars-0.9.17/debian/changelog 2011-11-20 06:39:12.000000000 -0800 +++ hedgewars-0.9.17/debian/changelog 2011-11-22 04:49:51.000000000 -0800 @@ -1,3 +1,16 @@ +hedgewars (0.9.17-1~natty0.1) natty-proposed; urgency=low + + * Backport 0.9.17-1 to Natty to fix network play (LP: #852603): + - debian/patches/dont-use-text-bytestring-show.patch: Replace showB + server function with one that doesn't require + libghc-bytestring-show-dev, which wasn't available in Natty. + - Drop libghc-bytestring-show-dev build-dependency. + - Add 6's to get libghc6-deepseq-dev, libghc6-utf8-string-dev + build-dependencies + - Change libghc6-network-dev build-dependency to libghc6-network-bytestring-dev + + -- Evan Broder Tue, 22 Nov 2011 04:49:51 -0800 + hedgewars (0.9.17-1) unstable; urgency=low * [Paul Wise] diff -Nru hedgewars-0.9.17/debian/control hedgewars-0.9.17/debian/control --- hedgewars-0.9.17/debian/control 2011-11-20 06:25:05.000000000 -0800 +++ hedgewars-0.9.17/debian/control 2011-11-22 03:44:00.000000000 -0800 @@ -1,7 +1,8 @@ Source: hedgewars Section: games Priority: extra -Maintainer: Dmitry E. Oboukhov +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Dmitry E. Oboukhov Uploaders: Debian Games Team Build-Depends: debhelper (>= 7), cmake, cdbs, libqt4-dev (>= 4.2), @@ -15,14 +16,13 @@ fp-units-gfx, ghc6, libghc6-stm-dev, - libghc6-network-dev, + libghc6-network-bytestring-dev, libghc6-dataenc-dev, libghc6-hslogger-dev, - libghc-utf8-string-dev, + libghc6-utf8-string-dev, liblua5.1-dev, imagemagick, - libghc-bytestring-show-dev, - libghc-deepseq-dev + libghc6-deepseq-dev Standards-Version: 3.9.2 Homepage: http://hedgewars.org VCS-Browser: http://git.debian.org/?p=collab-maint/hedgewars.git;a=summary diff -Nru hedgewars-0.9.17/debian/patches/dont-use-text-bytestring-show.patch hedgewars-0.9.17/debian/patches/dont-use-text-bytestring-show.patch --- hedgewars-0.9.17/debian/patches/dont-use-text-bytestring-show.patch 1969-12-31 16:00:00.000000000 -0800 +++ hedgewars-0.9.17/debian/patches/dont-use-text-bytestring-show.patch 2011-11-22 04:48:52.000000000 -0800 @@ -0,0 +1,34 @@ +Description: Don't use Text.ByteString.Show in the server + The showB function in Utils.hs is intended to render an arbitrary + value to a strict ByteString, but it used Text.Show.ByteString, which + wasn't available before Ubuntu 11.10 (Oneiric). + . + This patch replaces the implementation of showB with one which does + not require Text.Show.ByteString and instead relies on instances of + the Show class being a superset of the instances of the + Text.Show.ByteString.Show class. +Forwarded: not-needed +Author: Evan Broder +Last-Update: 2011-11-22 + +--- hedgewars-0.9.17.orig/gameServer/Utils.hs ++++ hedgewars-0.9.17/gameServer/Utils.hs +@@ -13,7 +13,6 @@ import qualified Data.List as List + import Control.Monad + import qualified Codec.Binary.Base64 as Base64 + import qualified Data.ByteString.Lazy as BL +-import qualified Text.Show.ByteString as BS + import qualified Data.ByteString.Char8 as B + import qualified Data.ByteString.UTF8 as UTF8 + import qualified Data.ByteString as BW +@@ -105,8 +104,8 @@ unfoldrE f b = + Right (a, new_b) -> let (a', b') = unfoldrE f new_b in (a : a', b') + Left new_b -> ([], new_b) + +-showB :: (BS.Show a) => a -> B.ByteString +-showB = B.concat . BL.toChunks . BS.show ++showB :: (Show a) => a -> B.ByteString ++showB = read . show + + readInt_ :: (Num a) => B.ByteString -> a + readInt_ str = diff -Nru hedgewars-0.9.17/debian/patches/series hedgewars-0.9.17/debian/patches/series --- hedgewars-0.9.17/debian/patches/series 1969-12-31 16:00:00.000000000 -0800 +++ hedgewars-0.9.17/debian/patches/series 2011-11-22 04:43:30.000000000 -0800 @@ -0,0 +1 @@ +dont-use-text-bytestring-show.patch