From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 10 Dec 2015 15:42:49 +0000 (-0400)
Subject: Add S3 features to git-annex version output.
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~320^2~233
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a0528db0920fecb3099997fca8f30d63dce27f09;p=git-annex.git

Add S3 features to git-annex version output.
---

diff --git a/BuildFlags.hs b/BuildFlags.hs
index dfebedb61f..da7cd22510 100644
--- a/BuildFlags.hs
+++ b/BuildFlags.hs
@@ -37,6 +37,12 @@ buildFlags = filter (not . null)
 #endif
 #ifdef WITH_S3
 	, "S3"
+#if MIN_VERSION_aws(0,10,6)
+		++ "(multipartupload)"
+#endif
+#if MIN_VERSION_aws(0,13,0)
+		++ "(storageclasses)"
+#endif
 #else
 #warning Building without S3.
 #endif
diff --git a/debian/changelog b/debian/changelog
index 1ed8e37852..e12c9a5fea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (5.20151209) UNRELEASED; urgency=medium
+
+  * Add S3 features to git-annex version output.
+
+ -- Joey Hess <id@joeyh.name>  Thu, 10 Dec 2015 11:39:34 -0400
+
 git-annex (5.20151208) unstable; urgency=medium
 
   * Build with -j1 again to get reproducible build.