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

Merge branch 'safesemaphore'

Browse source 
Conflicts:
	debian/changelog
	git-annex.cabal
This commit is contained in:
Joey Hess 2012-10-20 12:44:25 -04:00
commit 14b376d440
7 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

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

@ -39,6 +39,7 @@ Build-Depends:
libghc-crypto-api-dev,
libghc-network-multicast-dev,
libghc-network-info-dev,
libghc-safesemaphore-dev,
ikiwiki,
perlmagick,
git,