[DHG_packages] 01/01: make-all: Take Build-Deps-Indep into account

Joachim Breitner nomeata at moszumanska.debian.org
Tue Aug 11 11:35:22 UTC 2015


This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository DHG_packages.

commit f8e5aa8b00ff4907e56e41e8b40f4117164f91f6
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Aug 11 13:35:15 2015 +0200

    make-all: Take Build-Deps-Indep into account
---
 src/make-all.hs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/make-all.hs b/src/make-all.hs
index 21f6400..976be8b 100644
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@ -123,16 +123,19 @@ binaryPackagesOfSource s = do
         Left e -> fail (show e)
         Right dc -> return $ map unBinPkgName $ debianBinaryPackageNames dc
 
--- TODO: Include Build-Depends-Indep
 dependsOfDsc :: FilePath -> IO [String]
 dependsOfDsc f = do
     ret <- parseControlFromFile f
     case ret of
         Left e -> fail (show e)
         Right (Control (p:_)) -> do
-            case fieldValue "Build-Depends" (p:: Paragraph) of
+            deps <- case fieldValue "Build-Depends" (p:: Paragraph) of
                 Nothing -> fail "no Build-Depends"
                 Just depV -> return $ nub $ parseFlatRel depV
+            ideps <- case fieldValue "Build-Depends-Indep" (p:: Paragraph) of
+                Nothing -> return []
+                Just depV -> return $ nub $ parseFlatRel depV
+            return $ deps ++ ideps
 
 
 -- Parsing package relations with flattening

-- 
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