cabal-debian 5.2.6 → 5.3.0

raw patch · 3 files changed

+5/−9 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• cabal-debian.cabal +2/−2
• src/Debian/Debianize/Finalize.hs +2/−6
• src/Debian/GHC.hs +1/−1

@@ -1,6 +1,6 @@ cabal-version:  3.0 Name:           cabal-debian-Version:        5.2.6+Version:        5.3.0 Copyright:      Copyright (c) 2007-2014, David Fox, Jeremy Shaw; 2017-2025 Clint Adams License:        BSD-3-Clause License-File:   LICENSE@@ -136,7 +136,7 @@   test-data/artvaluereport2/output/debian/artvaluereport2-backups.install   test-data/artvaluereport2/output/debian/copyright   test-data/artvaluereport2/output/debian/source/format-Tested-With:    GHC ==9.12.1 || ==9.10.1 || ==9.8.4 || ==9.6.6+Tested-With:    GHC ==9.12.2 || ==9.10.3 || ==9.8.4 || ==9.6.6  Source-Repository head   type: git

@@ -92,8 +92,7 @@     do date <- liftIO getCurrentLocalRFC822Time        currentUser <- liftIO getCurrentDebianUser        debhelperCompat <- liftIO getDebhelperCompatLevel-       setupExists <- or <$> mapM (liftIO . doesFileExist) ["Setup.hs", "Setup.lhs"]-       finalizeDebianization' goodies date currentUser debhelperCompat setupExists+       finalizeDebianization' goodies date currentUser debhelperCompat        vb <- use (A.debInfo . D.flags . verbosity)        when (vb >= 3) (get >>= \ x -> liftIO (putStrLn ("\nFinalized Cabal Info: " ++ show x ++ "\n")))        either (\e -> liftIO $ hPutStrLn stderr ("WARNING: " ++ e)) (\_ -> return ()) =<< use (A.debInfo . D.control . S.maintainer)@@ -112,9 +111,8 @@     -> String     -> Maybe NameAddr     -> Maybe Int-    -> Bool     -> CabalT m ()-finalizeDebianization' goodies date currentUser debhelperCompat setupExists =+finalizeDebianization' goodies date currentUser debhelperCompat =     do -- In reality, hcs must be a singleton or many things won't work.  But some day...        hc <- use (A.debInfo . D.flags . compilerFlavor)        pkgDesc <- use A.packageDescription@@ -125,8 +123,6 @@          (True, D.TestsRun) -> (A.debInfo . D.rulesSettings) %= (++ ["DEB_ENABLE_TESTS = yes"])          (True, D.TestsBuild) -> (A.debInfo . D.rulesSettings) %= (++ ["DEB_ENABLE_TESTS = yes", "DEB_BUILD_OPTIONS += nocheck"])          _ -> return ()-       (A.debInfo . D.rulesSettings) %=-          (++ ["DEB_SETUP_BIN_NAME = " <> if setupExists then "debian/hlibrary.setup" else "cabal"])          finalizeSourceName B.HaskellSource        checkOfficialSettings hc

@@ -165,7 +165,7 @@             _ -> BinPkgName hcname  compilerPackage :: CompilerFlavor -> IO (Maybe BinPkgName)-compilerPackage GHC = filePackage "ghc" >>= runMemoized+compilerPackage GHC = return $ Just (BinPkgName "ghc") compilerPackage GHCJS = filePackage "ghcjs" >>= runMemoized compilerPackage x = error $ "compilerPackage - unsupported CompilerFlavor: " ++ show x