packages feed

cabal-debian 4.38.8 → 4.39

raw patch · 5 files changed

+16/−41 lines, 5 filesdep ~Cabal

Dependency ranges changed: Cabal

Files

cabal-debian.cabal view
@@ -1,5 +1,5 @@ Name:           cabal-debian-Version:        4.38.8+Version:        4.39 Copyright:      Copyright (c) 2007-2014, David Fox, Jeremy Shaw; 2017-2019 Clint Adams License:        BSD3 License-File:   LICENSE@@ -144,7 +144,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 ==8.8.1 || ==8.6.5 || ==8.4.4 || ==8.2.2+Tested-With: GHC ==8.6.5 || ==8.4.4 || ==8.2.2  Source-Repository head   type: git
src/Debian/Debianize/BuildDependencies.hs view
@@ -155,7 +155,6 @@             ]         bDeps <- use (A.debInfo . D.control . S.buildDepends)-       official <- use (A.debInfo . D.official)        compat <- use (A.debInfo . D.compat)        let ghcdev = compilerPackageName hflavor B.Development        let ghcrel = if member GHC hcs then maybe [] ((: []) . anyrel') ghcdev else []@@ -163,7 +162,7 @@        let ghcrelprof = if prof then maybe [] ((: []) . anyrel') ghcprof else []        let xs = nub $ [maybe [] (\ n -> [D.Rel (D.BinPkgName "debhelper") (Just (D.GRE (parseDebianVersion' (show n)))) Nothing]) compat,                        [D.Rel (D.BinPkgName "haskell-devscripts-minimal") Nothing Nothing,-                        D.Rel (D.BinPkgName "haskell-devscripts") (Just $ D.GRE $ parseDebianVersion' $ if official then "0.13" else "0.8" :: String) Nothing],+                        D.Rel (D.BinPkgName "haskell-devscripts") (Just $ D.GRE $ parseDebianVersion' ("0.13" :: String)) Nothing],                        anyrel "cdbs"] ++                       (ghcrel ++ ghcrelprof) ++ {-@@ -391,12 +390,12 @@         -- library (which, if pver is Nothing, will certainly         -- result in an error which needs to be corrected in         -- the packaging.)-        let compilerDependency = if isJust pver && (checkVersionReq req pver || (dname == naiveDebianName && conflictsWithHC naiveDebianName)) then comp else []+        let compilerDependency = if isJust pver && (checkVersionReq req pver || dname == naiveDebianName) then comp else []         -- The library package can satisfy the dependency if         -- the compiler doesn't provide a version, or if the         -- compiler doesn't conflict with the package's         -- debian name.-        let libraryDependency = if isNothing pver || dname /= naiveDebianName || not (conflictsWithHC naiveDebianName) then [rel] else []+        let libraryDependency = if isNothing pver || dname /= naiveDebianName then [rel] else []         -- Is the version number in the library dependency newer than         -- the compiler version?  If so it should appear to its left,         -- otherwise to its right.@@ -405,28 +404,6 @@                    Just (D.LTE lver) | Just lver < pver -> compilerDependency ++ libraryDependency                    Just (D.EEQ lver) | Just lver < pver -> compilerDependency ++ libraryDependency                    _ -> libraryDependency ++ compilerDependency-      -- FIXME: we are assuming here that ghc conflicts with all the-      -- library packages it provides but it no longer conflicts with-      -- libghc-cabal-dev.  We can now check these conflicts using the-      -- new functions in Bundled.-      conflictsWithHC (BinPkgName "libghc-cabal-dev") = False-      conflictsWithHC (BinPkgName "libghc-cabal-prof") = False-      conflictsWithHC (BinPkgName "libghc-cabal-doc") = False-      conflictsWithHC _ = True--{--doBundled :: Monad m =>-             B.PackageType  -- Documentation, Profiling, Development...-          -> PackageName    -- Cabal package name-          -> [D.Relation]   -- Original set of debian dependencies-          -> CabalT m [D.Relation] -- Modified debian dependencies accounting for the packages the compiler provides-doBundled hc typ name rels =-    concat <$> mapM doRel rels-    where-      doRel :: Monad m => D.Relation -> CabalT m [D.Relation]-      doRel rel@(D.Rel dname req _) = do-        hc <- use--}  -- Convert a cabal version to a debian version, adding an epoch number if requested debianVersion' :: Monad m => PackageName -> Version -> CabalT m DebianVersion
src/Debian/Debianize/InputCabal.hs view
@@ -27,10 +27,12 @@ #endif import Distribution.Package (Package(packageId)) import Distribution.PackageDescription as Cabal (PackageDescription)-import Distribution.PackageDescription.Configuration (finalizePackageDescription) #if MIN_VERSION_Cabal(2,2,0)+import Distribution.PackageDescription.Configuration (finalizePD) import Distribution.PackageDescription.Parsec (readGenericPackageDescription)+import Distribution.Types.ComponentRequestedSpec (ComponentRequestedSpec(ComponentRequestedSpec)) #else+import Distribution.PackageDescription.Configuration (finalizePackageDescription) #if MIN_VERSION_Cabal(2,0,0) import Distribution.PackageDescription.Parse (readGenericPackageDescription) #else@@ -74,7 +76,7 @@         genPkgDesc <- liftIO $ defaultPackageDesc vb >>= readPackageDescription vb #endif #if MIN_VERSION_Cabal(2,2,0)-        let finalized = finalizePackageDescription (mkFlagAssignment (toList fs)) (const True) (Platform buildArch Cabal.buildOS) cinfo [] genPkgDesc+        let finalized = finalizePD (mkFlagAssignment (toList fs)) (ComponentRequestedSpec True False) (const True) (Platform buildArch Cabal.buildOS) cinfo [] genPkgDesc #else         let finalized = finalizePackageDescription (toList fs) (const True) (Platform buildArch Cabal.buildOS) cinfo [] genPkgDesc #endif
src/Debian/Debianize/Optparse.hs view
@@ -380,7 +380,7 @@ standardsVersionP = O.option (parseStandardsVersion <$> O.str) m where   m = O.help helpMsg       <> O.long "standards-version"-      <> O.value (parseStandardsVersion "3.9.6")+      <> O.value (parseStandardsVersion "4.4.0")       <> O.metavar "CABALVERSION"   helpMsg = unlines [     "Claim compatibility to this version of the Debian policy",
src/Debian/Policy.hs view
@@ -120,14 +120,10 @@       parseDebianVersion'' "" = Nothing       parseDebianVersion'' s = Just (parseDebianVersion' s) --- | The version number of the installed debhelper package is the--- highest acceptable value for compat in a debian/control file.  If--- the package doesn't explicitly set an (acceptable) compat value we--- can use the value returned by this function, assuming debhelper is--- installed.+-- | With the current state of CDBS, anything above 10 breaks, so+-- for now we force this to 10. getDebhelperCompatLevel :: IO (Maybe Int)-getDebhelperCompatLevel =-    debianPackageVersion "debhelper" >>= return . fmap (min 9 . read . takeWhile (/= '.') . version)+getDebhelperCompatLevel = return (Just 10)  data StandardsVersion = StandardsVersion Int Int Int (Maybe Int) deriving (Eq, Ord, Show, Data, Typeable) @@ -367,9 +363,9 @@     pretty Public_Domain = text "public-domain"     pretty Apache = text "Apache"     pretty Artistic = text "Artistic"-    pretty BSD_2_Clause = text "BSD2"-    pretty BSD_3_Clause = text "BSD3"-    pretty BSD_4_Clause = text "BSD4"+    pretty BSD_2_Clause = text "BSD-2-clause"+    pretty BSD_3_Clause = text "BSD-3-clause"+    pretty BSD_4_Clause = text "BSD-4-clause"     pretty ISC = text "ISC"     pretty CC_BY = text "CC-BY"     pretty CC_BY_SA = text "CC-BY-SA"