summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/control1
-rw-r--r--doc/devblog/day_344-345__smudging_along.mdwn7
3 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 7e3b1514e..57c69a1e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ git-annex (5.20151209) UNRELEASED; urgency=medium
* webdav: When testing the WebDAV server, send a file with content.
The empty file it was sending tickled bugs in some php WebDAV server.
* fsck: Failed to honor annex.diskreserve when checking a remote.
+ * Debian: Build depend on concurrent-output.
-- Joey Hess <id@joeyh.name> Thu, 10 Dec 2015 11:39:34 -0400
diff --git a/debian/control b/debian/control
index 17b0a560f..ff065d380 100644
--- a/debian/control
+++ b/debian/control
@@ -71,6 +71,7 @@ Build-Depends:
libghc-tasty-rerun-dev,
libghc-optparse-applicative-dev (>= 0.11.0),
libghc-torrent-dev,
+ libghc-concurrent-output-dev,
lsof [linux-any],
ikiwiki,
perlmagick,
diff --git a/doc/devblog/day_344-345__smudging_along.mdwn b/doc/devblog/day_344-345__smudging_along.mdwn
new file mode 100644
index 000000000..7b7e6f042
--- /dev/null
+++ b/doc/devblog/day_344-345__smudging_along.mdwn
@@ -0,0 +1,7 @@
+New special remote alert! Chris Kastorff has made
+[a special remote supporting Backblaze's B2 storage servie](https://github.com/encryptio/git-annex-remote-b2).
+
+And I'm still working on v6 unlocked files. After beating on it for 2 more
+days, all git-annex commands should support them. There is still plenty
+of work to do on testing, upgrading, optimisation, merge conflict resolution,
+and reconciling staged changes.