diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-27 14:47:41 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-27 14:47:41 -0400 |
| commit | 5a9da2586865cd8f578094042887e50c3578f1db (patch) | |
| tree | 9fb1e31fc8225007debbdd4bbc331cc4ae3a2870 | |
| parent | 2770ed6095d5af29770d89e4864131b1ba56cbcb (diff) | |
Revert "remove deprecated hamlet package"
This reverts commit 8c9908de63ace83efa14744e3f7cf3f12fc8f197.
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.
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | git-annex.cabal | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/control b/debian/control index ea532ca81..674651603 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 3849ec92d..25b1b6438 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) |