diff options
| -rw-r--r-- | BuildFlags.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/BuildFlags.hs b/BuildFlags.hs index dfebedb61..da7cd2251 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 1ed8e3785..e12c9a5fe 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. |