Commit 6337d9e0 authored by Clint Adams's avatar Clint Adams

darcs: patch for newer deps

parent bbaf15cc
darcs (2.12.5-3) unstable; urgency=medium
* Patch for newer deps.
-- Clint Adams <clint@debian.org> Mon, 16 Apr 2018 22:28:07 -0400
darcs (2.12.5-2) unstable; urgency=medium
[ Sean Whitton ]
......
......@@ -11,60 +11,60 @@ Build-Depends:
ghc-prof,
haskell-devscripts (>= 0.13),
libcurl4-gnutls-dev (>= 7.19.1),
libghc-async-dev (<< 2.2),
libghc-async-dev (>= 2.0.1.4),
libghc-attoparsec-dev (<< 0.14),
libghc-async-dev (<< 2.3),
libghc-attoparsec-dev (>= 0.11),
libghc-base16-bytestring-dev (<< 0.2),
libghc-attoparsec-dev (<< 0.14),
libghc-base16-bytestring-dev (>= 0.1),
libghc-cryptohash-dev (<< 0.12),
libghc-base16-bytestring-dev (<< 0.2),
libghc-cryptohash-dev (>= 0.4),
libghc-data-ordlist-dev (<< 0.5),
libghc-cryptohash-dev (<< 0.12),
libghc-data-ordlist-dev (>= 0.4),
libghc-fgl-dev (<< 5.6),
libghc-data-ordlist-dev (<< 0.5),
libghc-fgl-dev (>= 5.5.0.1),
libghc-graphviz-dev (<< 2999.19),
libghc-fgl-dev (<< 5.7),
libghc-graphviz-dev (>= 2999.17.0.1),
libghc-hashable-dev (<< 1.3),
libghc-graphviz-dev (<< 2999.19),
libghc-hashable-dev (>= 1.1.2.5),
libghc-html-dev (<< 1.1),
libghc-hashable-dev (<< 1.3),
libghc-html-dev (>= 1.0.1.2),
libghc-http-dev (<< 1:4000.4),
libghc-html-dev (<< 1.1),
libghc-http-dev (>= 1:4000.2.8),
libghc-http-dev (<< 1:4000.4),
libghc-http-prof,
libghc-mmap-dev (<< 0.6),
libghc-mmap-dev (>= 0.5),
libghc-mtl-dev (<< 2.3),
libghc-mmap-dev (<< 0.6),
libghc-mtl-dev (>= 2.1.2),
libghc-mtl-dev (<< 2.3),
libghc-mtl-prof,
libghc-network-dev (<< 2.7),
libghc-network-dev (>= 2.6),
libghc-network-prof,
libghc-network-uri-dev (<< 2.7),
libghc-network-uri-dev (>= 2.6),
libghc-network-uri-dev (<< 2.7),
libghc-network-uri-prof,
libghc-old-time-dev (<< 1.2),
libghc-old-time-dev (>= 1.1),
libghc-parsec3-dev (<< 3.2),
libghc-old-time-dev (<< 1.2),
libghc-parsec3-dev (>= 3.1),
libghc-random-dev (<< 1.2),
libghc-parsec3-dev (<< 3.2),
libghc-random-dev (>= 1.0.1.1),
libghc-regex-applicative-dev (<< 0.4),
libghc-random-dev (<< 1.2),
libghc-regex-applicative-dev (>= 0.2),
libghc-regex-compat-tdfa-dev (<< 0.96),
libghc-regex-applicative-dev (<< 0.4),
libghc-regex-compat-tdfa-dev (>= 0.95.1),
libghc-regex-compat-tdfa-dev (<< 0.96),
libghc-regex-compat-tdfa-prof,
libghc-sandi-dev (<< 0.5),
libghc-sandi-dev (>= 0.4),
libghc-sandi-dev (<< 0.5),
libghc-sandi-prof,
libghc-tar-dev (<< 0.6),
libghc-tar-dev (>= 0.4),
libghc-text-dev (<< 1.3),
libghc-tar-dev (<< 0.6),
libghc-text-dev (>= 1.2.1.3),
libghc-transformers-compat-dev (<< 0.6),
libghc-text-dev (<< 1.3),
libghc-transformers-compat-dev (>= 0.4),
libghc-unix-compat-dev (<< 0.5),
libghc-transformers-compat-dev (<< 0.6),
libghc-unix-compat-dev (>= 0.1.2),
libghc-unix-compat-dev (<< 0.5),
libghc-utf8-string-dev (>= 0.3.6),
libghc-utf8-string-dev (<< 1.1),
libghc-utf8-string-prof,
......
Index: darcs/Setup.lhs
===================================================================
--- darcs.orig/Setup.lhs 2015-07-09 18:48:56.000000000 +0200
+++ darcs/Setup.lhs 2015-07-15 19:07:44.318794915 +0200
--- a/Setup.lhs
+++ b/Setup.lhs
@@ -1,5 +1,4 @@
\begin{code}
-{-# LANGUAGE TemplateHaskell #-}
-- copyright (c) 2008 Duncan Coutts
-- portions copyright (c) 2008 David Roundy
-- portions copyright (c) 2007-2009 Judah Jacobson
@@ -81,17 +80,20 @@
@@ -78,17 +77,20 @@
catchAny f h = Exception.catch f (\e -> h (e :: Exception.SomeException))
{- Template Haskell hackery for replHook while we want to support Cabal < 1.18 -}
......@@ -30,7 +28,7 @@ Index: darcs/Setup.lhs
addReplHook =
$(if cabalVersion >= Version [1,18,0] []
then
@@ -101,6 +103,8 @@
@@ -98,6 +100,8 @@
lamE [varP hooks] (recUpdE (varE hooks) [return (replHook, app)])
else [| \hooks -> hooks |]
)
......
--- a/darcs.cabal
+++ b/darcs.cabal
@@ -399,7 +399,7 @@
-- transition
transformers-compat >= 0.4 && < 0.6,
parsec >= 3.1 && < 3.2,
- fgl >= 5.5.0.1 && < 5.6,
+ fgl >= 5.5.0.1 && < 5.7,
graphviz >= 2999.17.0.1 && < 2999.19,
html >= 1.0.1.2 && < 1.1,
filepath >= 1.3.0.1 && < 1.5.0.0,
@@ -412,7 +412,7 @@
data-ordlist == 0.4.*,
attoparsec >= 0.11 && < 0.14,
zip-archive >= 0.2.3 && < 0.4,
- async >= 2.0.1.4 && < 2.2,
+ async >= 2.0.1.4 && < 2.3,
sandi >= 0.4 && < 0.5,
unix-compat >= 0.1.2 && < 0.5,
bytestring >= 0.10.0.2 && < 0.11,
use-sensible-editor
avoid-TH-in-Setup
newer-deps
......@@ -11,7 +11,7 @@ Description: use editor(1) and pager(1) instead of specific editors/pagers.
Not forwarded because editor(1) and pager(1) are Debian-specific.
--- a/src/Darcs/UI/External.hs
+++ b/src/Darcs/UI/External.hs
@@ -432,6 +432,7 @@ viewDocWith pr mode msg = do
@@ -432,6 +432,7 @@
Nothing -> return $ ExitFailure 127 -- No such command
-- TEMPORARY passing the -K option should be removed as soon as
-- we can use the delegate_ctrl_c feature in process
......@@ -19,7 +19,7 @@ Description: use editor(1) and pager(1) instead of specific editors/pagers.
`ortryrunning` pipeDocToPager "less" ["-RK"] pr mode msg
`ortryrunning` pipeDocToPager "more" [] pr mode msg
#ifdef WIN32
@@ -512,19 +513,13 @@ runEditor :: FilePath
@@ -512,19 +513,13 @@
runEditor f = do
ed <- getEditor
execInteractive ed f
......@@ -42,7 +42,7 @@ Description: use editor(1) and pager(1) instead of specific editors/pagers.
-> IO a
--- a/src/Darcs/UI/Commands/Help.hs
+++ b/src/Darcs/UI/Commands/Help.hs
@@ -400,15 +400,13 @@ environmentHelpEditor = (["DARCS_EDITOR"
@@ -399,15 +399,13 @@
"To edit a patch description of email comment, Darcs will invoke an",
"external editor. Your preferred editor can be set as any of the",
"environment variables $DARCS_EDITOR, $DARCSEDITOR, $VISUAL or $EDITOR.",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment