[Pkg-haskell-commits] darcs: haskell-aws: releasing package haskell-aws version 0.9.2-2

[joeyh at debian.org]

Thu Oct 23 20:38:28 UTC 2014  joeyh at debian.org
  * releasing package haskell-aws version 0.9.2-2

    M ./changelog +9
    A ./patches/
    A ./patches/backport_IA_support
    A ./patches/series

Thu Oct 23 20:38:28 UTC 2014  joeyh at debian.org
  * releasing package haskell-aws version 0.9.2-2
diff -rN -u old-haskell-aws/changelog new-haskell-aws/changelog
--- old-haskell-aws/changelog	2014-10-23 20:38:53.595685533 +0000
+++ new-haskell-aws/changelog	2014-10-23 20:38:53.599685517 +0000
@@ -1,3 +1,12 @@
+haskell-aws (0.9.2-2) unstable; urgency=medium
+
+  * Cherry-picked support for poAutoMakeBucket from upstream version
+    0.10. That is needed for git-annex to continue to support the Internet
+    Archive, and the new upstream release needs too new a version of
+    scientific to be packaged yet.
+
+ -- Joey Hess <joeyh at debian.org>  Thu, 23 Oct 2014 14:26:24 -0400
+
 haskell-aws (0.9.2-1) unstable; urgency=low
 
   * Initial release.
diff -rN -u old-haskell-aws/patches/backport_IA_support new-haskell-aws/patches/backport_IA_support
--- old-haskell-aws/patches/backport_IA_support	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-aws/patches/backport_IA_support	2014-10-23 20:38:53.599685517 +0000
@@ -0,0 +1,33 @@
+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	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-aws/patches/series	2014-10-23 20:38:53.599685517 +0000
@@ -0,0 +1 @@
+backport_IA_support