[DHG_packages] 02/03: conduit-extra: Upgrading from 1.1.13.1 to 1.1.13.2

[Clint Adams]

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

clint pushed a commit to branch master
in repository DHG_packages.

commit 533335f26902598a194875b0e1092645312ac88d
Author: Clint Adams <clint at debian.org>
Date:   Tue Jul 12 16:34:56 2016 -0400

    conduit-extra: Upgrading from 1.1.13.1 to 1.1.13.2
---
 p/haskell-conduit-extra/debian/changelog           |  6 ++
 .../debian/patches/fix-alignment                   | 79 ----------------------
 .../debian/patches/no-bytestring-builder           |  6 +-
 p/haskell-conduit-extra/debian/patches/series      |  1 -
 4 files changed, 8 insertions(+), 84 deletions(-)

diff --git a/p/haskell-conduit-extra/debian/changelog b/p/haskell-conduit-extra/debian/changelog
index 0ade48c..f9a51ea 100644
--- a/p/haskell-conduit-extra/debian/changelog
+++ b/p/haskell-conduit-extra/debian/changelog
@@ -1,3 +1,9 @@
+haskell-conduit-extra (1.1.13.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint at debian.org>  Tue, 12 Jul 2016 16:34:56 -0400
+
 haskell-conduit-extra (1.1.13.1-2) unstable; urgency=medium
 
   * Update d/copyright file
diff --git a/p/haskell-conduit-extra/debian/patches/fix-alignment b/p/haskell-conduit-extra/debian/patches/fix-alignment
deleted file mode 100644
index 41892b7..0000000
--- a/p/haskell-conduit-extra/debian/patches/fix-alignment
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Fix alignment restrictions
- Ensure that alignment constraints are fulfilled in all architectures.
- This makes the code portable and fixes a FTBFS for the armhf architecture.
-Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
-Forwarded: https://github.com/snoyberg/conduit/pull/269
-Index: b/Data/Conduit/Binary.hs
-===================================================================
---- a/Data/Conduit/Binary.hs
-+++ b/Data/Conduit/Binary.hs
-@@ -76,6 +76,8 @@ import Control.Monad.Trans.Resource (Mon
- import Control.Monad.Catch (MonadThrow (..))
- import Control.Exception (Exception)
- import Data.Typeable (Typeable)
-+import Foreign.Marshal (alloca, copyBytes)
-+import Foreign.Ptr (Ptr)
- 
- -- | Stream the contents of a file as binary data.
- --
-@@ -501,7 +503,10 @@ sinkStorableHelper wrap failure = do
- 
-     -- Given a bytestring of exactly the correct size, grab the value
-     process bs = return $! wrap $! inlinePerformIO $!
--        unsafeUseAsCString bs (peek . castPtr)
-+        unsafeUseAsCString bs (safePeek undefined . castPtr)
-+
-+    safePeek :: a -> Ptr a -> IO a
-+    safePeek val ptr = alloca (\t -> copyBytes t ptr (sizeOf val) >> peek t)
- {-# INLINE sinkStorableHelper #-}
- 
- data SinkStorableException = SinkStorableInsufficientBytes
-Index: b/test/Data/Conduit/BinarySpec.hs
-===================================================================
---- a/test/Data/Conduit/BinarySpec.hs
-+++ b/test/Data/Conduit/BinarySpec.hs
-@@ -20,9 +20,11 @@ import Data.Functor.Identity
- import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
- import Test.QuickCheck.Gen (Gen, oneof)
- import Data.Word (Word8)
--import Foreign.Storable (Storable, sizeOf, pokeByteOff)
-+import Foreign.Storable (Storable, sizeOf, pokeByteOff, alignment)
- import Data.Typeable (Typeable)
--import Data.ByteString.Internal (unsafeCreate)
-+import Data.ByteString.Internal (createAndTrim')
-+import Foreign.Ptr (alignPtr, minusPtr)
-+import System.IO.Unsafe (unsafePerformIO)
- import Control.Applicative ((<$>), (<*>))
- 
- spec :: Spec
-@@ -277,19 +279,19 @@ withSomeStorable :: SomeStorable
-                  -> b
- withSomeStorable (SomeStorable x) f = f x
- 
--someStorables :: [SomeStorable] -> S.ByteString
--someStorables stores0 =
--    unsafeCreate size start
-+someStorable :: SomeStorable -> S.ByteString
-+someStorable store =
-+    fst $ unsafePerformIO $ createAndTrim' (size + align) start
-   where
--    size = sum $ map (\x -> withSomeStorable x sizeOf) stores0
-+    size = withSomeStorable store sizeOf
-+    align = withSomeStorable store alignment
-+    start ptr = do
-+        let off = minusPtr ptr (alignPtr ptr align)
-+        withSomeStorable store (pokeByteOff ptr off)
-+        return (off, size, ())
- 
--    start ptr =
--        go stores0 0
--      where
--        go [] _ = return ()
--        go (x:rest) off = do
--            withSomeStorable x (pokeByteOff ptr off)
--            go rest (off + withSomeStorable x sizeOf)
-+someStorables :: [SomeStorable] -> S.ByteString
-+someStorables = S.concat . map someStorable
- 
- it' :: String -> IO () -> Spec
- it' = it
diff --git a/p/haskell-conduit-extra/debian/patches/no-bytestring-builder b/p/haskell-conduit-extra/debian/patches/no-bytestring-builder
index 836e452..a92964e 100644
--- a/p/haskell-conduit-extra/debian/patches/no-bytestring-builder
+++ b/p/haskell-conduit-extra/debian/patches/no-bytestring-builder
@@ -2,11 +2,9 @@ Description: Remove bytestring-builder from Build-depends
  This package is a no-op for Debian (and so, we do not ship it).
 Author: Joachim Breitner <nomeata at debian.org>
 Forwarded: not-needed, debian specific
-Index: b/conduit-extra.cabal
-===================================================================
 --- a/conduit-extra.cabal
 +++ b/conduit-extra.cabal
-@@ -73,8 +73,7 @@ test-suite test
+@@ -77,8 +77,7 @@
                     , async
                     , attoparsec
                     , blaze-builder
@@ -16,7 +14,7 @@ Index: b/conduit-extra.cabal
                     , exceptions
                     , process
                     , resourcet
-@@ -107,7 +106,6 @@ benchmark blaze
+@@ -111,7 +110,6 @@
                    , conduit-extra
                    , criterion
                    , bytestring
diff --git a/p/haskell-conduit-extra/debian/patches/series b/p/haskell-conduit-extra/debian/patches/series
index 56a120c..d61cbb2 100644
--- a/p/haskell-conduit-extra/debian/patches/series
+++ b/p/haskell-conduit-extra/debian/patches/series
@@ -1,2 +1 @@
 no-bytestring-builder
-fix-alignment

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