diff --git a/cabal-debian.cabal b/cabal-debian.cabal --- a/cabal-debian.cabal +++ b/cabal-debian.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 Name: cabal-debian -Version: 5.5 +Version: 5.5.1 Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw; 2017-2026 Clint Adams License: BSD-3-Clause License-File: LICENSE diff --git a/debian/watch b/debian/watch --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,4 @@ -version=4 -https://hackage.haskell.org/package/cabal-debian/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +Version: 5 + +Source: https://hackage.haskell.org/package/cabal-debian/distro-monitor +Matching-Pattern: .*-([0-9\.]+).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/src/Debian/Debianize/BuildDependencies.hs b/src/Debian/Debianize/BuildDependencies.hs --- a/src/Debian/Debianize/BuildDependencies.hs +++ b/src/Debian/Debianize/BuildDependencies.hs @@ -149,8 +149,6 @@ let ghcrel = if member GHC hcs then maybe [] ((: []) . anyrel') ghcdev else [] let ghcrelprof = if prof then maybe [] ((: []) . anyrel') ghcprof else [] let xs = nub $ [maybe [] (\ n -> [D.RRel (D.BinPkgName "debhelper-compat") (Just (D.EEQ (parseDebianVersion' (show n)))) Nothing []]) compat, - [D.RRel (D.BinPkgName "haskell-devscripts-minimal") Nothing Nothing [], - D.RRel (D.BinPkgName "haskell-devscripts") (Just $ D.GRE $ parseDebianVersion' ("0.16.42" :: String)) Nothing []], anyrel "dh-sequence-haskell"] ++ (ghcrel ++ ghcrelprof) ++ bDeps ++ diff --git a/src/Debian/Debianize/Files.hs b/src/Debian/Debianize/Files.hs --- a/src/Debian/Debianize/Files.hs +++ b/src/Debian/Debianize/Files.hs @@ -176,7 +176,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"))] ++ + maybe [] (\ b -> [Field ("Rules-Requires-Root", if b then " yes" else " no")]) (view S.rulesRequiresRoot src) ++ depField "Build-Depends" (view S.buildDepends src) ++ depField "Build-Depends-Indep" (view S.buildDependsIndep src) ++ depField "Build-Conflicts" (view S.buildConflicts src) ++ diff --git a/src/Debian/Debianize/Finalize.hs b/src/Debian/Debianize/Finalize.hs --- a/src/Debian/Debianize/Finalize.hs +++ b/src/Debian/Debianize/Finalize.hs @@ -41,7 +41,7 @@ import Debian.Debianize.VersionSplits (DebBase(DebBase)) import Debian.GHC (compilerPackageName) import Debian.Orphans () -import Debian.Policy (getCurrentDebianUser, getDebhelperCompatLevel, haskellMaintainer, maintainerOfLastResort, PackageArchitectures(Any, All), PackagePriority(Optional), parseMaintainer, parseStandardsVersion, Section(..), SourceFormat(Native3)) +import Debian.Policy (getCurrentDebianUser, getDebhelperCompatLevel, haskellMaintainer, maintainerOfLastResort, PackageArchitectures(Any, All), parseMaintainer, parseStandardsVersion, Section(..), SourceFormat(Native3)) import Debian.Pretty (PP(..), ppShow) import Debian.Relation (BinPkgName, BinPkgName(BinPkgName), Relation(RRel), Relations, SrcPkgName(SrcPkgName)) import qualified Debian.Relation as D (BinPkgName(BinPkgName), Relation(..)) @@ -127,7 +127,6 @@ addExtraLibDependencies hc (A.debInfo . D.watch) .?= Just (watchAtom (pkgName $ Cabal.package $ pkgDesc)) (A.debInfo . D.control . S.section) .?= Just (MainSection "haskell") - (A.debInfo . D.control . S.priority) .?= Just Optional (A.debInfo . D.compat) .?= debhelperCompat finalizeChangelog date currentUser finalizeControl currentUser @@ -154,7 +153,7 @@ watchAtom :: PackageName -> Text watchAtom pkgname = - pack $ "version=4\nhttps://hackage.haskell.org/package/" ++ unPackageName pkgname ++ "/distro-monitor .*-([0-9\\.]+)\\.(?:zip|tgz|tbz|txz|(?:tar\\.(?:gz|bz2|xz)))\n" + pack $ "Version: 5\n\nSource: https://hackage.haskell.org/package/" ++ unPackageName pkgname ++ "/distro-monitor\nMatching-Pattern: .*-([0-9\\.]+).(?:zip|tgz|tbz|txz|(?:tar\\.(?:gz|bz2|xz)))\n" -- | Compute the final values of the BinaryDebDescription record -- description fields from the cabal descriptions and the values that @@ -452,7 +451,7 @@ let packagesURI = "https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/" <> pack src zoom D.control $ do - S.standardsVersion .?= Just (parseStandardsVersion "4.7.3") + S.standardsVersion .?= Just (parseStandardsVersion "4.7.4") S.homepage .?= Just ("https://hackage.haskell.org/package/" <> pack (unPackageName cabal)) S.vcsFields %= Set.union (Set.fromList [ S.VCSBrowser packagesURI diff --git a/src/Debian/Debianize/InputDebian.hs b/src/Debian/Debianize/InputDebian.hs --- a/src/Debian/Debianize/InputDebian.hs +++ b/src/Debian/Debianize/InputDebian.hs @@ -103,7 +103,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 ("Rules-Requires-Root", value)) (desc, unrecognized) = (set S.rulesRequiresRoot (Just (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) diff --git a/src/Debian/Debianize/Optparse.hs b/src/Debian/Debianize/Optparse.hs --- a/src/Debian/Debianize/Optparse.hs +++ b/src/Debian/Debianize/Optparse.hs @@ -340,7 +340,7 @@ standardsVersionP = O.option (parseStandardsVersion <$> O.str) m where m = O.help helpMsg <> O.long "standards-version" - <> O.value (parseStandardsVersion "4.7.3") + <> O.value (parseStandardsVersion "4.7.4") <> O.metavar "CABALVERSION" helpMsg = unlines [ "Claim compatibility to this version of the Debian policy", diff --git a/src/Debian/Debianize/SourceDebDescription.hs b/src/Debian/Debianize/SourceDebDescription.hs --- a/src/Debian/Debianize/SourceDebDescription.hs +++ b/src/Debian/Debianize/SourceDebDescription.hs @@ -57,7 +57,7 @@ -- ^ , _section :: Maybe Section -- ^ - , _rulesRequiresRoot :: Bool + , _rulesRequiresRoot :: Maybe Bool -- ^ , _standardsVersion :: Maybe StandardsVersion -- ^ @@ -94,7 +94,7 @@ , _dmUploadAllowed = False , _priority = Nothing , _section = Nothing - , _rulesRequiresRoot = False + , _rulesRequiresRoot = Nothing , _buildDepends = [] , _buildConflicts = [] , _buildDependsIndep = [] diff --git a/test-data/alex/output/debian/watch b/test-data/alex/output/debian/watch --- a/test-data/alex/output/debian/watch +++ b/test-data/alex/output/debian/watch @@ -1,2 +1,4 @@ -version=4 -https://hackage.haskell.org/package/alex/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +Version: 5 + +Source: https://hackage.haskell.org/package/alex/distro-monitor +Matching-Pattern: .*-([0-9\.]+).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/test-data/archive/output/debian/control b/test-data/archive/output/debian/control --- a/test-data/archive/output/debian/control +++ b/test-data/archive/output/debian/control @@ -1,9 +1,7 @@ Source: seereason-darcs-backups -Priority: optional Maintainer: David Fox Section: haskell Build-Depends: debhelper-compat (= 13) - , haskell-devscripts-minimal | haskell-devscripts (>= 0.16.42) , dh-sequence-haskell , ghc , ghc-prof diff --git a/test-data/archive/output/debian/watch b/test-data/archive/output/debian/watch --- a/test-data/archive/output/debian/watch +++ b/test-data/archive/output/debian/watch @@ -1,2 +1,4 @@ -version=4 -https://hackage.haskell.org/package/seereason-darcs-backups/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +Version: 5 + +Source: https://hackage.haskell.org/package/seereason-darcs-backups/distro-monitor +Matching-Pattern: .*-([0-9\.]+).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/test-data/artvaluereport-data/output/debian/watch b/test-data/artvaluereport-data/output/debian/watch --- a/test-data/artvaluereport-data/output/debian/watch +++ b/test-data/artvaluereport-data/output/debian/watch @@ -1,2 +1,4 @@ -version=4 -https://hackage.haskell.org/package/artvaluereport-data/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +Version: 5 + +Source: https://hackage.haskell.org/package/artvaluereport-data/distro-monitor +Matching-Pattern: .*-([0-9\.]+).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/test-data/artvaluereport2/output/debian/watch b/test-data/artvaluereport2/output/debian/watch --- a/test-data/artvaluereport2/output/debian/watch +++ b/test-data/artvaluereport2/output/debian/watch @@ -1,2 +1,4 @@ -version=4 -https://hackage.haskell.org/package/ArtValueReport/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +Version: 5 + +Source: https://hackage.haskell.org/package/ArtValueReport/distro-monitor +Matching-Pattern: .*-([0-9\.]+).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/test-data/clckwrks-dot-com/output/debian/control b/test-data/clckwrks-dot-com/output/debian/control --- a/test-data/clckwrks-dot-com/output/debian/control +++ b/test-data/clckwrks-dot-com/output/debian/control @@ -1,9 +1,7 @@ Source: haskell-clckwrks-dot-com Maintainer: Jeremy Shaw -Priority: optional Section: haskell Build-Depends: debhelper-compat (= 13) - , haskell-devscripts-minimal | haskell-devscripts (>= 0.16.42) , dh-sequence-haskell , ghc , ghc-prof diff --git a/test-data/clckwrks-dot-com/output/debian/watch b/test-data/clckwrks-dot-com/output/debian/watch --- a/test-data/clckwrks-dot-com/output/debian/watch +++ b/test-data/clckwrks-dot-com/output/debian/watch @@ -1,2 +1,4 @@ -version=4 -https://hackage.haskell.org/package/clckwrks-dot-com/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +Version: 5 + +Source: https://hackage.haskell.org/package/clckwrks-dot-com/distro-monitor +Matching-Pattern: .*-([0-9\.]+).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/test-data/creativeprompts/output/debian/watch b/test-data/creativeprompts/output/debian/watch --- a/test-data/creativeprompts/output/debian/watch +++ b/test-data/creativeprompts/output/debian/watch @@ -1,2 +1,4 @@ -version=4 -https://hackage.haskell.org/package/creativeprompts/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +Version: 5 + +Source: https://hackage.haskell.org/package/creativeprompts/distro-monitor +Matching-Pattern: .*-([0-9\.]+).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))