diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-13 13:12:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-13 13:12:14 -0400 |
| commit | 5b2539a1eacd292fdd807ef4f2448f70d4a9ef26 (patch) | |
| tree | a7154e54aebde512bea869c47f3557cce6dcdca0 | |
| parent | 437383d71efd368059d0842a5248d9266d5671c6 (diff) | |
Avoid depending on shakespeare except for when building the webapp.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | git-annex.cabal | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 6b5a205e1..ec5be1ea4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ git-annex (5.20140413) UNRELEASED; urgency=medium * Improve handling on monthly/yearly scheduling. + * Avoid depending on shakespeare except for when building the webapp. -- Joey Hess <joeyh@debian.org> Fri, 11 Apr 2014 21:33:35 -0400 diff --git a/debian/control b/debian/control index 1a2aaed70..3c75cdde6 100644 --- a/debian/control +++ b/debian/control @@ -35,6 +35,7 @@ Build-Depends: libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], libghc-yesod-default-dev [i386 amd64 kfreebsd-amd64 powerpc sparc], libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], + libghc-shakespeare-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], diff --git a/git-annex.cabal b/git-annex.cabal index 855fecd5a..a2c842287 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -101,7 +101,7 @@ Executable git-annex base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3), - data-default, case-insensitive, shakespeare + data-default, case-insensitive CC-Options: -Wall GHC-Options: -Wall Extensions: PackageImports @@ -191,7 +191,8 @@ Executable git-annex yesod, yesod-default, yesod-static, yesod-form, yesod-core, http-types, transformers, wai, wai-logger, warp, warp-tls, blaze-builder, crypto-api, hamlet, clientsession, - template-haskell, data-default, aeson, network-conduit + template-haskell, data-default, aeson, network-conduit, + shakespeare CPP-Options: -DWITH_WEBAPP if flag(Webapp) && flag (Webapp-secure) Build-Depends: warp-tls (>= 1.4), securemem, byteable |