summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-02-07 17:42:34 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-02-07 17:42:52 -0400
commit389bd6f0276976c48a77cba21ec52ff937efc331 (patch)
tree3620df9a301ef01cb1a8bc21bbf4724974043cbb
parent17502909d46dec559d26af3cbda8ef830d038fb4 (diff)
avoid broken version of DAV
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/Creating_a_box.com_repository_fails.mdwn4
-rw-r--r--git-annex.cabal3
3 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index a805e234e..e0eb14f32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ git-annex (5.20140128) UNRELEASED; urgency=medium
and external special remotes.
* Android: Avoid crashing when unable to set file mode for ssh config file
due to Android filesystem horribleness.
+ * Avoid building with DAV 0.6 which is badly broken (see #737902).
-- Joey Hess <joeyh@debian.org> Tue, 28 Jan 2014 13:57:19 -0400
diff --git a/doc/bugs/Creating_a_box.com_repository_fails.mdwn b/doc/bugs/Creating_a_box.com_repository_fails.mdwn
index 04b1787b0..75d59c9bc 100644
--- a/doc/bugs/Creating_a_box.com_repository_fails.mdwn
+++ b/doc/bugs/Creating_a_box.com_repository_fails.mdwn
@@ -31,3 +31,7 @@ ubuntu 13.10 (saucy), i686
# End of transcript or log.
"""]]
+
+> Seems that [DAV-0.6 is badly broken](http://bugs.debian.org/737902).
+> I have adjusted the cabal file to refuse to build with that broken
+> version.
diff --git a/git-annex.cabal b/git-annex.cabal
index 982209517..a71e7df1c 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -131,7 +131,8 @@ Executable git-annex
CPP-Options: -DWITH_S3
if flag(WebDAV)
- Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types
+ Build-Depends: DAV ((>= 0.3 && < 0.6) || > 0.6),
+ http-conduit, xml-conduit, http-types
CPP-Options: -DWITH_WEBDAV
if flag(Assistant) && ! os(solaris)