diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-09-18 14:36:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-09-18 14:36:20 -0400 |
| commit | 2ba86dcb3dd049f592235bcbcb45a6f05c2a13f6 (patch) | |
| tree | d5cccc978e7b4bf5171a93c7cb5a314b891bb6b8 /debian/control | |
| parent | b9343ca1d3e0c7e136f7894cd159edb1d0730a0a (diff) | |
| parent | 7255a3267c3728822698aafcf5b9d597b17dc9a4 (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
Utility/Url.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/debian/control b/debian/control index 2b430b4dc..fdd9e00be 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: libghc-dav-dev (>= 1.0) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc], libghc-quickcheck2-dev, libghc-monad-control-dev (>= 0.3), - libghc-exceptions-dev, + libghc-exceptions-dev (>= 0.6), libghc-transformers-dev, libghc-unix-compat-dev, libghc-dlist-dev, @@ -33,16 +33,16 @@ Build-Depends: libghc-stm-dev (>= 2.3), libghc-dbus-dev (>= 0.10.3) [linux-any], libghc-fdo-notify-dev (>= 0.3) [linux-any], - libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], - 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], - libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], - libghc-wai-extra-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], + libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-yesod-default-dev [i386 amd64 kfreebsd-amd64 powerpc], + libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-shakespeare-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-wai-extra-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], libghc-securemem-dev, libghc-byteable-dev, libghc-dns-dev, @@ -61,12 +61,12 @@ Build-Depends: libghc-feed-dev (>= 0.3.9.2), libghc-regex-tdfa-dev [!mipsel !s390], libghc-regex-compat-dev [mipsel s390], - libghc-tasty-dev (>= 0.7) [!mipsel !sparc], - libghc-tasty-hunit-dev [!mipsel !sparc], - libghc-tasty-quickcheck-dev [!mipsel !sparc], - libghc-tasty-rerun-dev [!mipsel !sparc], + libghc-tasty-dev (>= 0.7) [!sparc], + libghc-tasty-hunit-dev [!sparc], + libghc-tasty-quickcheck-dev [!sparc], + libghc-tasty-rerun-dev [!sparc], libghc-optparse-applicative-dev [!sparc], - lsof [!kfreebsd-i386 !kfreebsd-amd64], + lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any], ikiwiki, perlmagick, git (>= 1:1.8.4), |