Merge branch 'master' into xmpp

Makefile

@@ -15,7 +15,7 @@ all=$(bins) $(mans) docs
 
 OS:=$(shell uname | sed 's/[-_].*//')
 ifeq ($(OS),Linux)
-OPTFLAGS?=-DWITH_INOTIFY
+OPTFLAGS?=-DWITH_INOTIFY -DWITH_DBUS
 clibs=Utility/libdiskfree.o Utility/libmounts.o
 THREADFLAGS=$(shell if test -e  `ghc --print-libdir`/libHSrts_thr.a; then printf -- -threaded; fi)
 else

debian/changelog

@@ -22,6 +22,8 @@ git-annex (3.20121018) UNRELEASED; urgency=low
   * bugfix: Don't fail transferring content from read-only repos.
     Closes: #691341
   * configure: Check that checksum programs produce correct checksums.
+  * Re-enable dbus, using a new version of the library that fixes the memory
+    leak.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 17 Oct 2012 14:24:10 -0400
 

debian/control

@@ -22,7 +22,7 @@ Build-Depends:
 	libghc-edit-distance-dev,
 	libghc-hinotify-dev [linux-any],
 	libghc-stm-dev (>= 2.3),
-	libghc-dbus-dev [linux-any],
+	libghc-dbus-dev [linux-any] (>= 0.10.2),
 	libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
 	libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
 	libghc-yesod-default-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64],

doc/design/assistant/xmpp.mdwn

@@ -4,6 +4,7 @@ who share a repository, that is stored in the [[cloud]].
 
 ### TODO
 
+* Track down segfault when the XMPP library is starting up a client connection.
 * test with big servers, eg google chat
 * Prevent idle disconnection. Probably means sending or receiving pings,
   but would prefer to avoid eg pinging every 60 seconds as some clients do.

git-annex.cabal

@@ -80,7 +80,7 @@ Executable git-annex
       C-Sources: Utility/libkqueue.c
 
   if os(linux) && flag(Dbus)
-    Build-Depends: dbus
+    Build-Depends: dbus (>= 0.10.2)
     CPP-Options: -DWITH_DBUS
 
   if flag(Webapp) && flag(Assistant)