summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-24 15:28:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-24 16:22:07 -0400
commitce5637498fd4158f98376009dee2d22bec2d1f68 (patch)
treee529bad846ce43424c9b535206b75f3b53f6cdee /debian
parentba6088b249902d456177af3c14f20f43b6def1fd (diff)
remove Utility.Conditional and use IfElse
This drops the >>! and >>? with the nice low fixity. IfElse does have undocumented >>=>>! and >>=>>? operators, but I deem that too fishy. Anyway, using whenM and unlessM is easier; I sometimes mixed the operators up.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2f573e6d3..e1c861d19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (3.20120124) UNRELEASED; urgency=low
+
+ * Use the haskell IfElse library.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 24 Jan 2012 16:21:55 -0400
+
git-annex (3.20120123) unstable; urgency=low
* fsck --from: Fscking a remote is now supported. It's done by retrieving
diff --git a/debian/control b/debian/control
index 3f171a11c..c3ddad932 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends:
libghc-monad-control-dev (>= 0.3),
libghc-lifted-base-dev,
libghc-json-dev,
+ libghc-ifelse-dev,
ikiwiki,
perlmagick,
git,