diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-30 20:06:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-30 20:08:01 -0400 |
| commit | 8f4fdb3f9782fd39e48cb0a6d3e82866b9b1a976 (patch) | |
| tree | 12bd96c3d3b47b203f0fac44977a558b183cb13a /debian | |
| parent | 5287d1dc3f293b6eb7f6759fe9f25be1ad85fbae (diff) | |
| parent | 85f1f3a63a025204e931959ec9c5ae2a7812ddff (diff) | |
Merge branch 'new-monad-control'
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index bbed54765..f3e830c01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/control b/debian/control index 6f59ada5b..3f88c71ea 100644 --- a/debian/control +++ b/debian/control @@ -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, |