summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-12-24 14:48:51 -0400
committerJoey Hess <joeyh@joeyh.name>2016-12-24 15:01:55 -0400
commitab66bbfeb66e1a40eb40d06931fe0bc7a0224449 (patch)
treec7e4c53467924db3f2662803c6209a0db9a479de /debian
parentd58148031bae065729b1d470ca1f67bfb368b364 (diff)
parent8484c0c1976b2daa4be674b09f6f54c15c746aa6 (diff)
Merge branch 'master' into no-xmpp
Diffstat (limited to 'debian')
-rw-r--r--debian/control29
1 files changed, 17 insertions, 12 deletions
diff --git a/debian/control b/debian/control
index ea33eccab7..ee2813e9e9 100644
--- a/debian/control
+++ b/debian/control
@@ -32,17 +32,17 @@ Build-Depends:
libghc-stm-dev (>= 2.3),
libghc-dbus-dev (>= 0.10.7) [linux-any],
libghc-fdo-notify-dev (>= 0.3) [linux-any],
- libghc-yesod-dev (>= 1.2.6.1) [i386 amd64 arm64 armhf kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-yesod-core-dev (>= 1.2.19) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-yesod-form-dev (>= 1.3.15) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-yesod-static-dev (>= 1.2.4) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-yesod-default-dev (>= 1.2.0) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-shakespeare-dev (>= 2.0.0) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-clientsession-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-warp-dev (>= 3.0.0.5) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-warp-tls-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-wai-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-wai-extra-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-yesod-dev (>= 1.2.6.1) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-yesod-core-dev (>= 1.2.19) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-yesod-form-dev (>= 1.3.15) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-yesod-static-dev (>= 1.2.4) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-yesod-default-dev (>= 1.2.0) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-shakespeare-dev (>= 2.0.0) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-clientsession-dev [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-warp-dev (>= 3.0.0.5) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-warp-tls-dev [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-wai-dev [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
+ libghc-wai-extra-dev [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-dav-dev (>= 1.0),
libghc-persistent-dev,
libghc-persistent-template-dev,
@@ -50,6 +50,7 @@ Build-Depends:
libghc-esqueleto-dev,
libghc-securemem-dev,
libghc-byteable-dev,
+ libghc-stm-chans-dev,
libghc-dns-dev,
libghc-case-insensitive-dev,
libghc-http-types-dev,
@@ -61,6 +62,7 @@ Build-Depends:
libghc-safesemaphore-dev,
libghc-async-dev,
libghc-monad-logger-dev,
+ libghc-free-dev,
libghc-feed-dev (>= 0.3.9.2),
libghc-regex-tdfa-dev,
libghc-tasty-dev (>= 0.7),
@@ -73,6 +75,7 @@ Build-Depends:
libghc-disk-free-space-dev,
libghc-mountpoints-dev,
libghc-magic-dev,
+ libghc-socks-dev,
lsof [linux-any],
ikiwiki,
libimage-magick-perl,
@@ -107,8 +110,10 @@ Recommends:
nocache,
aria2,
Suggests:
- graphviz,
+ xdot,
bup,
+ tor,
+ magic-wormhole,
tahoe-lafs,
libnss-mdns,
Description: manage files with git, without checking their contents into git