summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-07 12:12:36 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-07 12:12:36 -0400
commitedaabe750c16b9c450b291d776340e70baa4fd7d (patch)
tree0f4ee65100c70dd1751daf8799e1b4a6e66d2cda
parentdc83c3d8c959dd155a449c111021603fbac0ba51 (diff)
no lsof on kfreebsd
-rw-r--r--debian/changelog1
-rw-r--r--debian/control12
-rw-r--r--git-annex.cabal2
3 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index ac6603ada..5497dd746 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ git-annex (5.20131231) UNRELEASED; urgency=medium
* assistant: Start a new git-annex transferkeys process
after a network connection change, so that remotes that use a persistent
network connection are restarted.
+ * Adjust Debian build deps to match current state of sparc, mipsel.
-- Joey Hess <joeyh@debian.org> Tue, 31 Dec 2013 13:41:18 -0400
diff --git a/debian/control b/debian/control
index e9e0923d3..17343f1a7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,10 @@ Build-Depends:
libghc-pcre-light-dev,
libghc-sha-dev,
libghc-cryptohash-dev,
- libghc-regex-tdfa-dev [!mips !mipsel !s390],
libghc-dataenc-dev,
libghc-utf8-string-dev,
libghc-hs3-dev (>= 0.5.6),
- libghc-dav-dev (>= 0.3) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc],
+ libghc-dav-dev (>= 0.3) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc],
libghc-quickcheck2-dev,
libghc-monad-control-dev (>= 0.3),
libghc-monadcatchio-transformers-dev,
@@ -51,10 +50,11 @@ Build-Depends:
libghc-async-dev,
libghc-http-dev,
libghc-feed-dev,
- libghc-tasty-dev,
- libghc-tasty-hunit-dev,
- libghc-tasty-quickcheck-dev,
- lsof,
+ libghc-regex-tdfa-dev [!mipsel !s390],
+ libghc-tasty-dev [!mipsel !sparc],
+ libghc-tasty-hunit-dev [!mipsel !sparc],
+ libghc-tasty-quickcheck-dev [!mipsel !sparc],
+ lsof [!kfreebsd-i386 !kfreebsd-amd64],
ikiwiki,
perlmagick,
git (>= 1:1.8.4),
diff --git a/git-annex.cabal b/git-annex.cabal
index 8dccfedfc..90d56e0d2 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 5.20131230
+Version: 5.20131231
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <joey@kitenet.net>