summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--debian/control2
-rw-r--r--doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn2
3 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 33d196fa3..61b10c80f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,12 @@ 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
+ * 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..a3035e880 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ 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-json-dev,
ikiwiki,
perlmagick,
diff --git a/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn b/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn
index ca68c2c91..f82224991 100644
--- a/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn
+++ b/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn
@@ -5,3 +5,5 @@ Git-annex doesn't compile with the latest version of monad-control. Would it be
>
> There is now a branch in git called `new-monad-control` that will build
> with the new monad-control. --[[Joey]]
+
+>> Now merged to master. [[done]] --[[Joey]]