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

add cabal flag for use with debian's older version of aws, which is now patched with the necessary stuff

Browse source
This commit is contained in:
Joey Hess 2014-10-23 16:39:55 -04:00
parent 171e677a3c
commit c986bc67e5
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/control vendored
View file

@ -14,7 +14,7 @@ Build-Depends:
libghc-cryptohash-dev, libghc-cryptohash-dev,
libghc-dataenc-dev, libghc-dataenc-dev,
libghc-utf8-string-dev, libghc-utf8-string-dev,
libghc-aws-dev (>= 0.10.2), libghc-aws-dev (>= 0.9.2),
libghc-conduit-dev, libghc-conduit-dev,
libghc-resourcet-dev, libghc-resourcet-dev,
libghc-dav-dev (>= 1.0) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc], libghc-dav-dev (>= 1.0) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc],

4
debian/rules vendored
View file

@ -8,6 +8,10 @@ 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,6 +34,10 @@ 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
@ -151,7 +155,11 @@ Executable git-annex
CPP-Options: -DWITH_CRYPTOHASH CPP-Options: -DWITH_CRYPTOHASH
if flag(S3) if flag(S3)
Build-Depends: aws (>= 0.10.2), conduit, resourcet Build-Depends: conduit, resourcet
if flag(PatchedAWS)
Build-Depends: aws (>= 0.9.2)
else
Build-Depends: aws (>= 0.10.2)
CPP-Options: -DWITH_S3 CPP-Options: -DWITH_S3
if flag(WebDAV) if flag(WebDAV)