mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ghc7

Browse source 
* 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
This commit is contained in:
Joey Hess 2011-04-21 02:07:40 -04:00
parent 0c9896114e
commit 43639f69f6
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Annex.hs
View file

@ -16,7 +16,7 @@ module Annex (
gitRepo gitRepo
) where ) where
import Control.Monad.State import Control.Monad.State hiding (state)
import qualified GitRepo as Git import qualified GitRepo as Git
import qualified GitQueue import qualified GitQueue

2
Backend.hs
View file

@ -32,7 +32,7 @@ module Backend (
maybeLookupBackendName maybeLookupBackendName
) where ) where
import Control.Monad.State import Control.Monad.State hiding (state)
import System.IO.Error (try) import System.IO.Error (try)
import System.FilePath import System.FilePath
import System.Posix.Files import System.Posix.Files

9
debian/changelog vendored
View file

@ -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 git-annex (0.20110419) unstable; urgency=low
* Don't run gpg in batch mode, so it can prompt for passphrase when * Don't run gpg in batch mode, so it can prompt for passphrase when

11
debian/control vendored
View file

@ -4,11 +4,12 @@ Priority: optional
Build-Depends: Build-Depends:
debhelper (>= 7.0.50), debhelper (>= 7.0.50),
ghc6, ghc6,
libghc6-missingh-dev, libghc-missingh-dev,
libghc6-pcre-light-dev, libghc-pcre-light-dev,
libghc6-testpack-dev, libghc-testpack-dev,
libghc6-sha-dev, libghc-sha-dev,
libghc6-dataenc-dev, libghc-dataenc-dev,
libghc-hs3-dev,
ikiwiki, ikiwiki,
perlmagick, perlmagick,
git | git-core, git | git-core,