mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into xmpp

Browse source
This commit is contained in:
Joey Hess 2012-10-25 14:43:55 -04:00
commit 52a48d1a78
5 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -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

2
debian/control vendored
View file

@ -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],