ghc7

* Update Debian build dependencies for ghc 7.
* Debian package is now built with S3 support. Thanks Joachim Breitner for
  making this possible, also thanks Greg Heartsfield for working to improve
  the hS3 library for git-annex.

Also hid a conflicting new symbol from Control.Monad.State

1 files changed, 1 insertions, 1 deletions

diff --git a/Annex.hs b/Annex.hs
index 9086db9bf..03f9130b6 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -16,7 +16,7 @@ module Annex (
 	gitRepo
 ) where
 
-import Control.Monad.State
+import Control.Monad.State hiding (state)
 
 import qualified GitRepo as Git
 import qualified GitQueue