summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-09-14 12:48:24 -0400
committerJoey Hess <joey@kitenet.net>2014-09-14 12:48:24 -0400
commitb26fb1cd59b98c326523e2f5c48db40300c83e6f (patch)
tree4cf9617810f4ceb3375b711d0fbd0904be74e290
parent2fc16172004b942bd67f47d07be75a4c9a1f79a8 (diff)
downloadgit-repair-b26fb1cd59b98c326523e2f5c48db40300c83e6f.tar.gz
Update to build with optparse-applicative 0.10. Closes: #761552
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rw-r--r--git-repair.cabal2
-rw-r--r--git-repair.hs2
4 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 23501f7..3b4015d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-repair (1.20140816) UNRELEASED; urgency=medium
+
+ * Update to build with optparse-applicative 0.10. Closes: #761552
+
+ -- Joey Hess <joeyh@debian.org> Sun, 14 Sep 2014 12:48:08 -0400
+
git-repair (1.20140815) unstable; urgency=medium
* Removing bad objects could leave fsck finding no more unreachable objects,
diff --git a/debian/control b/debian/control
index 2424681..37d0e80 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
libghc-quickcheck2-dev,
libghc-utf8-string-dev,
libghc-async-dev,
- libghc-optparse-applicative-dev
+ libghc-optparse-applicative-dev (>= 0.10.0)
Maintainer: Joey Hess <joeyh@debian.org>
Standards-Version: 3.9.5
Vcs-Git: git://git-repair.branchable.com/
diff --git a/git-repair.cabal b/git-repair.cabal
index 10ff51d..3972066 100644
--- a/git-repair.cabal
+++ b/git-repair.cabal
@@ -28,7 +28,7 @@ Executable git-repair
Build-Depends: MissingH, hslogger, directory, filepath, containers, mtl,
network, extensible-exceptions, unix-compat, bytestring,
base >= 4.5, base < 5, IfElse, text, process, time, QuickCheck,
- utf8-string, async, optparse-applicative
+ utf8-string, async, optparse-applicative (>= 0.10.0)
if (! os(windows))
Build-Depends: unix
diff --git a/git-repair.hs b/git-repair.hs
index 31c2fdf..bdd1670 100644
--- a/git-repair.hs
+++ b/git-repair.hs
@@ -37,7 +37,7 @@ parseSettings = Settings
( long "retry"
<> help "Retry tests in git-repair-test.log"
)
- <*> option
+ <*> option auto
( long "numtests"
<> short 'n'
<> metavar "N"