build fixes

4 files changed, 20 insertions, 6 deletions

diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs
index 10ea34692..c79566349 100644
--- a/Assistant/Threads/Merger.hs
+++ b/Assistant/Threads/Merger.hs
@@ -25,7 +25,7 @@ import qualified Remote
 thisThread :: ThreadName
 thisThread = "Merger"
 
-{- This thread watches for changes to .git/refs/heads/synced/*,
+{- This thread watches for changes to .git/refs/heads/synced/,
  - which indicate incoming pushes. It merges those pushes into the
  - currently checked out branch. -}
 mergeThread :: ThreadState -> IO ()
diff --git a/debian/control b/debian/control
index c7531cd3f..65c666cde 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,12 @@ Build-Depends:
 	libghc-stm-dev (>= 2.3),
 	libghc-dbus-dev,
 	libghc-yesod-dev,
+	libghc-case-insensitive-dev,
+	libghc-http-types-dev,
+	libghc-transformers-dev,
+	libghc-wai-dev,
+	libghc-wai-logger-dev,
+	libghc-warp-dev,
 	ikiwiki,
 	perlmagick,
 	git,
diff --git a/doc/install.mdwn b/doc/install.mdwn
index 058c3cf6e..619d5fa11 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -42,14 +42,19 @@ To build and use git-annex, you will need:
   * [bloomfilter](http://hackage.haskell.org/package/bloomfilter)
   * [edit-distance](http://hackage.haskell.org/package/edit-distance)
   * [hS3](http://hackage.haskell.org/package/hS3) (optional)
+* Optional haskell stuff, used by the assistant and webapp (edit Makefile to disable)
   * [stm](http://hackage.haskell.org/package/stm)
-    (optional; version 2.3 or newer)
+    (version 2.3 or newer)
   * [hinotify](http://hackage.haskell.org/package/hinotify)
-    (optional; Linux only)
+    (Linux only)
   * [dbus](http://hackage.haskell.org/package/dbus)
-    (optional)
   * [yesod](http://hackage.haskell.org/package/yesod)
-    (optional; for webapp)
+  * [case-insensitive](http://hackage.haskell.org/package/case-insensitive)
+  * [http-types](http://hackage.haskell.org/package/http-types)
+  * [transformers](http://hackage.haskell.org/package/transformers)
+  * [wai](http://hackage.haskell.org/package/wai)
+  * [wai-logger](http://hackage.haskell.org/package/wai-logger)
+  * [warp](http://hackage.haskell.org/package/warp)
 * Shell commands
   * [git](http://git-scm.com/)
   * [uuid](http://www.ossp.org/pkg/lib/uuid/)
diff --git a/git-annex.cabal b/git-annex.cabal
index 11412d19a..086df31d2 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -46,9 +46,11 @@ Executable git-annex
    unix, containers, utf8-string, network, mtl, bytestring, old-locale, time,
    pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
    base == 4.5.*, monad-control, transformers-base, lifted-base,
-   IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process
+   IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process,
+   case-insensitive, http-types, transformers, wai, wai-logger, warp
   -- Need to list these because they're generated from .hsc files.
   Other-Modules: Utility.Touch Utility.Mounts
+  Include-Dirs: Utility
   C-Sources: Utility/libdiskfree.c Utility/libmounts.c
   Extensions: CPP
   GHC-Options: -threaded
@@ -88,6 +90,7 @@ Test-Suite test
    base == 4.5.*, monad-control, transformers-base, lifted-base,
    IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process
   Other-Modules: Utility.Touch
+  Include-Dirs: Utility
   C-Sources: Utility/libdiskfree.c
   Extensions: CPP
   GHC-Options: -threaded