diff -Nru haskell-fgl-5.6.0.0/ChangeLog haskell-fgl-5.7.0.1/ChangeLog --- haskell-fgl-5.6.0.0/ChangeLog 2017-08-09 13:06:44.000000000 +0000 +++ haskell-fgl-5.7.0.1/ChangeLog 2018-11-26 14:11:18.000000000 +0000 @@ -1,3 +1,14 @@ +5.7.0.1 +------- + +* Accidentally released the wrong version. + +5.7.0.0 +------- + +* Updating the GraphM class to be compatible with the MonadFail proposal and GHC's + MonadFailDesugaring language extension which is enabled by default by GHC-8.6.1. + 5.6.0.0 ------- diff -Nru haskell-fgl-5.6.0.0/Data/Graph/Inductive/Monad.hs haskell-fgl-5.7.0.1/Data/Graph/Inductive/Monad.hs --- haskell-fgl-5.6.0.0/Data/Graph/Inductive/Monad.hs 2017-08-09 13:06:44.000000000 +0000 +++ haskell-fgl-5.7.0.1/Data/Graph/Inductive/Monad.hs 2018-11-26 14:11:18.000000000 +0000 @@ -1,4 +1,4 @@ -{-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE CPP, MultiParamTypeClasses #-} -- (c) 2002 by Martin Erwig [see file COPYRIGHT] -- | Monadic Graphs @@ -19,6 +19,10 @@ import Data.Graph.Inductive.Graph +#if MIN_VERSION_base(4,12,0) +import Control.Monad.Fail +import Prelude hiding (fail) +#endif {-# ANN module "HLint: ignore Redundant lambda" #-} @@ -39,7 +43,13 @@ -- Monadic Graph -- -class (Monad m) => GraphM m gr where +class +#if MIN_VERSION_base(4,12,0) + (MonadFail m) +#else + (Monad m) +#endif + => GraphM m gr where {-# MINIMAL emptyM, isEmptyM, matchM, mkGraphM, labNodesM #-} emptyM :: m (gr a b) diff -Nru haskell-fgl-5.6.0.0/Data/Graph/Inductive/PatriciaTree.hs haskell-fgl-5.7.0.1/Data/Graph/Inductive/PatriciaTree.hs --- haskell-fgl-5.6.0.0/Data/Graph/Inductive/PatriciaTree.hs 2017-08-09 13:06:44.000000000 +0000 +++ haskell-fgl-5.7.0.1/Data/Graph/Inductive/PatriciaTree.hs 2018-11-26 14:11:18.000000000 +0000 @@ -32,6 +32,7 @@ import qualified Data.IntMap as IM import Data.List (foldl', sort) import Data.Maybe (fromMaybe) +import Data.Tuple (swap) #if MIN_VERSION_containers (0,4,2) import Control.DeepSeq (NFData(..)) @@ -259,9 +260,6 @@ fromContext :: Context a b -> Context' a b fromContext (ps, _, a, ss) = (fromAdj ps, a, fromAdj ss) -swap :: (a, b) -> (b, a) -swap (a, b) = (b, a) - -- A version of @++@ where order isn't important, so @xs ++ [x]@ -- becomes @x:xs@. Used when we have to have a function of type @[a] -- -> [a] -> [a]@ but one of the lists is just going to be a single diff -Nru haskell-fgl-5.6.0.0/Data/Graph/Inductive/Query/DFS.hs haskell-fgl-5.7.0.1/Data/Graph/Inductive/Query/DFS.hs --- haskell-fgl-5.6.0.0/Data/Graph/Inductive/Query/DFS.hs 2017-08-09 13:06:44.000000000 +0000 +++ haskell-fgl-5.7.0.1/Data/Graph/Inductive/Query/DFS.hs 2018-11-26 14:11:18.000000000 +0000 @@ -50,7 +50,7 @@ import Data.Tree import qualified Data.Map as Map import Control.Monad (liftM2) - +import Data.Tuple (swap) -- | Many functions take a list of nodes to visit as an explicit argument. @@ -244,8 +244,6 @@ vs = zip [1..] sccs vMap = Map.fromList $ map swap vs - swap = uncurry $ flip (,) - getN = (vMap Map.!) es = [ (getN c1, getN c2, ()) | c1 <- sccs, c2 <- sccs , (c1 /= c2) && any (hasEdge gr) (liftM2 (,) c1 c2) ] diff -Nru haskell-fgl-5.6.0.0/Data/Graph/Inductive/Query/MaxFlow.hs haskell-fgl-5.7.0.1/Data/Graph/Inductive/Query/MaxFlow.hs --- haskell-fgl-5.6.0.0/Data/Graph/Inductive/Query/MaxFlow.hs 2017-08-09 13:06:44.000000000 +0000 +++ haskell-fgl-5.7.0.1/Data/Graph/Inductive/Query/MaxFlow.hs 2018-11-26 14:11:18.000000000 +0000 @@ -108,7 +108,7 @@ -- | Compute the flow from s to t on a graph whose edges are labeled with -- @x@, which is the max capacity and where not all edges need to be --- of the form a\<---->b. Return the flow as a grap whose edges are +-- of the form a\<---->b. Return the flow as a graph whose edges are -- labeled with (x,y,z)=(max capacity,current flow,residual -- capacity) and all edges are of the form a\<---->b mf :: (DynGraph gr, Num b, Ord b) => gr a b -> Node -> Node -> gr a (b,b,b) diff -Nru haskell-fgl-5.6.0.0/debian/changelog haskell-fgl-5.7.0.1/debian/changelog --- haskell-fgl-5.6.0.0/debian/changelog 2018-10-21 21:55:36.000000000 +0000 +++ haskell-fgl-5.7.0.1/debian/changelog 2019-08-06 06:48:01.000000000 +0000 @@ -1,3 +1,15 @@ +haskell-fgl (5.7.0.1-1build1) eoan; urgency=medium + + * Rebuild against new GHC abi. + + -- Gianfranco Costamagna Tue, 06 Aug 2019 08:48:01 +0200 + +haskell-fgl (5.7.0.1-1) unstable; urgency=medium + + * New upstream version. + + -- Clint Adams Sat, 27 Jul 2019 18:10:46 -0400 + haskell-fgl (5.6.0.0-4) unstable; urgency=medium * Patch for newer hspec. diff -Nru haskell-fgl-5.6.0.0/debian/control haskell-fgl-5.7.0.1/debian/control --- haskell-fgl-5.6.0.0/debian/control 2018-10-21 21:55:35.000000000 +0000 +++ haskell-fgl-5.7.0.1/debian/control 2019-07-27 22:10:46.000000000 +0000 @@ -10,11 +10,13 @@ ghc (>= 8), ghc-prof, libghc-quickcheck2-dev (>= 2.8), - libghc-quickcheck2-dev (<< 2.12), + libghc-quickcheck2-dev (<< 2.13), + libghc-quickcheck2-prof, libghc-hspec-dev (>= 2.1), - libghc-hspec-dev (<< 2.6), + libghc-hspec-dev (<< 2.7), + libghc-hspec-prof, Build-Depends-Indep: ghc-doc, -Standards-Version: 4.2.1 +Standards-Version: 4.4.0 Homepage: http://hackage.haskell.org/package/fgl Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-fgl Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-fgl] diff -Nru haskell-fgl-5.6.0.0/debian/patches/newer-hspec haskell-fgl-5.7.0.1/debian/patches/newer-hspec --- haskell-fgl-5.6.0.0/debian/patches/newer-hspec 2018-10-21 21:55:36.000000000 +0000 +++ haskell-fgl-5.7.0.1/debian/patches/newer-hspec 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/fgl.cabal -+++ b/fgl.cabal -@@ -91,7 +91,7 @@ - build-depends: fgl - , base - , QuickCheck >= 2.8 && < 2.12 -- , hspec >= 2.1 && < 2.5 -+ , hspec >= 2.1 && < 2.6 - , containers - - hs-source-dirs: test diff -Nru haskell-fgl-5.6.0.0/debian/patches/newer-quickcheck haskell-fgl-5.7.0.1/debian/patches/newer-quickcheck --- haskell-fgl-5.6.0.0/debian/patches/newer-quickcheck 2018-09-29 17:21:44.000000000 +0000 +++ haskell-fgl-5.7.0.1/debian/patches/newer-quickcheck 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/fgl.cabal -+++ b/fgl.cabal -@@ -90,7 +90,7 @@ - - build-depends: fgl - , base -- , QuickCheck >= 2.8 && < 2.10 -+ , QuickCheck >= 2.8 && < 2.12 - , hspec >= 2.1 && < 2.5 - , containers - diff -Nru haskell-fgl-5.6.0.0/debian/patches/series haskell-fgl-5.7.0.1/debian/patches/series --- haskell-fgl-5.6.0.0/debian/patches/series 2018-10-21 21:55:36.000000000 +0000 +++ haskell-fgl-5.7.0.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -newer-quickcheck -newer-hspec diff -Nru haskell-fgl-5.6.0.0/fgl.cabal haskell-fgl-5.7.0.1/fgl.cabal --- haskell-fgl-5.6.0.0/fgl.cabal 2017-08-09 13:06:44.000000000 +0000 +++ haskell-fgl-5.7.0.1/fgl.cabal 2018-11-26 14:11:18.000000000 +0000 @@ -1,5 +1,5 @@ name: fgl -version: 5.6.0.0 +version: 5.7.0.1 license: BSD3 license-file: LICENSE author: Martin Erwig, Ivan Lazar Miljenovic @@ -18,7 +18,8 @@ ChangeLog tested-with: GHC == 7.0.4, GHC == 7.2.2, GHC == 7.4.2, GHC == 7.6.3, - GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.1.* + GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.2, + GHC == 8.4.3, GHC == 8.6.2 source-repository head type: git @@ -65,7 +66,7 @@ other-modules: Paths_fgl - build-depends: base < 5 + build-depends: base >= 4.3 && < 5 , transformers , array @@ -90,8 +91,8 @@ build-depends: fgl , base - , QuickCheck >= 2.8 && < 2.10 - , hspec >= 2.1 && < 2.5 + , QuickCheck >= 2.8 && < 2.13 + , hspec >= 2.1 && < 2.7 , containers hs-source-dirs: test