summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-16 11:56:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-16 11:56:07 -0400
commit8686e128b7e9339947051a3c958c1c089f3834f5 (patch)
tree0dca4a1f44a122b7a5050a52c34047e9b085ee5e
parente13b5f64a76dd9aa254dc61341b7f81cba992a93 (diff)
Temporarily disable use of dbus, as the haskell dbus library blows up when losing connection, which will need to be fixed upstream.
-rw-r--r--Makefile2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 95c5d73b5..3c3ccb809 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ all=$(bins) $(mans) docs
OS:=$(shell uname | sed 's/[-_].*//')
ifeq ($(OS),Linux)
-OPTFLAGS?=-DWITH_INOTIFY -DWITH_DBUS
+OPTFLAGS?=-DWITH_INOTIFY
clibs=Utility/libdiskfree.o Utility/libmounts.o
THREADFLAGS=$(shell if test -e `ghc --print-libdir`/libHSrts_thr.a; then printf -- -threaded; fi)
else
diff --git a/debian/changelog b/debian/changelog
index 37ef03b35..e7797dd84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ git-annex (3.20121011) UNRELEASED; urgency=low
in order to work with old versions of ssh.
* A relative core.worktree is relative to the gitdir. Now that this is
handled correctly, git-annex can be used in git submodules.
+ * Temporarily disable use of dbus, as the haskell dbus library blows up
+ when losing connection, which will need to be fixed upstream.
-- Joey Hess <joeyh@debian.org> Fri, 12 Oct 2012 22:46:08 -0400