[Pkg-haskell-commits] darcs: haskell-conduit: New upstream version.

[Colin Watson]

Mon May 27 17:21:34 UTC 2013  Colin Watson <cjwatson at debian.org>
  * New upstream version.
  Ignore-this: 25a8d1eaf2c4cf6cd17a25bb496ff368

    M ./changelog +6
    R ./patches/avoid-variadic-open.patch
    R ./patches/series

Mon May 27 17:21:34 UTC 2013  Colin Watson <cjwatson at debian.org>
  * New upstream version.
  Ignore-this: 25a8d1eaf2c4cf6cd17a25bb496ff368
diff -rN -u old-haskell-conduit//changelog new-haskell-conduit//changelog
--- old-haskell-conduit//changelog	2013-05-27 17:21:53.639124341 +0000
+++ new-haskell-conduit//changelog	2013-05-27 17:21:53.643244584 +0000
@@ -1,3 +1,9 @@
+haskell-conduit (1.0.5.1-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Colin Watson <cjwatson at debian.org>  Mon, 27 May 2013 18:20:56 +0100
+
 haskell-conduit (1.0.5-2) unstable; urgency=low
 
   * Avoid relying on variadic declaration of C open, fixing build failure on
diff -rN -u old-haskell-conduit//patches/avoid-variadic-open.patch new-haskell-conduit//patches/avoid-variadic-open.patch
--- old-haskell-conduit//patches/avoid-variadic-open.patch	2013-05-27 17:21:53.639124341 +0000
+++ new-haskell-conduit//patches/avoid-variadic-open.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-Description: Avoid variadic open
- GHC's LLVM backend doesn't properly handle multiple foreign imports of the
- same C function with different argument counts; only a declaration for the
- last one is emitted, and thus openRead fails to compile with "error: not
- enough parameters specified for call".  Since the mode argument is ignored
- if O_CREAT is not in the flags, it is safe to just pass it anyway.
-Author: Colin Watson <cjwatson at ubuntu.com>
-Forwarded: https://github.com/snoyberg/conduit/pull/99
-Last-Update: 2013-05-27
-
-Index: b/System/PosixFile.hsc
-===================================================================
---- a/System/PosixFile.hsc
-+++ b/System/PosixFile.hsc
-@@ -36,10 +36,7 @@
-     }
- 
- foreign import ccall "open"
--    c_open :: CString -> Flag -> IO CInt
--
--foreign import ccall "open"
--    c_open_mode :: CString -> Flag -> CInt -> IO CInt
-+    c_open :: CString -> Flag -> CInt -> IO CInt
- 
- foreign import ccall "read"
-     c_read :: FD -> Ptr Word8 -> CInt -> IO CInt
-@@ -54,14 +51,14 @@
- 
- openRead :: FilePath -> IO FD
- openRead fp = do
--    h <- withCString fp $ \str -> c_open str oRdonly
-+    h <- withCString fp $ \str -> c_open str oRdonly 438 -- == octal 666
-     if h < 0
-         then throwErrno $ "Could not open file: " ++ fp
-         else return $ FD h
- 
- openWrite :: FilePath -> IO FD
- openWrite fp = do
--    h <- withCString fp $ \str -> c_open_mode str (oWronly .|. oCreat) 438 -- == octal 666
-+    h <- withCString fp $ \str -> c_open str (oWronly .|. oCreat) 438 -- == octal 666
-     if h < 0
-         then throwErrno $ "Could not open file: " ++ fp
-         else return $ FD h
diff -rN -u old-haskell-conduit//patches/series new-haskell-conduit//patches/series
--- old-haskell-conduit//patches/series	2013-05-27 17:21:53.639124341 +0000
+++ new-haskell-conduit//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-avoid-variadic-open.patch