cabal-debian 5.2 → 5.2.1
raw patch · 5 files changed
+10/−4 lines, 5 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
+ Debian.Debianize.SourceDebDescription: rulesRequiresRoot :: Lens' SourceDebDescription Bool
Files
- cabal-debian.cabal +1/−1
- src/Debian/Debianize/Files.hs +2/−1
- src/Debian/Debianize/Finalize.hs +1/−1
- src/Debian/Debianize/InputDebian.hs +2/−1
- src/Debian/Debianize/SourceDebDescription.hs +4/−0
cabal-debian.cabal view
@@ -1,6 +1,6 @@ cabal-version: 3.0 Name: cabal-debian-Version: 5.2+Version: 5.2.1 Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw; 2017-2022 Clint Adams License: BSD-3-Clause License-File: LICENSE
src/Debian/Debianize/Files.hs view
@@ -23,7 +23,7 @@ import Debian.Debianize.Prelude (escapeDebianWildcards, showDeps') import qualified Debian.Debianize.BinaryDebDescription as B (architecture, BinaryDebDescription, binaryPriority, multiArch, binarySection, breaks, builtUsing, conflicts, depends, description, essential, package, PackageRelations, preDepends, provides, recommends, relations, replaces, suggests) import Debian.Debianize.CopyrightDescription (CopyrightDescription)-import qualified Debian.Debianize.SourceDebDescription as S (binaryPackages, buildConflicts, buildConflictsIndep, buildDepends, buildDependsIndep, dmUploadAllowed, homepage, maintainer, priority, section, source, SourceDebDescription, standardsVersion, uploaders, vcsFields, VersionControlSpec(VCSArch, VCSBrowser, VCSBzr, VCSCvs, VCSDarcs, VCSGit, VCSHg, VCSMtn, VCSSvn), xDescription, XField(XField), XFieldDest(B, C, S), xFields)+import qualified Debian.Debianize.SourceDebDescription as S (binaryPackages, buildConflicts, buildConflictsIndep, buildDepends, buildDependsIndep, dmUploadAllowed, homepage, maintainer, priority, rulesRequiresRoot, section, source, SourceDebDescription, standardsVersion, uploaders, vcsFields, VersionControlSpec(VCSArch, VCSBrowser, VCSBzr, VCSCvs, VCSDarcs, VCSGit, VCSHg, VCSMtn, VCSSvn), xDescription, XField(XField), XFieldDest(B, C, S), xFields) import Debian.Policy (maintainerOfLastResort) import Debian.Pretty (PP(..), ppShow, prettyText, ppText, ppPrint) import Debian.Relation (BinPkgName(BinPkgName), Relations)@@ -182,6 +182,7 @@ (case view S.dmUploadAllowed src of True -> [Field ("DM-Upload-Allowed", " yes")]; False -> []) ++ mField "Priority" (view S.priority src) ++ mField "Section" (view S.section src) +++ [Field ("Rules-Requires-Root", (if view S.rulesRequiresRoot src then " yes" else " no"))] ++ depField "Build-Depends" (view S.buildDepends src) ++ depField "Build-Depends-Indep" (view S.buildDependsIndep src) ++ depField "Build-Conflicts" (view S.buildConflicts src) ++
src/Debian/Debianize/Finalize.hs view
@@ -465,7 +465,7 @@ S.homepage .?= Just ("https://hackage.haskell.org/package/" <> pack (unPackageName cabal)) S.vcsFields %= Set.union (Set.fromList [ S.VCSBrowser packagesURI- , S.VCSGit "https://salsa.debian.org/haskell-team/DHG_packages.git"+ , S.VCSGit ("https://salsa.debian.org/haskell-team/DHG_packages.git [p/" <> pack src <> "]") ]) putBuildDeps :: (MonadIO m) => (Relations -> Relations) -> PackageDescription -> CabalT m ()
src/Debian/Debianize/InputDebian.hs view
@@ -31,7 +31,7 @@ import qualified Debian.Debianize.BinaryDebDescription as B (architecture, binaryPriority, multiArch, binarySection, breaks, builtUsing, conflicts, depends, description, essential, package, preDepends, provides, recommends, relations, replaces, suggests) import Debian.Debianize.CopyrightDescription (readCopyrightDescription) import Debian.Debianize.Prelude (getDirectoryContents', read', readFileMaybe, (.?=))-import qualified Debian.Debianize.SourceDebDescription as S (binaryPackages, buildConflicts, buildConflictsIndep, buildDepends, buildDependsIndep, dmUploadAllowed, homepage, newSourceDebDescription', priority, section, SourceDebDescription, standardsVersion, uploaders, xDescription, vcsFields, VersionControlSpec(VCSArch, VCSBrowser, VCSBzr, VCSCvs, VCSDarcs, VCSGit, VCSHg, VCSMtn, VCSSvn), XField(XField), xFields)+import qualified Debian.Debianize.SourceDebDescription as S (binaryPackages, buildConflicts, buildConflictsIndep, buildDepends, buildDependsIndep, dmUploadAllowed, homepage, newSourceDebDescription', priority, rulesRequiresRoot, section, SourceDebDescription, standardsVersion, uploaders, xDescription, vcsFields, VersionControlSpec(VCSArch, VCSBrowser, VCSBzr, VCSCvs, VCSDarcs, VCSGit, VCSHg, VCSMtn, VCSSvn), XField(XField), xFields) import Debian.Orphans () import Debian.Policy (parseMaintainer, parsePackageArchitectures, parseStandardsVersion, parseUploaders, readPriority, readSection, readMultiArch, readSourceFormat, Section(..)) import Debian.Relation (BinPkgName(..), parseRelations, Relations, SrcPkgName(..))@@ -99,6 +99,7 @@ readField (Field ("Build-Conflicts", value)) (desc, unrecognized) = (set S.buildConflicts (rels value) desc, unrecognized) readField (Field ("Build-Depends-Indep", value)) (desc, unrecognized) = (set S.buildDependsIndep (rels value) desc, unrecognized) readField (Field ("Build-Conflicts-Indep", value)) (desc, unrecognized) = (set S.buildConflictsIndep (rels value) desc, unrecognized)+ readField (Field ("Rules-Requires-Root", value)) (desc, unrecognized) = (set S.rulesRequiresRoot (yes value) desc, unrecognized) readField (Field ("Vcs-Browser", s)) (desc, unrecognized) = (over S.vcsFields (\ vcsFields -> Set.insert (S.VCSBrowser (pack s)) vcsFields) desc, unrecognized) readField (Field ("Vcs-Arch", s)) (desc, unrecognized) = (over S.vcsFields (\ vcsFields -> Set.insert (S.VCSArch (pack s)) vcsFields) desc, unrecognized) readField (Field ("Vcs-Bzr", s)) (desc, unrecognized) = (over S.vcsFields (\ vcsFields -> Set.insert (S.VCSBzr (pack s)) vcsFields) desc, unrecognized)
src/Debian/Debianize/SourceDebDescription.hs view
@@ -10,6 +10,7 @@ , dmUploadAllowed , priority , section+ , rulesRequiresRoot , buildDepends , buildConflicts , buildDependsIndep@@ -56,6 +57,8 @@ -- ^ <http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Priority> , _section :: Maybe Section -- ^ <http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Section>+ , _rulesRequiresRoot :: Bool+ -- ^ <https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-rules-requires-root> , _standardsVersion :: Maybe StandardsVersion -- ^ <http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Standards-Version> , _homepage :: Maybe Text@@ -91,6 +94,7 @@ , _dmUploadAllowed = False , _priority = Nothing , _section = Nothing+ , _rulesRequiresRoot = False , _buildDepends = [] , _buildConflicts = [] , _buildDependsIndep = []