diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-04-26 11:24:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-04-26 11:24:23 -0400 |
| commit | 27774bdd56e05dabf98deeb09b78433fd374465c (patch) | |
| tree | 12732a5e26240df0817a4c465c3171d0236d2c82 /debian | |
| parent | ebd6ea1abb80c617f2bf1b693a54ec8b653db623 (diff) | |
Revert "Use haskell Crypto library instead of haskell SHA library.a"
This reverts commit 892593c5efacbc084d19af4b5d7164ededaea7ff.
Conflicts:
Crypto.hs
debian/control
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 0ba7588f4..ce5e651b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git-annex (0.20110426) UNRELEASED; urgency=low + + * Switch back to haskell SHA library, so git-annex remains buildable on + Debian stable. + + -- Joey Hess <joeyh@debian.org> Tue, 26 Apr 2011 11:23:54 -0400 + git-annex (0.20110425) unstable; urgency=low * Use haskell Crypto library instead of haskell SHA library. diff --git a/debian/control b/debian/control index c6b3e7d0d..b75b35afb 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Build-Depends: ghc, libghc-missingh-dev, libghc-pcre-light-dev, + libghc-sha-dev, libghc-dataenc-dev, - libghc-crypto-dev, libghc-utf8-string-dev, libghc-hs3-dev (>= 0.5.6), libghc-testpack-dev [any-i386 any-amd64], |