[Pkg-haskell-commits] darcs: haskell-aws: Update build-depends
Joachim Breitner
mail at joachim-breitner.de
Mon Dec 22 13:29:12 UTC 2014
Mon Dec 22 10:29:21 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* Update build-depends
M ./control -1 +11
R ./patches/backport_IA_support
R ./patches/series
R ./patches/
Mon Dec 22 10:29:21 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* Update build-depends
diff -rN -u old-haskell-aws/control new-haskell-aws/control
--- old-haskell-aws/control 2014-12-22 13:29:12.881892882 +0000
+++ new-haskell-aws/control 2014-12-22 13:29:12.893892898 +0000
@@ -10,14 +10,20 @@
, ghc-prof
, libghc-aeson-dev (>= 0.6)
, libghc-aeson-prof
+ , libghc-attoparsec-dev (>= 0.11)
+ , libghc-attoparsec-dev (<< 0.13)
+ , libghc-attoparsec-prof
, libghc-base16-bytestring-dev (>= 0.1)
+ , libghc-base16-bytestring-dev (<< 0.2)
, libghc-base16-bytestring-prof
, libghc-base64-bytestring-dev (>= 1.0)
+ , libghc-base64-bytestring-dev (<< 1.1)
, libghc-base64-bytestring-prof
, libghc-blaze-builder-dev (>= 0.2.1.4)
, libghc-blaze-builder-dev (<< 0.4)
, libghc-blaze-builder-prof
, libghc-byteable-dev (>= 0.1)
+ , libghc-byteable-dev (<< 0.2)
, libghc-byteable-prof
, libghc-case-insensitive-dev (>= 0.2)
, libghc-case-insensitive-dev (<< 1.3)
@@ -26,7 +32,7 @@
, libghc-cereal-dev (<< 0.5)
, libghc-cereal-prof
, libghc-conduit-dev (>= 1.1)
- , libghc-conduit-dev (<< 1.2)
+ , libghc-conduit-dev (<< 1.3)
, libghc-conduit-prof
, libghc-conduit-extra-dev (>= 1.1)
, libghc-conduit-extra-dev (<< 1.2)
@@ -35,6 +41,8 @@
, libghc-cryptohash-dev (<< 0.12)
, libghc-cryptohash-prof
, libghc-data-default-dev (>= 0.5)
+ , libghc-data-default-dev (<< 0.6)
+ , libghc-data-default-prof
, libghc-http-conduit-dev (>= 2.1)
, libghc-http-conduit-dev (<< 2.2)
, libghc-http-conduit-prof
@@ -58,6 +66,7 @@
, libghc-unordered-containers-dev (>= 0.2)
, libghc-unordered-containers-prof
, libghc-utf8-string-dev (>= 0.3)
+ , libghc-utf8-string-dev (<< 0.4)
, libghc-utf8-string-prof
, libghc-vector-dev (>= 0.10)
, libghc-vector-prof
@@ -66,6 +75,7 @@
, libghc-xml-conduit-prof
Build-Depends-Indep: ghc-doc
, libghc-aeson-doc
+ , libghc-attoparsec-doc
, libghc-base64-bytestring-doc
, libghc-blaze-builder-doc
, libghc-byteable-doc
diff -rN -u old-haskell-aws/patches/backport_IA_support new-haskell-aws/patches/backport_IA_support
--- old-haskell-aws/patches/backport_IA_support 2014-12-22 13:29:12.881892882 +0000
+++ new-haskell-aws/patches/backport_IA_support 1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-Description: backport IA support from 0.10
- This patch can be dropped once upgrading to 0.10 or newer.
-Author: Joey Hess <joeyh at debian.org>
-
---- haskell-aws-0.9.2.orig/Aws/S3/Commands/PutObject.hs
-+++ haskell-aws-0.9.2/Aws/S3/Commands/PutObject.hs
-@@ -33,7 +33,8 @@ data PutObject = PutObject {
- #else
- poRequestBody :: HTTP.RequestBody (C.ResourceT IO),
- #endif
-- poMetadata :: [(T.Text,T.Text)]
-+ poMetadata :: [(T.Text,T.Text)],
-+ poAutoMakeBucket :: Bool -- ^ Internet Archive S3 nonstandard extension
- }
-
- #if MIN_VERSION_http_conduit(2, 0, 0)
-@@ -41,7 +42,7 @@ putObject :: Bucket -> T.Text -> HTTP.Re
- #else
- putObject :: Bucket -> T.Text -> HTTP.RequestBody (C.ResourceT IO) -> PutObject
- #endif
--putObject bucket obj body = PutObject obj bucket Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing body []
-+putObject bucket obj body = PutObject obj bucket Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing body [] False
-
- data PutObjectResponse
- = PutObjectResponse {
-@@ -64,6 +65,7 @@ instance SignQuery PutObject where
- , ("x-amz-storage-class",) <$> writeStorageClass <$> poStorageClass
- , ("x-amz-website-redirect-location",) <$> poWebsiteRedirectLocation
- , ("x-amz-server-side-encryption",) <$> writeServerSideEncryption <$> poServerSideEncryption
-+ , if poAutoMakeBucket then Just ("x-amz-auto-make-bucket", "1") else Nothing
- ] ++ map( \x -> (CI.mk . T.encodeUtf8 $ T.concat ["x-amz-meta-", fst x], snd x)) poMetadata
- , s3QOtherHeaders = map (second T.encodeUtf8) $ catMaybes [
- ("Expires",) . T.pack . show <$> poExpires
diff -rN -u old-haskell-aws/patches/series new-haskell-aws/patches/series
--- old-haskell-aws/patches/series 2014-12-22 13:29:12.881892882 +0000
+++ new-haskell-aws/patches/series 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-backport_IA_support
More information about the Pkg-haskell-commits
mailing list