summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control1
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 61b10c80f..f3e830c01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ git-annex (3.20111212) UNRELEASED; urgency=low
* 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.
diff --git a/debian/control b/debian/control
index a3035e880..3f88c71ea 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
libghc-hs3-dev (>= 0.5.6),
libghc-testpack-dev [any-i386 any-amd64],
libghc-monad-control-dev (>= 0.3),
+ libghc-lifted-base-dev,
libghc-json-dev,
ikiwiki,
perlmagick,