diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-25 14:43:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-25 14:43:55 -0400 |
| commit | 7e141b473f8225bc64769e57fd08722532d5ea94 (patch) | |
| tree | 9a16e7b59167d7bfd7c2886cdd7f556a4da6b7a5 /debian | |
| parent | 8a12e78e0bff680eb913ec2140da909da74040a0 (diff) | |
| parent | 467d70fddc4e066682ceb50f3eabe9b4083c8ee3 (diff) | |
Merge branch 'master' into xmpp
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
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 a233f239e..5a837a46c 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], |