summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-25 14:32:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-25 14:32:30 -0400
commit467d70fddc4e066682ceb50f3eabe9b4083c8ee3 (patch)
tree6660c8a3af82e79bf927b0ecf54e6d648bebef0d /debian
parenta4f91e1e0a908ac49b90e4b54c9dc922b6c599fd (diff)
Re-enable dbus, using a new version of the library that fixes the memory leak.
For now, when dbus goes away, the assistant keeps running but does not fall back or reconnect. To do so needs more changes to the DBus library; in particular a connectSessionWith and connectSystemWith to let me specify my own clientThreadRunner.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 246c0badc..2278195c2 100644
--- a/debian/changelog
+++ b/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
diff --git a/debian/control b/debian/control
index 24464f980..ec648288a 100644
--- a/debian/control
+++ b/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],