summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/control4
2 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 0d884cd81..e227dfc11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,11 +16,15 @@ git-annex (5.20140718) UNRELEASED; urgency=medium
were incompletely repaired before.
* Fix cost calculation for non-encrypted remotes.
* Display exception message when a transfer fails due to an exception.
- * WebDAV: Sped up by avoiding making multiple http connections
+ * WebDAV, S3: Sped up by avoiding making multiple http connections
when storing a file.
- * WebDAV: Avoid buffering whole file in memory when uploading and
+ * WebDAV, S3: Avoid buffering whole file in memory when uploading and
downloading.
* WebDAV: Dropped support for DAV before 1.0.
+ * S3: Switched to using the haskell aws library.
+ * S3: Now supports https. To enable this, configure a S3 special remote to
+ use port=443. However, with encrypted special remotes, this does not
+ add any security.
* testremote: New command to test uploads/downloads to a remote.
* Dropping an object from a bup special remote now deletes the git branch
for the object, although of course the object's content cannot be deleted
diff --git a/debian/control b/debian/control
index 1106bc89d..89141a7e3 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,9 @@ Build-Depends:
libghc-cryptohash-dev,
libghc-dataenc-dev,
libghc-utf8-string-dev,
- libghc-hs3-dev (>= 0.5.6),
+ libghc-aws-dev,
+ 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),