From cdcb4548b3bd0f2d4425e765103c587bad13d06c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Oct 2014 13:31:20 -0400 Subject: [PATCH] Remove hurd stuff from cabal file, since hackage currently rejects it. https://github.com/haskell/hackage-server/issues/269 --- debian/changelog | 2 ++ git-annex.cabal | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4724b63dee..911b970493 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 Tue, 14 Oct 2014 14:09:24 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index 18a7150ddc..4e13326c2f 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)