summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--git-repair.cabal11
2 files changed, 16 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d5d8af3..438a7ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-repair (1.20141027) UNRELEASED; urgency=medium
+
+ * Adjust cabal file to support network-uri split.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 27 Oct 2014 11:06:23 -0400
+
git-repair (1.20141026) unstable; urgency=medium
* Prevent auto gc from happening when fetching from a remote.
diff --git a/git-repair.cabal b/git-repair.cabal
index 67573f4..0696576 100644
--- a/git-repair.cabal
+++ b/git-repair.cabal
@@ -22,14 +22,23 @@ Description:
using git-repair can help rescue commits you've made to the damaged
repository and not yet pushed out.
+Flag network-uri
+ Description: Get Network.URI from the network-uri package
+ Default: True
+
Executable git-repair
Main-Is: git-repair.hs
GHC-Options: -Wall -threaded
Build-Depends: MissingH, hslogger, directory, filepath, containers, mtl,
- network, unix-compat, bytestring, exceptions (>= 0.6), transformers,
+ unix-compat, bytestring, exceptions (>= 0.6), transformers,
base >= 4.5, base < 5, IfElse, text, process, time, QuickCheck,
utf8-string, async, optparse-applicative (>= 0.10.0)
+ if flag(network-uri)
+ Build-Depends: network-uri (>= 2.6), network (>= 2.6)
+ else
+ Build-Depends: network (< 2.6), network (>= 2.0)
+
if (os(windows))
Build-Depends: setenv
else