aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-05-22 15:42:51 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-05-22 15:46:47 -0400
commit8c9908de63ace83efa14744e3f7cf3f12fc8f197 (patch)
treec39af7be8b4003f2c19914cd93373c231aa127b1
parentd70771f2f5722e2d3d19e6c1e12d7a5af15dd448 (diff)
remove deprecated hamlet package
shakespeare provides this now
-rw-r--r--debian/control3
-rw-r--r--git-annex.cabal4
2 files changed, 3 insertions, 4 deletions
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 25b1b6438..3849ec92d 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)