haskell-aws: Update build-depends

3 files changed, 11 insertions, 35 deletions

diff --git a/p/haskell-aws/debian/control b/p/haskell-aws/debian/control
index a15d83e9b..0934535df 100644
--- a/p/haskell-aws/debian/control
+++ b/p/haskell-aws/debian/control
@@ -10,14 +10,20 @@ Build-Depends: debhelper (>= 9)
   , 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 @@ Build-Depends: debhelper (>= 9)
   , 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 @@ Build-Depends: debhelper (>= 9)
   , 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 @@ Build-Depends: debhelper (>= 9)
   , 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 @@ Build-Depends: debhelper (>= 9)
   , 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 --git a/p/haskell-aws/debian/patches/backport_IA_support b/p/haskell-aws/debian/patches/backport_IA_support
deleted file mode 100644
index a6b35ca1f..000000000
--- a/p/haskell-aws/debian/patches/backport_IA_support
+++ /dev/null
@@ -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@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 --git a/p/haskell-aws/debian/patches/series b/p/haskell-aws/debian/patches/series
deleted file mode 100644
index c36e7a090..000000000
--- a/p/haskell-aws/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-backport_IA_support