From e8105643382ccad281632df17c1d3dd861492d29 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 27 May 2015 14:47:41 -0400 Subject: [PATCH] Revert "remove deprecated hamlet package" This reverts commit cf650eaa99145b338c99b0bfbe0ced7961cebc13. It's too early to do this; the linux and android autobuilder will need to be updated to use the new version of shakespeare, and that will require a complete refresh of them. In the meantime, this has knocked the webapp out of the autobuilders. --- debian/control | 3 ++- git-annex.cabal | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index ea532ca812..6746516031 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,8 @@ 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-shakespeare-dev (>= 2.0.0) [i386 amd64 armel armhf kfreebsd-i386 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-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 3849ec92d4..25b1b6438a 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, clientsession, + blaze-builder, crypto-api, hamlet, clientsession, template-haskell, aeson, - shakespeare (>= 2.0.0) + shakespeare CPP-Options: -DWITH_WEBAPP if flag(Webapp) && flag (Webapp-secure)