Merge branch 'new-monad-control'

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2011-12-30 20:06:15 -04:00
commit 8f4fdb3f97
7 changed files with 27 additions and 11 deletions

5
debian/changelog vendored
View file

@ -8,13 +8,14 @@ git-annex (3.20111212) UNRELEASED; urgency=low
* Test suite improvements. Current top-level test coverage: 75%
* Improve deletion of files from rsync special remotes. Closes: #652849
* Add --include, which is the same as --not --exclude.
* Can now be built with older git versions (before 1.7.7); the resulting
binary should only be used with old git.
* Format strings can be specified using the new --format option, to control
what is output by git annex find.
* Support git annex find --json
* Fixed behavior when multiple insteadOf configs are provided for the
same url base.
* Can now be built with older git versions (before 1.7.7); the resulting
binary should only be used with old git.
* Updated to build with monad-control 0.3.
-- Joey Hess <joeyh@debian.org> Mon, 12 Dec 2011 01:57:49 -0400

3
debian/control vendored
View file

@ -13,7 +13,8 @@ Build-Depends:
libghc-utf8-string-dev,
libghc-hs3-dev (>= 0.5.6),
libghc-testpack-dev [any-i386 any-amd64],
libghc-monad-control-dev,
libghc-monad-control-dev (>= 0.3),
libghc-lifted-base-dev,
libghc-json-dev,
ikiwiki,
perlmagick,