[Pkg-haskell-commits] darcs: haskell-pastis: Patch to build with newer exceptions.

[Clint Adams]

Sat Nov 10 16:53:07 UTC 2012  Clint Adams <clint at debian.org>
  * Patch to build with newer exceptions.
  Ignore-this: 58723ecba791895683a67529763a6271

    M ./changelog -3 +7
    A ./patches/
    A ./patches/new-exceptions.diff
    A ./patches/series

Sat Nov 10 16:53:07 UTC 2012  Clint Adams <clint at debian.org>
  * Patch to build with newer exceptions.
  Ignore-this: 58723ecba791895683a67529763a6271
diff -rN -u old-haskell-pastis//changelog new-haskell-pastis//changelog
--- old-haskell-pastis//changelog	2012-11-10 16:53:56.790217865 +0000
+++ new-haskell-pastis//changelog	2012-11-10 16:53:56.794734375 +0000
@@ -1,10 +1,14 @@
-haskell-pastis (0.1.2-3) UNRELEASED; urgency=low
+haskell-pastis (0.1.2-3) experimental; urgency=low
 
-  * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
+  [ Joachim Breitner ]
+  * Depend on haskell-devscripts 0.8.13 to ensure this package is built
     against experimental
   * Bump standards version, no change
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 13 Oct 2012 14:11:55 +0200
+  [ Clint Adams ]
+  * Patch to build with newer exceptions.
+
+ -- Clint Adams <clint at debian.org>  Sat, 10 Nov 2012 16:48:58 +0000
 
 haskell-pastis (0.1.2-2) unstable; urgency=low
 
diff -rN -u old-haskell-pastis//patches/new-exceptions.diff new-haskell-pastis//patches/new-exceptions.diff
--- old-haskell-pastis//patches/new-exceptions.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-pastis//patches/new-exceptions.diff	2012-11-10 16:53:56.798526162 +0000
@@ -0,0 +1,27 @@
+Index: haskell-pastis-0.1.2/Network/Pastis.hs
+===================================================================
+--- haskell-pastis-0.1.2.orig/Network/Pastis.hs	2012-11-10 16:46:28.384282442 +0000
++++ haskell-pastis-0.1.2/Network/Pastis.hs	2012-11-10 16:47:06.364275833 +0000
+@@ -1,11 +1,14 @@
++{-# LANGUAGE ScopedTypeVariables #-}
++
+ module Network.Pastis (pastisURL) where
+ 
++import Control.Exception.Base (catch, IOException)
+ import Network.HTTP
+ import Network.URI
+ 
+ -- | Use pastisURL to shorten a URL. If an error occurs, the function returns 'url'.
+ pastisURL :: String -> IO String
+-pastisURL url = fmap (either (const url) rspBody) (simpleHTTP request) `catch` (return . const url)
++pastisURL url = fmap (either (const url) rspBody) (simpleHTTP request) `catch` (\(_ :: IOException) -> return url)
+   where request = Request { rqURI = uri
+                           , rqMethod = GET
+                           , rqHeaders = []
+@@ -14,4 +17,4 @@
+                   , uriAuthority = Just $ URIAuth { uriUserInfo = "", uriRegName = "past.is", uriPort = "" }
+                   , uriPath = "/api/"
+                   , uriQuery = "?format=simple&url=" ++ escapeURIString isUnreserved url
+-                  , uriFragment = "" }
+\ No newline at end of file
++                  , uriFragment = "" }
diff -rN -u old-haskell-pastis//patches/series new-haskell-pastis//patches/series
--- old-haskell-pastis//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-pastis//patches/series	2012-11-10 16:53:56.798526162 +0000
@@ -0,0 +1 @@
+new-exceptions.diff