diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-20 12:44:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-20 12:44:25 -0400 |
| commit | 50d35a77f6ad083c6eead5439e9d0ca91ee03dc5 (patch) | |
| tree | 6021c5f39d2d6fe4a1ffe80e8d0895c2281ca210 /debian | |
| parent | 6f92da2474f66c0ffa3ee741383cb12cc462b61e (diff) | |
| parent | 244a312b17a8ba825507296f52ab9357220102c0 (diff) | |
Merge branch 'safesemaphore'
Conflicts:
debian/changelog
git-annex.cabal
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 314b500d5..53b9523dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/control b/debian/control index 505ea6ebb..24464f980 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,7 @@ Build-Depends: libghc-crypto-api-dev, libghc-network-multicast-dev, libghc-network-info-dev, + libghc-safesemaphore-dev, ikiwiki, perlmagick, git, |