diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-14 13:38:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-14 13:38:35 -0400 |
| commit | 190656ed99241af034e1a105eefcd5a72214fe2f (patch) | |
| tree | 30310a17114b9d64b7c51a73b3af3a9cc171a56e /debian | |
| parent | 65c7bfcc55ec2243e1f4dcb5bbca54dce494bc63 (diff) | |
| parent | 36969d80d4c921dea8f3b48465dd9a533f97ecae (diff) | |
Merge branch 'master' into remotecontrol
Conflicts:
doc/devblog/day_152__more_ssh_connection_caching.mdwn
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 4c1b20df7..d74e29760 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ git-annex (5.20140413) UNRELEASED; urgency=medium * remotedaemon: When network connection is lost, close all cached ssh connections. * 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], |