[Pkg-haskell-commits] [package-plan] 01/01: Bump darcs

Mon May 25 10:22:23 UTC 2015

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository package-plan.

commit db48f7e3530d84fb752db7e485ca69aa1b93614c
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon May 25 12:22:00 2015 +0200

    Bump darcs
---
 packages.txt                                   |  2 +-
 patches/darcs/2.10.0/relax-terminfo-dependency | 13 +++++
 patches/darcs/2.10.0/series                    |  2 +
 patches/darcs/2.10.0/use-sensible-editor       | 66 ++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/packages.txt b/packages.txt
index 6e0def7..0fb64f1 100644
--- a/packages.txt
+++ b/packages.txt
@@ -149,7 +149,7 @@ css-text 0.1.2.1
 csv 0.1.2
 csv-conduit 0.6.6
 curl 1.3.8
-darcs 2.8.5 -flibrary -fforce-char8-encoding -fcurl -fterminfo -fmmap
+darcs 2.10.0 binary=darcs -fpkgconfig -fcurl -f-http -fterminfo notest
 darcs-monitor 0.4.2 ignore # binary broken, HaXml dependency too old
 data-accessor 0.2.2.6
 data-accessor-mtl 0.2.0.4
diff --git a/patches/darcs/2.10.0/relax-terminfo-dependency b/patches/darcs/2.10.0/relax-terminfo-dependency
new file mode 100644
index 0000000..ab2c393
--- /dev/null
+++ b/patches/darcs/2.10.0/relax-terminfo-dependency
@@ -0,0 +1,13 @@
+Index: darcs-2.10.0/darcs.cabal
+===================================================================
+--- darcs-2.10.0.orig/darcs.cabal	2015-05-25 12:04:42.223855913 +0200
++++ darcs-2.10.0/darcs.cabal	2015-05-25 12:13:32.567727009 +0200
+@@ -501,7 +501,7 @@
+ 
+     -- The terminfo package cannot be built on Windows.
+     if flag(terminfo) && !os(windows)
+-      build-depends:    terminfo == 0.3.*
++      build-depends:    terminfo >= 0.3
+       cpp-options:      -DHAVE_TERMINFO
+ 
+     -- if true to work around cabal bug with flag ordering
diff --git a/patches/darcs/2.10.0/series b/patches/darcs/2.10.0/series
new file mode 100644
index 0000000..f6a8538
--- /dev/null
+++ b/patches/darcs/2.10.0/series
@@ -0,0 +1,2 @@
+use-sensible-editor
+relax-terminfo-dependency
diff --git a/patches/darcs/2.10.0/use-sensible-editor b/patches/darcs/2.10.0/use-sensible-editor
new file mode 100644
index 0000000..8afe1d4
--- /dev/null
+++ b/patches/darcs/2.10.0/use-sensible-editor
@@ -0,0 +1,66 @@
+Author:         Trent W. Buck <trentbuck at 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.
+Index: darcs-2.10.0/src/Darcs/UI/External.hs
+===================================================================
+--- darcs-2.10.0.orig/src/Darcs/UI/External.hs	2015-05-25 12:04:33.571791462 +0200
++++ darcs-2.10.0/src/Darcs/UI/External.hs	2015-05-25 12:07:46.117213727 +0200
+@@ -438,6 +438,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
+@@ -518,19 +519,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
+Index: darcs-2.10.0/src/Darcs/UI/Commands/Help.hs
+===================================================================
+--- darcs-2.10.0.orig/src/Darcs/UI/Commands/Help.hs	2015-05-25 12:04:33.575791492 +0200
++++ darcs-2.10.0/src/Darcs/UI/Commands/Help.hs	2015-05-25 12:09:14.421858922 +0200
+@@ -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 sometimes invoke a pager if it deems output to be too long",
+  "to fit onscreen.  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"],[

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git

