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 
Conflicts:
	Assistant/Threads/NetWatcher.hs
This commit is contained in:
Joey Hess 2012-10-26 19:42:24 -04:00
commit d1e5f2d596
13 changed files with 116 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -24,6 +24,7 @@ git-annex (3.20121018) UNRELEASED; urgency=low
* configure: Check that checksum programs produce correct checksums.
* Re-enable dbus, using a new version of the library that fixes the memory
leak.
* NetWatcher: When dbus connection is lost, try to reconnect.
* Use USER and HOME environment when set, and only fall back to getpwent,
which doesn't work with LDAP or NIS.

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] (>= 0.10.2),
libghc-dbus-dev [linux-any] (>= 0.10.3),
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],