Commit c97c5ec0 authored by Clint Adams's avatar Clint Adams

darcs: patch for newer fgl and graphviz. closes: #899392.

parent e11e8a44
darcs (2.14.0-1) unstable; urgency=medium
* Set Rules-Requires-Root to no.
* New upstream release
* New upstream release.
* Patch for newer fgl and graphviz. closes: #899392.
-- Clint Adams <clint@debian.org> Thu, 24 May 2018 21:40:09 -0400
......
......@@ -28,10 +28,8 @@ Build-Depends:
libghc-data-ordlist-dev (<< 0.5),
libghc-data-ordlist-prof,
libghc-fgl-dev (>= 5.5.2.3),
libghc-fgl-dev (<< 5.6),
libghc-fgl-prof,
libghc-graphviz-dev (>= 2999.18.1),
libghc-graphviz-dev (<< 2999.20),
libghc-graphviz-prof,
libghc-hashable-dev (>= 1.2.3.3),
libghc-hashable-dev (<< 1.3),
......
--- 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
@@ -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 -}
+{-
replVerbosity =
$(if cabalVersion >= Version [1,18,0] []
then varE (mkName "DSS.replVerbosity")
else [| error "This shouldn't be called" |]
)
+-}
replHookBody replHookSel =
\pkg lbi hooks flags args ->
- let verb = fromFlag $ replVerbosity flags
+ let verb = fromFlag $ DSS.replVerbosity flags
in commonBuildHook replHookSel pkg lbi hooks verb >>= (\f -> f flags args)
+{-
addReplHook =
$(if cabalVersion >= Version [1,18,0] []
then
@@ -98,6 +100,8 @@
lamE [varP hooks] (recUpdE (varE hooks) [return (replHook, app)])
else [| \hooks -> hooks |]
)
+-}
+addReplHook = \hooks -> hooks { replHook = replHookBody replHook }
{- End of Template Haskell hackery -}
main :: IO ()
--- 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,
@@ -389,8 +389,8 @@
mtl >= 2.2.1 && < 2.3,
transformers >= 0.4.2.0 && < 0.6,
parsec >= 3.1.9 && < 3.2,
- fgl >= 5.5.2.3 && < 5.6,
- graphviz >= 2999.18.1 && < 2999.20,
+ fgl >= 5.5.2.3,
+ graphviz >= 2999.18.1,
html >= 1.0.1.2 && < 1.1,
filepath >= 1.4.1 && < 1.5.0.0,
haskeline >= 0.7.2 && < 0.8,
use-sensible-editor
avoid-TH-in-Setup
newer-deps
Author: Trent W. Buck <trentbuck@gmail.com>
Forwarded: not-needed
Bug-Debian: http://www.debian.org/doc/debian-policy/ch-customized-programs.html#s11.4
Description: use editor(1) and pager(1) instead of specific editors/pagers.
Follow Debian Policy §11.4 - honour VISUAL, EDITOR and PAGER, but fall back on
editor and pager respectively. This allows the sysadmin to define site-local
editor/pager defaults. It also means things work when less and vi/emacs/nano
aren't installed -- which is the case on a new Debian installation if you
uncheck the "standard" tasksel task.
.
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 @@
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
+ `ortryrunning` pipeDocToPager "pager" [] pr mode msg
`ortryrunning` pipeDocToPager "less" ["-RK"] pr mode msg
`ortryrunning` pipeDocToPager "more" [] pr mode msg
#ifdef WIN32
@@ -512,19 +513,13 @@
runEditor f = do
ed <- getEditor
execInteractive ed f
- `ortryrunning` execInteractive "vi" f
- `ortryrunning` execInteractive "emacs" f
- `ortryrunning` execInteractive "emacs -nw" f
-#ifdef WIN32
- `ortryrunning` execInteractive "edit" f
-#endif
getEditor :: IO String
getEditor = getEnv "DARCS_EDITOR" `catchall`
getEnv "DARCSEDITOR" `catchall`
getEnv "VISUAL" `catchall`
- getEnv "EDITOR" `catchall` return "nano"
+ getEnv "EDITOR" `catchall` return "editor"
catchall :: IO a
-> IO a
--- a/src/Darcs/UI/Commands/Help.hs
+++ b/src/Darcs/UI/Commands/Help.hs
@@ -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.",
- "If none of these are set, vi(1) is used. If vi crashes or is not",
- "found in your PATH, emacs, emacs -nw, nano and (on Windows) edit are",
- "each tried in turn."])
+ "If none of these are set, editor(1) is used."])
environmentHelpPager :: ([String], [String])
environmentHelpPager = (["DARCS_PAGER", "PAGER"],[
"Darcs will invoke a pager if the output of some command is longer",
"than 20 lines. Darcs will use the pager specified by $DARCS_PAGER",
- "or $PAGER. If neither are set, `less` will be used."])
+ "or $PAGER. If neither are set, pager(1) will be used."])
environmentHelpTimeout :: ([String], [String])
environmentHelpTimeout = (["DARCS_CONNECTION_TIMEOUT"],[
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