[DHG_packages] 02/02: Cabal: Upgrading from 1.22.8.0 to 1.24.1.0
Clint Adams
clint at moszumanska.debian.org
Thu Nov 10 05:14:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch master
in repository DHG_packages.
commit 4697c944754614c19119cd19efe81bdef965acc9
Author: Clint Adams <clint at debian.org>
Date: Thu Nov 10 00:10:25 2016 -0500
Cabal: Upgrading from 1.22.8.0 to 1.24.1.0
---
p/haskell-cabal/debian/changelog | 6 +-
p/haskell-cabal/debian/control | 6 +-
.../debian/patches/cabal-show-detail-direct.patch | 103 ---------------------
p/haskell-cabal/debian/patches/series | 1 -
4 files changed, 6 insertions(+), 110 deletions(-)
diff --git a/p/haskell-cabal/debian/changelog b/p/haskell-cabal/debian/changelog
index fb8b853..7785846 100644
--- a/p/haskell-cabal/debian/changelog
+++ b/p/haskell-cabal/debian/changelog
@@ -1,8 +1,8 @@
-haskell-cabal (1.22.8.0-2) UNRELEASED; urgency=medium
+haskell-cabal (1.24.1.0-1) unstable; urgency=medium
- * Fix VCS fields
+ * New upstream release
- -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 02 Jun 2016 19:12:17 +0200
+ -- Clint Adams <clint at debian.org> Thu, 10 Nov 2016 00:10:25 -0500
haskell-cabal (1.22.8.0-1) unstable; urgency=medium
diff --git a/p/haskell-cabal/debian/control b/p/haskell-cabal/debian/control
index 90e72fb..c35789f 100644
--- a/p/haskell-cabal/debian/control
+++ b/p/haskell-cabal/debian/control
@@ -4,16 +4,16 @@ Uploaders: Joachim Breitner <nomeata at debian.org>, Dmitry Bogatov <KAction at gnu.or
Priority: extra
Section: haskell
Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10),
+ haskell-devscripts (>= 0.13),
cdbs,
- ghc,
+ ghc (>= 8),
ghc-prof,
Build-Depends-Indep: ghc-doc,
Standards-Version: 3.9.8
Homepage: http://www.haskell.org/cabal/
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
-X-Description: Framework for packaging Haskell software
+X-Description: framework for packaging Haskell software
The Haskell Common Architecture for Building Applications and
Libraries: a framework defining a common interface for authors to more
easily build their Haskell applications in a portable way.
diff --git a/p/haskell-cabal/debian/patches/cabal-show-detail-direct.patch b/p/haskell-cabal/debian/patches/cabal-show-detail-direct.patch
deleted file mode 100644
index b4ae2ed..0000000
--- a/p/haskell-cabal/debian/patches/cabal-show-detail-direct.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-commit 3792d212a6f60573ef43dd72088a353725d09461
-Author: Joachim Breitner <mail at joachim-breitner.de>
-Date: Thu Nov 5 11:31:12 2015 +0100
-
- test: New mode --show-details=direct
-
- This mode implements #2911, and allows to connect the test runner
- directly to stdout/stdin. This is more reliable in the presence of no
- threading, i.e. a work-arond for #2398.
-
- I make the test suite use this, so that it passes again, despite
- printing lots of stuff. Once #2398 is fixed properly, the test suite
- should probably be extended to test all the various --show-details
- modes.
-
-Index: b/Distribution/Simple/Setup.hs
-===================================================================
---- a/Distribution/Simple/Setup.hs
-+++ b/Distribution/Simple/Setup.hs
-@@ -1725,7 +1725,7 @@
- -- * Test flags
- -- ------------------------------------------------------------
-
--data TestShowDetails = Never | Failures | Always | Streaming
-+data TestShowDetails = Never | Failures | Always | Streaming | Direct
- deriving (Eq, Ord, Enum, Bounded, Show)
-
- knownTestShowDetails :: [TestShowDetails]
-@@ -1813,7 +1813,8 @@
- ("'always': always show results of individual test cases. "
- ++ "'never': never show results of individual test cases. "
- ++ "'failures': show results of failing test cases. "
-- ++ "'streaming': show results of test cases in real time.")
-+ ++ "'streaming': show results of test cases in real time."
-+ ++ "'direct': send results of test cases in real time; no log file.")
- testShowDetails (\v flags -> flags { testShowDetails = v })
- (reqArg "FILTER"
- (readP_to_E (\_ -> "--show-details flag expects one of "
-Index: b/Distribution/Simple/Test/ExeV10.hs
-===================================================================
---- a/Distribution/Simple/Test/ExeV10.hs
-+++ b/Distribution/Simple/Test/ExeV10.hs
-@@ -30,7 +30,7 @@
- , getCurrentDirectory, removeDirectoryRecursive )
- import System.Exit ( ExitCode(..) )
- import System.FilePath ( (</>), (<.>) )
--import System.IO ( hGetContents, hPutStr, stdout )
-+import System.IO ( hGetContents, hPutStr, stdout, stderr )
-
- runTest :: PD.PackageDescription
- -> LBI.LocalBuildInfo
-@@ -63,15 +63,20 @@
- -- Write summary notices indicating start of test suite
- notice verbosity $ summarizeSuiteStart $ PD.testName suite
-
-- (rOut, wOut) <- createPipe
-+ (wOut, wErr, logText) <- case details of
-+ Direct -> return (stdout, stderr, "")
-+ _ -> do
-+ (rOut, wOut) <- createPipe
-+
-+ -- Read test executable's output lazily (returns immediately)
-+ logText <- hGetContents rOut
-+ -- Force the IO manager to drain the test output pipe
-+ void $ forkIO $ length logText `seq` return ()
-
-- -- Read test executable's output lazily (returns immediately)
-- logText <- hGetContents rOut
-- -- Force the IO manager to drain the test output pipe
-- void $ forkIO $ length logText `seq` return ()
-+ -- '--show-details=streaming': print the log output in another thread
-+ when (details == Streaming) $ void $ forkIO $ hPutStr stdout logText
-
-- -- '--show-details=streaming': print the log output in another thread
-- when (details == Streaming) $ void $ forkIO $ hPutStr stdout logText
-+ return (wOut, wOut, logText)
-
- -- Run the test executable
- let opts = map (testOption pkg_descr lbi suite)
-@@ -93,7 +98,7 @@
-
- exit <- rawSystemIOWithEnv verbosity cmd opts Nothing (Just shellEnv')
- -- these handles are automatically closed
-- Nothing (Just wOut) (Just wOut)
-+ Nothing (Just wOut) (Just wErr)
-
- -- Generate TestSuiteLog from executable exit code and a machine-
- -- readable test log.
-@@ -112,12 +117,10 @@
- -- Show the contents of the human-readable log file on the terminal
- -- if there is a failure and/or detailed output is requested
- let whenPrinting = when $
-- (details > Never)
-- && (not (suitePassed $ testLogs suiteLog) || details == Always)
-+ ( details == Always ||
-+ details == Failures && not (suitePassed $ testLogs suiteLog))
- -- verbosity overrides show-details
- && verbosity >= normal
-- -- if streaming, we already printed the log
-- && details /= Streaming
- whenPrinting $ putStr $ unlines $ lines logText
-
- -- Write summary notice to terminal indicating end of test suite
diff --git a/p/haskell-cabal/debian/patches/series b/p/haskell-cabal/debian/patches/series
deleted file mode 100644
index b836fef..0000000
--- a/p/haskell-cabal/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-cabal-show-detail-direct.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list