diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-04-21 02:07:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-04-21 02:22:40 -0400 |
| commit | 43639f69f665fca39df675668f1e1f3138d310ef (patch) | |
| tree | c75b65f28b8e6d1bff143848bdcba80166e0e796 | |
| parent | 0c9896114e8ef125b04ff368efde82a88136bdcf (diff) | |
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
| -rw-r--r-- | Annex.hs | 2 | ||||
| -rw-r--r-- | Backend.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 11 |
4 files changed, 17 insertions, 7 deletions
@@ -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 c0e93acc2..0edff2ab5 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 91ab3a402..cdb530c24 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 00740b740..7aba04717 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, |