[DHG_packages] 03/03: Remove cabal (same version as ghc's)
Clint Adams
clint at moszumanska.debian.org
Tue Oct 25 18:59:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch experimental
in repository DHG_packages.
commit 10a35e9c70e46d0d3706566f1f6bc2c23831e422
Author: Clint Adams <clint at debian.org>
Date: Sun Oct 9 15:19:01 2016 -0400
Remove cabal (same version as ghc's)
---
p/haskell-cabal/debian/changelog | 88 ------------------
p/haskell-cabal/debian/compat | 1 -
p/haskell-cabal/debian/control | 56 -----------
p/haskell-cabal/debian/copyright | 46 ---------
.../debian/patches/cabal-show-detail-direct.patch | 103 ---------------------
p/haskell-cabal/debian/patches/series | 1 -
p/haskell-cabal/debian/rules | 9 --
p/haskell-cabal/debian/source/format | 1 -
p/haskell-cabal/debian/watch | 2 -
9 files changed, 307 deletions(-)
diff --git a/p/haskell-cabal/debian/changelog b/p/haskell-cabal/debian/changelog
deleted file mode 100644
index fb8b853..0000000
--- a/p/haskell-cabal/debian/changelog
+++ /dev/null
@@ -1,88 +0,0 @@
-haskell-cabal (1.22.8.0-2) UNRELEASED; urgency=medium
-
- * Fix VCS fields
-
- -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 02 Jun 2016 19:12:17 +0200
-
-haskell-cabal (1.22.8.0-1) unstable; urgency=medium
-
- [ Dmitry Bogatov ]
- * Use secure (https) uri in Vcs-Git field in 'debian/control'
- * Bump standards version to 3.9.8 (no changes needed)
-
- [ Joachim Breitner ]
- * New upstream release
-
- -- Joachim Breitner <nomeata at debian.org> Sat, 28 May 2016 13:40:53 +0200
-
-haskell-cabal (1.22.6.0-1) unstable; urgency=medium
-
- * New upstream release
-
- -- Sven Bartscher <sven.bartscher at weltraumschlangen.de> Tue, 15 Mar 2016 19:50:47 +0100
-
-haskell-cabal (1.22.5.0-2) unstable; urgency=medium
-
- * Backport patch to provide --show-detail=direct, mostly to work around
- problems with `setup test` on architectures with insufficient threading
- support in GHC (https://github.com/haskell/cabal/issues/2398). This
- matches a patch also in the ghc package, but we need it here as well for
- the sake of packages that build-depend on libghc-cabal-dev.
-
- -- Colin Watson <cjwatson at debian.org> Thu, 14 Jan 2016 11:08:17 +0000
-
-haskell-cabal (1.22.5.0-1) unstable; urgency=medium
-
- * New upstream release
-
- -- Dmitry Bogatov <KAction at gnu.org> Sat, 26 Dec 2015 16:18:17 +0300
-
-haskell-cabal (1.22.4.0-2) unstable; urgency=medium
-
- * Switch Vcs-Git/Vcs-Browser headers to new location.
-
- -- Clint Adams <clint at debian.org> Thu, 03 Dec 2015 14:54:09 -0500
-
-haskell-cabal (1.22.4.0-1) experimental; urgency=medium
-
- * New upstream release
- * Drop installing the user guide. It is a bunch of markdown files now. It
- can probably be resurrected, if someone feels like investing time here.
- * Depend on haskell-devscripts >= 0.10 to ensure that this package
- builds against GHC in experimental
-
- -- Joachim Breitner <nomeata at debian.org> Thu, 20 Aug 2015 10:27:06 +0200
-
-haskell-cabal (1.22.1.1-2) unstable; urgency=medium
-
- * Upload to unstable
-
- -- Joachim Breitner <nomeata at debian.org> Mon, 27 Apr 2015 11:48:07 +0200
-
-haskell-cabal (1.22.1.1-1) experimental; urgency=medium
-
- * New upstream version
- * Remove doc-sources (now distributed by upstream)
- * Remove quickcheck patch (fixed upstream)
- * Make debian/copyright comply dep5
-
- -- Dmitry Bogatov <KAction at gnu.org> Sun, 15 Mar 2015 13:49:03 +0300
-
-haskell-cabal (1.20.0.2-2) experimental; urgency=medium
-
- * Depend on haskell-devscripts 0.9, found in experimental
-
- -- Joachim Breitner <nomeata at debian.org> Sat, 20 Dec 2014 17:09:43 +0100
-
-haskell-cabal (1.20.0.2-1) unstable; urgency=medium
-
- * New upstream release
- * Add patch: quickcheck 2.7 compatibility
-
- -- Joachim Breitner <nomeata at debian.org> Wed, 30 Jul 2014 22:52:23 +0200
-
-haskell-cabal (1.20.0.1-1) unstable; urgency=low
-
- * Initial release.
-
- -- Joachim Breitner <nomeata at debian.org> Mon, 09 Jun 2014 12:02:18 +0200
diff --git a/p/haskell-cabal/debian/compat b/p/haskell-cabal/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/p/haskell-cabal/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/p/haskell-cabal/debian/control b/p/haskell-cabal/debian/control
deleted file mode 100644
index 90e72fb..0000000
--- a/p/haskell-cabal/debian/control
+++ /dev/null
@@ -1,56 +0,0 @@
-Source: haskell-cabal
-Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Joachim Breitner <nomeata at debian.org>, Dmitry Bogatov <KAction at gnu.org>
-Priority: extra
-Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10),
- cdbs,
- ghc,
- 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
- 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.
-
-Package: libghc-cabal-dev
-Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
- ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
-Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
- ${haskell:LongDescription}
- .
- ${haskell:Blurb}
-
-Package: libghc-cabal-prof
-Architecture: any
-Depends: ${haskell:Depends},
- ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
-Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
- ${haskell:LongDescription}
- .
- ${haskell:Blurb}
-
-Package: libghc-cabal-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends},
- ${haskell:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
- ${haskell:LongDescription}
- .
- ${haskell:Blurb}
diff --git a/p/haskell-cabal/debian/copyright b/p/haskell-cabal/debian/copyright
deleted file mode 100644
index 7fe66cc..0000000
--- a/p/haskell-cabal/debian/copyright
+++ /dev/null
@@ -1,46 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Cabal
-Source: http://hackage.haskell.org/package/Cabal
-
-Files: *
-Copyright: 2003-2014, Isaac Jones, Simon Marlow, Martin Sjögren,
- Bjorn Bringert, Krasimir Angelov,
- Malcolm Wallace, Ross Patterson, Ian Lynagh,
- Duncan Coutts, Thomas Schilling,
- Johan Tibell, Mikhail Glushenkov
-License: BSD-3-clause
-
-Files: debian/*
-Copyright: held by the contributors mentioned in debian/changelog
-License: BSD-3-clause
-
-License: BSD-3-clause
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- .
- * Neither the name of Isaac Jones nor the names of other
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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
diff --git a/p/haskell-cabal/debian/rules b/p/haskell-cabal/debian/rules
deleted file mode 100755
index ff23d1d..0000000
--- a/p/haskell-cabal/debian/rules
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/make -f
-
-# DEB_ENABLE_TESTS = yes
-
-clean::
- find \( -name \*.hi -o -name \*.o \) -delete
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/hlibrary.mk
diff --git a/p/haskell-cabal/debian/source/format b/p/haskell-cabal/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/p/haskell-cabal/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/p/haskell-cabal/debian/watch b/p/haskell-cabal/debian/watch
deleted file mode 100644
index c352ae4..0000000
--- a/p/haskell-cabal/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://hackage.haskell.org/package/Cabal/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--
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