summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--git-annex.cabal2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 5462ffb6a..d5152ae53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
git-annex (4.20130502) UNRELEASED; urgency=low
* Android: The webapp is ported and working.
+ * Temporarily add an upper bound to the version of yesod that can be built
+ with, since yesod 1.2 has a great many changes that will require extensive
+ work on the webapp.
-- Joey Hess <joeyh@debian.org> Thu, 02 May 2013 20:39:19 -0400
diff --git a/git-annex.cabal b/git-annex.cabal
index 11d327d15..829b7b2aa 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -120,7 +120,7 @@ Executable git-annex
CPP-Options: -DWITH_DBUS
if flag(Webapp)
- Build-Depends: yesod, yesod-static, case-insensitive,
+ Build-Depends: yesod (< 1.2), yesod-static, case-insensitive,
http-types, transformers, wai, wai-logger, warp, blaze-builder,
crypto-api, hamlet, clientsession, aeson, yesod-form,
template-haskell, yesod-default, data-default