[Pkg-haskell-commits] [package-plan] 01/01: Delete old patches

Joachim Breitner nomeata at moszumanska.debian.org
Fri May 15 17:53:00 UTC 2015


This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository package-plan.

commit db2c7c5c2488df4a944b1d98d63e3313e1239c88
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri May 15 19:52:48 2015 +0200

    Delete old patches
---
 patches/strict-concurrency/0.2.4.1/series          |  1 -
 .../strict-concurrency/0.2.4.1/use-new-exception   | 52 ----------------------
 2 files changed, 53 deletions(-)

diff --git a/patches/strict-concurrency/0.2.4.1/series b/patches/strict-concurrency/0.2.4.1/series
deleted file mode 100644
index ab65d7c..0000000
--- a/patches/strict-concurrency/0.2.4.1/series
+++ /dev/null
@@ -1 +0,0 @@
-use-new-exception
diff --git a/patches/strict-concurrency/0.2.4.1/use-new-exception b/patches/strict-concurrency/0.2.4.1/use-new-exception
deleted file mode 100644
index 9c950e6..0000000
--- a/patches/strict-concurrency/0.2.4.1/use-new-exception
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Compile with GHC 7.6 (don't use Control.OldException)
-Forwarded: yes (private email)
-Author: Iain Lane <laney at debian.org>
-
-Index: haskell-strict-concurrency-0.2.4.1/Control/Concurrent/MVar/Strict.hs
-===================================================================
---- haskell-strict-concurrency-0.2.4.1.orig/Control/Concurrent/MVar/Strict.hs	2010-08-12 00:01:17.000000000 +0000
-+++ haskell-strict-concurrency-0.2.4.1/Control/Concurrent/MVar/Strict.hs	2013-04-12 11:49:08.322626389 +0000
-@@ -43,9 +43,9 @@
- import GHC.IOBase
- 
- import Prelude
--import Control.OldException as Exception
- -- import Control.Parallel.Strategies
- import Control.DeepSeq
-+import Control.Exception
- 
- -- |Put a value into an 'MVar'.  If the 'MVar' is currently full,
- -- 'putMVar' will wait until it becomes empty.
-@@ -121,8 +121,8 @@
- withMVar :: NFData a => MVar a -> (a -> IO b) -> IO b
- withMVar m io = block $ do
-     a <- takeMVar m
--    b <- Exception.catch (unblock (io a))
--            (\e -> do putMVar m a; throw e)
-+    b <- catch (unblock (io a))
-+            (\ (e :: IOException) -> do putMVar m a; throw e)
-     putMVar m a
-     return b
- 
-@@ -135,8 +135,8 @@
- modifyMVar_ :: NFData a => MVar a -> (a -> IO a) -> IO ()
- modifyMVar_ m io = block $ do
-     a  <- takeMVar m
--    a' <- Exception.catch (unblock (io a))
--            (\e -> do putMVar m a; throw e)
-+    a' <- catch (unblock (io a))
-+            (\ (e :: IOException) -> do putMVar m a; throw e)
-     putMVar m a'
- 
- {-|
-@@ -147,8 +147,8 @@
- modifyMVar :: NFData a => MVar a -> (a -> IO (a,b)) -> IO b
- modifyMVar m io = block $ do
-     a      <- takeMVar m
--    (a',b) <- Exception.catch (unblock (io a))
--                (\e -> do putMVar m a; throw e)
-+    (a',b) <- catch (unblock (io a))
-+                (\ (e :: IOException) -> do putMVar m a; throw e)
-     putMVar m a'
-     return b
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git



More information about the Pkg-haskell-commits mailing list