aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2018-02-07 16:16:33 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2018-02-07 16:16:33 -0400
commit5902dc27c8193344d6ddbd020e0de25a4e10ad75 (patch)
tree85edd76b1782e09c0571e4fa7aaedb79451c1424
parentd4e88a867e9e18acd31f297c2c1295cbd6dd7155 (diff)
datalad < 0.9.1 had a problem in its special remote protocol handling which is broken by EXTENSIONS. Make the debian git-annex package conflict with the problem version of datalad.
-rw-r--r--CHANGELOG3
-rw-r--r--debian/control1
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6ed90dfd7..dbf55e21f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@ git-annex (6.20180113) UNRELEASED; urgency=medium
* inprogress: Avoid showing failures for files not in progress.
* Added INFO to external special remote protocol.
* Added EXTENSIONS to external special remote protocol.
+ * datalad < 0.9.1 had a problem in its special remote protocol handling
+ which is broken by EXTENSIONS. Make the debian git-annex package
+ conflict with the problem version of datalad.
-- Joey Hess <id@joeyh.name> Wed, 24 Jan 2018 20:42:55 -0400
diff --git a/debian/control b/debian/control
index db050d17a..a601dc904 100644
--- a/debian/control
+++ b/debian/control
@@ -118,6 +118,7 @@ Suggests:
tahoe-lafs,
libnss-mdns,
uftp,
+Conflicts: datalad (< 0.9.1)
Description: manage files with git, without checking their contents into git
git-annex allows managing files with git, without checking the file
contents into git. While that may seem paradoxical, it is useful when