debian 3.93.2 → 3.93.3

raw patch · 6 files changed

+19/−7 lines, 6 files

Files

• Debian/Control/Policy.hs +1/−1
• Debian/Report.hs +1/−1
• changelog +1/−1
• debian.cabal +1/−1
• debian/changelog +7/−1
• utils/Report.hs +8/−2

@@ -105,7 +105,7 @@  instance Show ControlFileError where     show (NoParagraphs {..}) = intercalate ", " (map showLoc locs) ++ ": NoParagraphs"-    show (NoBinaryParagraphs {..}) = intercalate ", " (map showLoc locs) ++ ": NoBinaryParagraphs (" ++ show ctl ++ ")"+    show (NoBinaryParagraphs {..}) = intercalate ", " (map showLoc locs) ++ ": NoBinaryParagraphs"     show (MissingField {..}) = intercalate ", " (map showLoc locs) ++ ": MissingField " ++ show field     show (ParseRelationsError {..}) = intercalate ", " (map showLoc locs) ++ ": ParseRelationsError " ++ show parseError     show (ParseControlError {..}) = intercalate ", " (map showLoc locs) ++ ": ParseControlError " ++ show parseError

@@ -66,7 +66,7 @@            -> M.Map Text DebianVersion -- ^ package map b            -> M.Map Text (DebianVersion, DebianVersion) -- ^ trumped packages (version a, version b) trumpedMap pmA pmB =-    M.foldWithKey (checkTrumped pmB) M.empty pmA+    M.foldrWithKey (checkTrumped pmB) M.empty pmA     where       checkTrumped pm package aVersion trumpedPM =           case M.lookup package pm of

@@ -1,4 +1,4 @@-haskell-debian (3.93.1) unstable; urgency=low+haskell-debian (3.93.2) unstable; urgency=low    * Put SHA256 checksums into package info rather than obsolete md5 

@@ -1,5 +1,5 @@ Name:           debian-Version:        3.93.2+Version:        3.93.3 License:        BSD3 License-File:   debian/copyright Author:         David Fox <dsf@seereason.com>, Jeremy Shaw <jeremy@seereason.com>, Clifford Beshers <beshers@seereason.com>

@@ -1,4 +1,10 @@-haskell-debian (3.93.1) unstable; urgency=low+haskell-debian (3.93.3) unstable; urgency=medium++  * Changes for ghc-8.6++ -- David Fox <dsf@seereason.com>  Tue, 01 Jan 2019 15:57:16 -0800++haskell-debian (3.93.2) unstable; urgency=low    * Put SHA256 checksums into package info rather than obsolete md5 

@@ -1,6 +1,10 @@-{-# LANGUAGE ForeignFunctionInterface #-}+{-# LANGUAGE ForeignFunctionInterface, ScopedTypeVariables #-} module Main where +#if !MIN_VERSION_base(4,8,0)+import Control.Applicative ((<$>))+#endif+import Control.Exception (try) import Control.Monad import Data.Maybe (fromMaybe) import Debian.Apt.Methods@@ -13,6 +17,7 @@ import Text.XML.HaXml.Pretty (document) import Text.XML.HaXml.Posn import Text.PrettyPrint.HughesPJ+import Text.Read (readMaybe) import System.IO import System.Posix.Env @@ -90,7 +95,8 @@ getWidth =     do (cols, _) <- getWinSize        case cols of-         0 -> return . fmap read =<< getEnv "COLUMNS"+         -- 0 -> return . fmap read =<< getEnv "COLUMNS"+         0 -> either (\(e :: IOError) -> Nothing) (fmap read) <$> try (getEnv "COLUMNS")          _ -> return (Just cols)