summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-10-15 13:31:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-10-15 13:31:20 -0400
commit5f127608b8616e19b7e86bd550e714da118ee42e (patch)
tree428242c95e1f1cbeed4fcb69c58663871c72c4f3
parent9f1b4c2f61a1173be9943a3e301b0e2dac789739 (diff)
Remove hurd stuff from cabal file, since hackage currently rejects it.
-rw-r--r--debian/changelog2
-rw-r--r--git-annex.cabal7
2 files changed, 5 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 4724b63de..911b97049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ git-annex (5.20141014) UNRELEASED; urgency=medium
* vicfg: Deleting configurations now resets to the default, where
before it has no effect.
+ * Remove hurd stuff from cabal file, since hackage currently rejects
+ it.
-- Joey Hess <joeyh@debian.org> Tue, 14 Oct 2014 14:09:24 -0400
diff --git a/git-annex.cabal b/git-annex.cabal
index 18a7150dd..4e13326c2 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -158,7 +158,7 @@ Executable git-annex
Build-Depends: DAV (>= 1.0), http-client
CPP-Options: -DWITH_WEBDAV
- if flag(Assistant) && ! os(solaris) && ! os(gnu)
+ if flag(Assistant) && ! os(solaris)
CPP-Options: -DWITH_ASSISTANT
if flag(Assistant)
@@ -179,9 +179,8 @@ Executable git-annex
Build-Depends: hinotify
CPP-Options: -DWITH_INOTIFY
else
- if ! os(gnu)
- CPP-Options: -DWITH_KQUEUE
- C-Sources: Utility/libkqueue.c
+ CPP-Options: -DWITH_KQUEUE
+ C-Sources: Utility/libkqueue.c
if (os(linux))
if flag(Dbus)