debian 3.88 → 3.88.1
raw patch · 4 files changed
+40/−18 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- Debian/GenBuildDeps.hs +18/−17
- changelog +14/−0
- debian.cabal +1/−1
- debian/changelog +7/−0
Debian/GenBuildDeps.hs view
@@ -30,10 +30,10 @@ import Control.Monad (filterM, foldM) import Control.Monad.State (evalState, get, modify, State) import Data.Graph (Graph, Edge, Vertex, buildG, topSort, reachable, transposeG, edges, scc)-import Data.List-import qualified Data.Map as Map+import Data.List as List (elemIndex, find, map, nub, partition, tails)+import Data.Map as Map (empty, findWithDefault, fromList, insert, Map, lookup) import Data.Maybe-import qualified Data.Set as Set+import Data.Set as Set (fromList, intersection, null, Set) import Data.Tree as Tree (Tree(Node, rootLabel, subForest)) import Debian.Control (parseControlFromFile) import Debian.Control.Policy (HasDebianControl, DebianControl, ControlFileError(..), validateDebianControl, debianSourcePackageName, debianBinaryPackageNames, debianBuildDeps, debianBuildDepsIndep)@@ -68,7 +68,7 @@ DepInfo { sourceName = debianSourcePackageName control , relations = rels , binaryNames = bins- , depSet = Set.fromList (map (\(Rel x _ _) -> x) (concat rels))+ , depSet = Set.fromList (List.map (\(Rel x _ _) -> x) (concat rels)) , binSet = Set.fromList bins } -- | source package name@@ -102,7 +102,7 @@ -- |Remove any dependencies that are designated \"relaxed\" by relaxInfo. relaxDeps :: RelaxInfo -> [DepInfo] -> [DepInfo] relaxDeps relaxInfo deps =- map relaxDep deps+ List.map relaxDep deps where relaxDep :: DepInfo -> DepInfo relaxDep info = info {relations = filteredDependencies}@@ -111,7 +111,7 @@ -- this results in an empty list in an or-dep the entire dependency can -- be discarded. filteredDependencies :: Relations- filteredDependencies = filter (/= []) (map (filter keepDep) (relations info))+ filteredDependencies = filter (/= []) (List.map (filter keepDep) (relations info)) keepDep :: Relation -> Bool keepDep (Rel name _ _) = not (relaxInfo (sourceName info) name) @@ -143,21 +143,21 @@ case partition (\ x -> reachable hasDep x == [x]) verts of -- None of the packages are buildable, return information -- about how to break this build dependency cycle.- ([], _) -> CycleInfo {depPairs = map ofEdge $ head $ (allCycles hasDep)}+ ([], _) -> CycleInfo {depPairs = List.map ofEdge $ head $ (allCycles hasDep)} -- We have some buildable packages, return them along with -- the list of packages each one directly blocks (allReady, blocked) ->- BuildableInfo { readyTargets = map (makeReady blocked allReady) allReady- , allBlocked = map ofVertex blocked }+ BuildableInfo { readyTargets = List.map (makeReady blocked allReady) allReady+ , allBlocked = List.map ofVertex blocked } where makeReady :: [Vertex] -> [Vertex] -> Vertex -> ReadyTarget a makeReady blocked ready thisReady = let otherReady = filter (/= thisReady) ready (directlyBlocked, otherBlocked) = partition (\ x -> elem x (reachable isDep thisReady)) blocked in ReadyTarget { ready = ofVertex thisReady- , waiting = map ofVertex directlyBlocked- , other = map ofVertex (otherReady ++ otherBlocked) }- --allDeps x = (ofVertex x, map ofVertex (filter (/= x) (reachable hasDep x)))+ , waiting = List.map ofVertex directlyBlocked+ , other = List.map ofVertex (otherReady ++ otherBlocked) }+ --allDeps x = (ofVertex x, List.map ofVertex (filter (/= x) (reachable hasDep x))) isDep :: Graph isDep = transposeG hasDep hasDep :: Graph@@ -169,7 +169,7 @@ nub (foldr f [] (tails vertPairs)) where f :: [(Int, DepInfo)] -> [(Int, Int)] -> [(Int, Int)] f [] es = es- f (x : xs) es = catMaybes (map (toEdge x) xs) ++ es+ f (x : xs) es = catMaybes (List.map (toEdge x) xs) ++ es toEdge :: (Int, DepInfo) -> (Int, DepInfo) -> Maybe Edge toEdge (xv, xa) (yv, ya) = case compareSource xa ya of@@ -276,14 +276,15 @@ #if 0 | any (\rel -> isJust (find (checkPackageNameReq rel) (binaryNames p2))) (concat (relations p1)) = GT | any (\rel -> isJust (find (checkPackageNameReq rel) (binaryNames p1))) (concat (relations p2)) = LT-#else- | not (null (Set.intersection (depSet p1) (binSet p2))) = GT- | not (null (Set.intersection (depSet p2) (binSet p1))) = LT-#endif | otherwise = EQ where checkPackageNameReq :: Relation -> BinPkgName -> Bool checkPackageNameReq (Rel rPkgName _ _) bPkgName = rPkgName == bPkgName+#else+ | not (Set.null (Set.intersection (depSet p1) (binSet p2))) = GT+ | not (Set.null (Set.intersection (depSet p2) (binSet p1))) = LT+ | otherwise = EQ+#endif compareSource' :: HasDebianControl control => control -> control -> Ordering compareSource' control1 control2
changelog view
@@ -1,3 +1,17 @@+haskell-debian (3.88.1) unstable; urgency=low++ * Make ghc-7.10.2 a required travis test+ * Sort out the List/Map/Set imports in Debian.GenBuildDeps++ -- David Fox <dsf@seereason.com> Mon, 24 Aug 2015 10:29:00 -0700++haskell-debian (3.88) unstable; urgency=low++ * Improved handling of white space+ * Speed up Debian.GenBuildDeps.buildable++ -- David Fox <dsf@seereason.com> Mon, 24 Aug 2015 06:29:29 -0700+ haskell-debian (3.87.2) unstable; urgency=low * Functor, Applicative, and Alternative instances for ghc-7.10
debian.cabal view
@@ -1,5 +1,5 @@ Name: debian-Version: 3.88+Version: 3.88.1 License: BSD3 License-File: debian/copyright Author: David Fox <dsf@seereason.com>, Jeremy Shaw <jeremy@seereason.com>, Clifford Beshers <beshers@seereason.com>
debian/changelog view
@@ -1,3 +1,10 @@+haskell-debian (3.88.1) unstable; urgency=low++ * Make ghc-7.10.2 a required travis test+ * Sort out the List/Map/Set imports in Debian.GenBuildDeps++ -- David Fox <dsf@seereason.com> Mon, 24 Aug 2015 10:29:00 -0700+ haskell-debian (3.88) unstable; urgency=low * Improved handling of white space