haskell-strict-concurrency: Add debian/patches/use-new-exception to use Control.Exception instead of Control.OldException, resolving a build failure with GHC 7.6.

3 files changed, 58 insertions, 1 deletions

diff --git a/p/haskell-strict-concurrency/debian/changelog b/p/haskell-strict-concurrency/debian/changelog
index 692c5e48d..a5b17c3f3 100644
--- a/p/haskell-strict-concurrency/debian/changelog
+++ b/p/haskell-strict-concurrency/debian/changelog
@@ -1,10 +1,15 @@
 haskell-strict-concurrency (0.2.4.1-3) UNRELEASED; urgency=low
 
+  [ Joachim Breitner ]
   * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
     against experimental
   * Bump standards version, no change
 
- -- Joachim Breitner <nomeata@debian.org>  Sat, 13 Oct 2012 14:13:11 +0200
+  [ Iain Lane ]
+  * Add debian/patches/use-new-exception to use Control.Exception instead of
+    Control.OldException, resolving a build failure with GHC 7.6.
+
+ -- Iain Lane <laney@debian.org>  Fri, 12 Apr 2013 13:00:52 +0100
 
 haskell-strict-concurrency (0.2.4.1-2) unstable; urgency=low
 
diff --git a/p/haskell-strict-concurrency/debian/patches/series b/p/haskell-strict-concurrency/debian/patches/series
new file mode 100644
index 000000000..ab65d7c17
--- /dev/null
+++ b/p/haskell-strict-concurrency/debian/patches/series
@@ -0,0 +1 @@
+use-new-exception
diff --git a/p/haskell-strict-concurrency/debian/patches/use-new-exception b/p/haskell-strict-concurrency/debian/patches/use-new-exception
new file mode 100644
index 000000000..6d1bd74c9
--- /dev/null
+++ b/p/haskell-strict-concurrency/debian/patches/use-new-exception
@@ -0,0 +1,51 @@
+Description: Compile with GHC 7.6 (don't use Control.OldException)
+Forwarded: yes (private email)
+Author: Iain Lane <laney@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