[Git][haskell-team/DHG_packages][master] 2 commits: darcs: Upgrading from 2.12.5 to 2.14.0
Clint Adams
gitlab at salsa.debian.org
Fri May 25 02:59:38 BST 2018
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
e11e8a44 by Clint Adams at 2018-05-24T21:43:38-04:00
darcs: Upgrading from 2.12.5 to 2.14.0
- - - - -
c97c5ec0 by Clint Adams at 2018-05-24T21:58:40-04:00
darcs: patch for newer fgl and graphviz. closes: #899392.
- - - - -
6 changed files:
- p/darcs/debian/changelog
- p/darcs/debian/control
- − p/darcs/debian/patches/avoid-TH-in-Setup
- p/darcs/debian/patches/newer-deps
- p/darcs/debian/patches/series
- − p/darcs/debian/patches/use-sensible-editor
Changes:
=====================================
p/darcs/debian/changelog
=====================================
--- a/p/darcs/debian/changelog
+++ b/p/darcs/debian/changelog
@@ -1,8 +1,10 @@
-darcs (2.12.5-4) UNRELEASED; urgency=medium
+darcs (2.14.0-1) unstable; urgency=medium
* Set Rules-Requires-Root to no.
+ * New upstream release.
+ * Patch for newer fgl and graphviz. closes: #899392.
- -- Clint Adams <clint at debian.org> Sun, 06 May 2018 22:09:10 -0400
+ -- Clint Adams <clint at debian.org> Thu, 24 May 2018 21:40:09 -0400
darcs (2.12.5-3) unstable; urgency=medium
=====================================
p/darcs/debian/control
=====================================
--- a/p/darcs/debian/control
+++ b/p/darcs/debian/control
@@ -4,38 +4,42 @@ Priority: optional
Section: haskell
Rules-Requires-Root: no
Build-Depends:
+ haskell-devscripts (>= 0.13),
bash-completion (>= 1:1.1),
cdbs,
debhelper (>= 10),
- ghc (>= 8),
+ libcurl4-gnutls-dev (>= 7.19.1),
ghc (>= 8),
ghc-prof,
- haskell-devscripts (>= 0.13),
- libcurl4-gnutls-dev (>= 7.19.1),
- libghc-async-dev (>= 2.0.1.4),
- libghc-async-dev (<< 2.3),
- libghc-attoparsec-dev (>= 0.11),
+ libghc-http-dev (>= 1:4000.2.20),
+ libghc-http-dev (<< 1:4000.4),
+ libghc-http-prof,
+ libghc-async-dev (>= 2.0.2),
+ libghc-async-dev (<< 2.2),
+ libghc-async-prof,
+ libghc-attoparsec-dev (>= 0.13.0.1),
libghc-attoparsec-dev (<< 0.14),
libghc-base16-bytestring-dev (>= 0.1),
libghc-base16-bytestring-dev (<< 0.2),
- libghc-cryptohash-dev (>= 0.4),
+ libghc-base16-bytestring-prof,
+ libghc-cryptohash-dev (>= 0.11),
libghc-cryptohash-dev (<< 0.12),
libghc-data-ordlist-dev (>= 0.4),
libghc-data-ordlist-dev (<< 0.5),
- libghc-fgl-dev (>= 5.5.0.1),
- libghc-fgl-dev (<< 5.7),
- libghc-graphviz-dev (>= 2999.17.0.1),
- libghc-graphviz-dev (<< 2999.19),
- libghc-hashable-dev (>= 1.1.2.5),
+ libghc-data-ordlist-prof,
+ libghc-fgl-dev (>= 5.5.2.3),
+ libghc-fgl-prof,
+ libghc-graphviz-dev (>= 2999.18.1),
+ libghc-graphviz-prof,
+ libghc-hashable-dev (>= 1.2.3.3),
libghc-hashable-dev (<< 1.3),
libghc-html-dev (>= 1.0.1.2),
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.5),
+ libghc-html-prof,
+ libghc-mmap-dev (>= 0.5.9),
libghc-mmap-dev (<< 0.6),
- libghc-mtl-dev (>= 2.1.2),
+ libghc-mmap-prof,
+ libghc-mtl-dev (>= 2.2.1),
libghc-mtl-dev (<< 2.3),
libghc-mtl-prof,
libghc-network-dev (<< 2.7),
@@ -44,11 +48,13 @@ Build-Depends:
libghc-network-uri-dev (>= 2.6),
libghc-network-uri-dev (<< 2.7),
libghc-network-uri-prof,
- libghc-old-time-dev (>= 1.1),
+ libghc-old-time-dev (>= 1.1.0.3),
libghc-old-time-dev (<< 1.2),
- libghc-parsec3-dev (>= 3.1),
+ libghc-old-time-prof,
+ libghc-parsec3-dev (>= 3.1.9),
libghc-parsec3-dev (<< 3.2),
- libghc-random-dev (>= 1.0.1.1),
+ libghc-parsec3-prof,
+ libghc-random-dev (>= 1.1),
libghc-random-dev (<< 1.2),
libghc-regex-applicative-dev (>= 0.2),
libghc-regex-applicative-dev (<< 0.4),
@@ -58,24 +64,32 @@ Build-Depends:
libghc-sandi-dev (>= 0.4),
libghc-sandi-dev (<< 0.5),
libghc-sandi-prof,
- libghc-tar-dev (>= 0.4),
+ libghc-stm-dev (>= 2.1),
+ libghc-stm-dev (<< 2.5),
+ libghc-stm-prof,
+ libghc-tar-dev (>= 0.5),
libghc-tar-dev (<< 0.6),
+ libghc-tar-prof,
+ libghc-temporary-dev (>= 1.2.0.4),
+ libghc-temporary-dev (<< 1.3),
+ libghc-temporary-prof,
libghc-text-dev (>= 1.2.1.3),
libghc-text-dev (<< 1.3),
- libghc-transformers-compat-dev (>= 0.4),
- 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-text-prof,
+ libghc-unix-compat-dev (>= 0.4.2),
+ libghc-unix-compat-dev (<< 0.6),
+ libghc-unix-compat-prof,
+ libghc-utf8-string-dev (>= 1),
libghc-utf8-string-dev (<< 1.1),
libghc-utf8-string-prof,
- libghc-vector-dev (>= 0.10.0.1),
+ libghc-vector-dev (>= 0.11),
libghc-vector-dev (<< 0.13),
libghc-vector-prof,
- libghc-zip-archive-dev (>= 0.2.3),
+ libghc-zip-archive-dev (>= 0.3),
libghc-zip-archive-dev (<< 0.4),
+ libghc-zip-archive-prof,
+ libghc-zlib-dev (>= 0.6.1.2),
libghc-zlib-dev (<< 0.7.0.0),
- libghc-zlib-dev (>= 0.5.4.1),
libghc-zlib-prof,
pkg-config,
Build-Depends-Indep:
@@ -100,9 +114,10 @@ Build-Depends-Indep:
libghc-regex-applicative-doc,
libghc-regex-compat-tdfa-doc,
libghc-sandi-doc,
+ libghc-stm-doc,
libghc-tar-doc,
+ libghc-temporary-doc,
libghc-text-doc,
- libghc-transformers-compat-doc,
libghc-unix-compat-doc,
libghc-utf8-string-doc,
libghc-vector-doc,
=====================================
p/darcs/debian/patches/avoid-TH-in-Setup deleted
=====================================
--- a/p/darcs/debian/patches/avoid-TH-in-Setup
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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 ()
=====================================
p/darcs/debian/patches/newer-deps
=====================================
--- a/p/darcs/debian/patches/newer-deps
+++ b/p/darcs/debian/patches/newer-deps
@@ -1,20 +1,13 @@
--- 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,
=====================================
p/darcs/debian/patches/series
=====================================
--- a/p/darcs/debian/patches/series
+++ b/p/darcs/debian/patches/series
@@ -1,3 +1 @@
-use-sensible-editor
-avoid-TH-in-Setup
newer-deps
=====================================
p/darcs/debian/patches/use-sensible-editor deleted
=====================================
--- a/p/darcs/debian/patches/use-sensible-editor
+++ /dev/null
@@ -1,62 +0,0 @@
-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.
---- 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"],[
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/ab53e1f02053603a574ab86e022db97c1a6420d1...c97c5ec0bddaf377177fea398bec2badf7737049
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/ab53e1f02053603a574ab86e022db97c1a6420d1...c97c5ec0bddaf377177fea398bec2badf7737049
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180525/b817d4e0/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list