mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

remove PatchedAWS flag

Browse source 
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..
This commit is contained in:
Joey Hess 2014-12-03 15:09:18 -04:00
parent caf72b1b8c
commit 41f0f3daa2
2 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
debian/rules vendored
View file

@ -8,10 +8,6 @@ export RELEASE_BUILD=1
%: %:
dh $@ 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. # Not intended for use by anyone except the author.
announcedir: announcedir:
@echo ${HOME}/src/git-annex/doc/news @echo ${HOME}/src/git-annex/doc/news

10
git-annex.cabal
View file

@ -34,10 +34,6 @@ Description:
Flag S3 Flag S3
Description: Enable S3 support Description: Enable S3 support
Flag PatchedAWS
Description: Building on system, like Debian, with old AWS patched to support git-annex
Default: False
Flag WebDAV Flag WebDAV
Description: Enable WebDAV support Description: Enable WebDAV support
@ -155,11 +151,7 @@ Executable git-annex
CPP-Options: -DWITH_CRYPTOHASH CPP-Options: -DWITH_CRYPTOHASH
if flag(S3) if flag(S3)
Build-Depends: conduit, resourcet, conduit-extra Build-Depends: conduit, resourcet, conduit-extra, aws (>= 0.9.2)
if flag(PatchedAWS)
Build-Depends: aws (>= 0.9.2)
else
Build-Depends: aws (>= 0.10.4)
CPP-Options: -DWITH_S3 CPP-Options: -DWITH_S3
if flag(WebDAV) if flag(WebDAV)