[pkg-haskell-tools] 02/04: Merge branch 'architectures' into short-names

[Sven Bartscher]

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

svenb-guest pushed a commit to branch short-names
in repository pkg-haskell-tools.

commit 3f79c1593bd069db51aedb9efed44526015c24e9
Merge: bef88f8 0acb352
Author: Sven Bartscher <sven.bartscher at weltraumschlangen.de>
Date:   Thu Aug 20 11:37:53 2015 +0200

    Merge branch 'architectures' into short-names

 dht.cabal       |  4 +---
 src/make-all.hs | 67 +++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --cc src/make-all.hs
index 3d84767,0f4cbff..6e97039
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@@ -248,22 -259,8 +264,17 @@@ newtype GetExcludedSources = GetExclude
  newtype GetDebBuiltBy = GetDebBuiltBy String  deriving (Show,Typeable,Eq,Hashable,Binary,NFData)
  newtype GetBinToDeb = GetBinToDeb String  deriving (Show,Typeable,Eq,Hashable,Binary,NFData)
  
- newtype Architecture = Arch String deriving (Show,Typeable,Eq,Hashable,Binary,NFData)
- 
- checkArch :: (Monad m) => String -> String -> String -> m ()
- checkArch should is full = unless (  (should `isPrefixOf` is)
-                                   || ("all"  `isPrefixOf` is)) $
-                            fail $ "Can't build this file " ++ full ++ " with schroot with architecture " ++ should
+ newtype GetArch = GetArch () deriving (Show,Typeable,Eq,Hashable,Binary,NFData)
  
 +getPkgVersion :: String -> Action String
 +getPkgVersion package = do
 +  let changesFile = "p" </> package </> "debian/changelog"
 +  rawChanges <- readFile' changesFile
 +  either (fail . unlines) (\(entry, _) ->
 +                           return $ showV $ DC.logVersion entry)
 +                        $ DC.parseEntry rawChanges
 +      where showV = render . DC.prettyDebianVersion
 +
  manpage :: String
  manpage = unlines [ "TODO" ]
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/pkg-haskell-tools.git