From 41f0f3daa25fcaeb0af5e8cf4dd67b26287fa503 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 3 Dec 2014 15:09:18 -0400 Subject: [PATCH] remove PatchedAWS flag Now that deps are sorted out in hackage, cabal is unlikely to try to install a too old AWS, so I don't think this flag is worth the bother of being completely correct with the dependency versioning. This avoids me needing to enable to flag on the autobuilders.. --- debian/rules | 4 ---- git-annex.cabal | 10 +--------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/debian/rules b/debian/rules index 22be481952..7c8f8a560d 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,6 @@ export RELEASE_BUILD=1 %: dh $@ -# Debian currently has a patched aws 0.9.2, rather than the newer 0.10.2. -override_dh_auto_configure: - debian/cabal-wrapper configure -fPatchedAWS - # Not intended for use by anyone except the author. announcedir: @echo ${HOME}/src/git-annex/doc/news diff --git a/git-annex.cabal b/git-annex.cabal index cc5b6c884f..4433faee95 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -34,10 +34,6 @@ Description: Flag S3 Description: Enable S3 support -Flag PatchedAWS - Description: Building on system, like Debian, with old AWS patched to support git-annex - Default: False - Flag WebDAV Description: Enable WebDAV support @@ -155,11 +151,7 @@ Executable git-annex CPP-Options: -DWITH_CRYPTOHASH if flag(S3) - Build-Depends: conduit, resourcet, conduit-extra - if flag(PatchedAWS) - Build-Depends: aws (>= 0.9.2) - else - Build-Depends: aws (>= 0.10.4) + Build-Depends: conduit, resourcet, conduit-extra, aws (>= 0.9.2) CPP-Options: -DWITH_S3 if flag(WebDAV)