The following commit has been merged in the master branch:
commit 64176f8a5e8cba116358710231711eb9bc3e8525
Author: Dmitry E. Oboukhov <[email protected]>
Date: Sun Oct 18 22:49:48 2009 +0400
new upstream version
diff --git a/debian/changelog b/debian/changelog
index 1e42a70..a5c25ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hedgewars (0.9.12-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Dmitry E. Oboukhov <[email protected]> Sun, 18 Oct 2009 22:39:07 +0400
+
hedgewars (0.9.11-5) unstable; urgency=low
* Icon for .desktop file has been installed, too, closes: #540235,
diff --git a/debian/control b/debian/control
index 4e45102..172bf4a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5), cmake,
fp-units-gfx,
ghc6, libghc6-stm-dev, libghc6-network-dev, libghc6-utf8-string-dev,
libghc6-time-dev, libghc6-dataenc-dev, libghc6-hslogger-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Homepage: http://hedgewars.org
VCS-Browser: http://git.debian.org/?p=collab-maint/hedgewars.git;a=summary
VCS-Git: git://git.debian.org/collab-maint/hedgewars.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 52df5ee..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-new_haskel_compiler.diff
diff --git a/debian/patches/new_haskel_compiler.diff
b/debian/patches/new_haskel_compiler.diff
deleted file mode 100644
index cf3c1f4..0000000
--- a/debian/patches/new_haskel_compiler.diff
+++ /dev/null
@@ -1,76 +0,0 @@
---- build/gameServer/ClientIO.hs 2009-05-24 19:47:04.000000000 +0400
-+++ build/gameServer/ClientIO.hs 2009-08-05 10:28:28.000000000 +0400
-@@ -1,7 +1,7 @@
--{-# LANGUAGE PatternSignatures #-}
-+{-# LANGUAGE ScopedTypeVariables #-}
- module ClientIO where
-
--import qualified Control.Exception
-+import qualified Control.OldException
- import Control.Concurrent.Chan
- import Control.Monad
- import System.IO
-@@ -29,15 +29,15 @@
- clientSendLoop :: Handle -> Chan CoreMessage -> Chan [String] -> Int -> IO()
- clientSendLoop handle coreChan chan clientID = do
- answer <- readChan chan
-- doClose <- Control.Exception.handle
-- (\(e :: Control.Exception.Exception) -> if isQuit answer then
return True else sendQuit e >> return False) $ do
-+ doClose <- Control.OldException.handle
-+ (\(e :: Control.OldException.Exception) -> if isQuit answer
then return True else sendQuit e >> return False) $ do
- forM_ answer (\str -> hPutStrLn handle str)
- hPutStrLn handle ""
- hFlush handle
- return $ isQuit answer
-
- if doClose then
-- Control.Exception.handle (\(_ :: Control.Exception.Exception)
-> putStrLn "error on hClose") $ hClose handle
-+ Control.OldException.handle (\(_ ::
Control.OldException.Exception) -> putStrLn "error on hClose") $ hClose handle
- else
- clientSendLoop handle coreChan chan clientID
-
---- build/gameServer/hedgewars-server.hs 2009-05-24 19:47:05.000000000
+0400
-+++ build/gameServer/hedgewars-server.hs 2009-08-05 10:28:46.000000000
+0400
-@@ -1,4 +1,4 @@
--{-# LANGUAGE CPP, ScopedTypeVariables, PatternSignatures #-}
-+{-# LANGUAGE CPP, ScopedTypeVariables #-}
-
- module Main where
-
---- build/gameServer/NetRoutines.hs 2009-05-24 19:47:04.000000000 +0400
-+++ build/gameServer/NetRoutines.hs 2009-08-05 10:28:17.000000000 +0400
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternSignatures #-}
-+{-# LANGUAGE ScopedTypeVariables #-}
- module NetRoutines where
-
- import Network
-@@ -7,7 +7,7 @@
- import Control.Concurrent
- import Control.Concurrent.Chan
- import Control.Concurrent.STM
--import Control.Exception
-+import Control.OldException
- import Data.Time
- -----------------------------
- import CoreTypes
-@@ -16,7 +16,7 @@
-
- acceptLoop :: Socket -> Chan CoreMessage -> Int -> IO ()
- acceptLoop servSock coreChan clientCounter = do
-- Control.Exception.handle
-+ Control.OldException.handle
- (\(_ :: Exception) -> putStrLn "exception on connect") $
- do
- (socket, sockAddr) <- Network.Socket.accept servSock
---- build/gameServer/OfficialServer/DBInteraction.hs 2009-05-24
19:47:04.000000000 +0400
-+++ build/gameServer/OfficialServer/DBInteraction.hs 2009-08-05
10:26:36.000000000 +0400
-@@ -12,7 +12,7 @@
- import Prelude hiding (catch);
- import System.IO
- import Control.Concurrent
--import Control.Exception
-+import Control.OldException
- import Monad
- import Maybe
- import System.Log.Logger
diff --git a/hedgewars-src-0.9.11.tar.bz2 b/hedgewars-src-0.9.12.tar.bz2
similarity index 79%
rename from hedgewars-src-0.9.11.tar.bz2
rename to hedgewars-src-0.9.12.tar.bz2
index 0299962..a558dff 100644
Binary files a/hedgewars-src-0.9.11.tar.bz2 and b/hedgewars-src-0.9.12.tar.bz2
differ
--
Worms style game
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
