From 43639f69f665fca39df675668f1e1f3138d310ef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 21 Apr 2011 02:07:40 -0400
Subject: [PATCH] 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
---
 Annex.hs         |  2 +-
 Backend.hs       |  2 +-
 debian/changelog |  9 +++++++++
 debian/control   | 11 ++++++-----
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Annex.hs b/Annex.hs
index 9086db9bf7..03f9130b6a 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
diff --git a/Backend.hs b/Backend.hs
index c0e93acc23..0edff2ab5e 100644
--- a/Backend.hs
+++ b/Backend.hs
@@ -32,7 +32,7 @@ module Backend (
 	maybeLookupBackendName
 ) where
 
-import Control.Monad.State
+import Control.Monad.State hiding (state)
 import System.IO.Error (try)
 import System.FilePath
 import System.Posix.Files
diff --git a/debian/changelog b/debian/changelog
index 91ab3a4024..cdb530c247 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+git-annex (0.20110420) UNRELEASED; urgency=low
+
+  * 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.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 21 Apr 2011 02:00:00 -0400
+
 git-annex (0.20110419) unstable; urgency=low
 
   * Don't run gpg in batch mode, so it can prompt for passphrase when
diff --git a/debian/control b/debian/control
index 00740b7403..7aba047173 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: optional
 Build-Depends: 
 	debhelper (>= 7.0.50),
 	ghc6,
-	libghc6-missingh-dev,
-	libghc6-pcre-light-dev,
-	libghc6-testpack-dev,
-	libghc6-sha-dev,
-	libghc6-dataenc-dev,
+	libghc-missingh-dev,
+	libghc-pcre-light-dev,
+	libghc-testpack-dev,
+	libghc-sha-dev,
+	libghc-dataenc-dev,
+	libghc-hs3-dev,
 	ikiwiki,
 	perlmagick,
 	git | git-core,