Merge branch 's3-aws'
This commit is contained in:
commit
911ba8d972
12 changed files with 493 additions and 225 deletions
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -12,6 +12,12 @@ git-annex (5.20141126) UNRELEASED; urgency=medium
|
|||
that left a typechange staged in index due to some infelicity of git's
|
||||
handling of partial commits.
|
||||
* Work around behavior change in lsof 4.88's -F output format.
|
||||
* S3: Switched to using the haskell aws library.
|
||||
* S3: No longer buffers entire files in memory when uploading without
|
||||
chunking.
|
||||
* S3: When built with a new enough version of the haskell aws library,
|
||||
supports doing multipart uploads, in order to store extremely large
|
||||
files in S3 when not using chunking.
|
||||
* Don't show "(gpg)" when decrypting the remote encryption cipher,
|
||||
since this could be taken to read that's the only time git-annex
|
||||
runs gpg, which is not the case.
|
||||
|
|
4
debian/control
vendored
4
debian/control
vendored
|
@ -14,7 +14,9 @@ Build-Depends:
|
|||
libghc-cryptohash-dev,
|
||||
libghc-dataenc-dev,
|
||||
libghc-utf8-string-dev,
|
||||
libghc-hs3-dev (>= 0.5.6),
|
||||
libghc-aws-dev (>= 0.9.2),
|
||||
libghc-conduit-dev,
|
||||
libghc-resourcet-dev,
|
||||
libghc-dav-dev (>= 1.0) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc],
|
||||
libghc-quickcheck2-dev,
|
||||
libghc-monad-control-dev (>= 0.3),
|
||||
|
|
4
debian/rules
vendored
4
debian/rules
vendored
|
@ -8,6 +8,10 @@ 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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue