diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | git-annex.cabal | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 01c689b50..579ff8990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ git-annex (5.20150529) UNRELEASED; urgency=medium * S3: Special remotes can be configured with public=yes to allow the public to access the bucket's content. * S3: Publically accessible buckets can be used without creds. + * Re-remove dependency on obsolete hamlet package. Closes: #786659 -- Joey Hess <id@joeyh.name> Sat, 30 May 2015 02:07:18 -0400 diff --git a/debian/control b/debian/control index 674651603..ea532ca81 100644 --- a/debian/control +++ b/debian/control @@ -38,8 +38,7 @@ Build-Depends: libghc-yesod-form-dev (>= 1.3.15) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], libghc-yesod-static-dev (>= 1.2.4) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], libghc-yesod-default-dev (>= 1.2.0) [i386 amd64 armel armhf kfreebsd-amd64 powerpc ppc64el], - libghc-hamlet-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], - libghc-shakespeare-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], + libghc-shakespeare-dev (>= 2.0.0) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], libghc-clientsession-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], libghc-warp-dev (>= 3.0.0.5) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], libghc-warp-tls-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el], diff --git a/git-annex.cabal b/git-annex.cabal index fa255d4d5..5d68f1c1d 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -227,9 +227,9 @@ Executable git-annex warp (>= 3.0.0.5), warp-tls, wai, wai-extra, - blaze-builder, crypto-api, hamlet, clientsession, + blaze-builder, crypto-api, clientsession, template-haskell, aeson, - shakespeare + shakespeare (>= 2.0.0) CPP-Options: -DWITH_WEBAPP if flag(Webapp) && flag (Webapp-secure) |