Merge branch 'safesemaphore'
Conflicts: debian/changelog git-annex.cabal
This commit is contained in:
commit
14b376d440
7 changed files with 25 additions and 17 deletions
3
debian/changelog
vendored
3
debian/changelog
vendored
|
@ -4,6 +4,9 @@ git-annex (3.20121018) UNRELEASED; urgency=low
|
|||
* Preferred content path matching bugfix.
|
||||
* Preferred content expressions cannot use "in=".
|
||||
* Preferred content expressions can use "present".
|
||||
* Depend on and use the Haskell SafeSemaphore library, which provides
|
||||
exception-safe versions of SampleVar and QSemN.
|
||||
Thanks, Ben Gamari for an excellent patch set.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400
|
||||
|
||||
|
|
1
debian/control
vendored
1
debian/control
vendored
|
@ -39,6 +39,7 @@ Build-Depends:
|
|||
libghc-crypto-api-dev,
|
||||
libghc-network-multicast-dev,
|
||||
libghc-network-info-dev,
|
||||
libghc-safesemaphore-dev,
|
||||
ikiwiki,
|
||||
perlmagick,
|
||||
git,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue