diff options
| -rw-r--r-- | Test.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
4 files changed, 3 insertions, 6 deletions
@@ -112,15 +112,11 @@ main ps = do ) where parseOpts pprefs pinfo args = -#if MIN_VERSION_optparse_applicative(0,10,0) case execParserPure pprefs pinfo args of (Options.Applicative.Failure failure) -> do let (msg, _exit) = renderFailure failure "git-annex test" error msg v -> handleParseResult v -#else - handleParseResult $ execParserPure pprefs pinfo args -#endif ingredients :: [Ingredient] ingredients = diff --git a/debian/changelog b/debian/changelog index 40ec4d300..a357e3fe6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ git-annex (5.20150618) UNRELEASED; urgency=medium reflog. This provides a way to not consider old versions of files to be unused after they have reached a specified age, when the old refs in the reflog expire. + * Removed support for optparse-applicative versions older than 0.10. -- Joey Hess <id@joeyh.name> Thu, 02 Jul 2015 12:31:14 -0400 diff --git a/debian/control b/debian/control index 9fc8d2bc3..b89edc600 100644 --- a/debian/control +++ b/debian/control @@ -69,7 +69,7 @@ Build-Depends: libghc-tasty-hunit-dev, libghc-tasty-quickcheck-dev, libghc-tasty-rerun-dev, - libghc-optparse-applicative-dev, + libghc-optparse-applicative-dev (>= 0.10), lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any], ikiwiki, perlmagick, diff --git a/git-annex.cabal b/git-annex.cabal index a53eecabb..941067f5d 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -164,7 +164,7 @@ Executable git-annex if flag(TestSuite) Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun, - optparse-applicative (>= 0.9.1), crypto-api + optparse-applicative (>= 0.10), crypto-api CPP-Options: -DWITH_TESTSUITE if flag(TDFA) |