Merge branch 'master' into s3-aws
Conflicts: git-annex.cabal
This commit is contained in:
commit
ef01ff1e77
128 changed files with 1219 additions and 511 deletions
4
debian/control
vendored
4
debian/control
vendored
|
@ -16,8 +16,6 @@ Build-Depends:
|
|||
libghc-aws-dev,
|
||||
libghc-conduit-dev,
|
||||
libghc-resourcet-dev,
|
||||
libghc-http-conduit-dev,
|
||||
libghc-http-client-dev,
|
||||
libghc-dav-dev (>= 1.0) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc],
|
||||
libghc-quickcheck2-dev,
|
||||
libghc-monad-control-dev (>= 0.3),
|
||||
|
@ -50,6 +48,7 @@ Build-Depends:
|
|||
libghc-dns-dev,
|
||||
libghc-case-insensitive-dev,
|
||||
libghc-http-types-dev,
|
||||
libghc-http-conduit-dev,
|
||||
libghc-blaze-builder-dev,
|
||||
libghc-crypto-api-dev,
|
||||
libghc-network-multicast-dev,
|
||||
|
@ -59,7 +58,6 @@ Build-Depends:
|
|||
libghc-gnutls-dev (>= 0.1.4),
|
||||
libghc-xml-types-dev,
|
||||
libghc-async-dev,
|
||||
libghc-http-dev,
|
||||
libghc-feed-dev (>= 0.3.9.2),
|
||||
libghc-regex-tdfa-dev [!mipsel !s390],
|
||||
libghc-regex-compat-dev [mipsel s390],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue