diff --git a/Tests.hs b/Tests.hs --- a/Tests.hs +++ b/Tests.hs @@ -13,8 +13,8 @@ import Data.Maybe (fromMaybe) import Data.Set as Set (fromList, union, insert) import Data.Text as Text (intercalate, split, Text, unlines, unpack) -import Data.Version (Version(Version)) import Debian.Changes (ChangeLog(..), ChangeLogEntry(..), parseEntry) +import Debian.Codename (parseCodename) import Debian.Debianize.BasicInfo (compilerFlavor, Flags, verbosity) import qualified Debian.Debianize.Bundled as Bundled (tests) import qualified Debian.Debianize.BinaryDebDescription as B @@ -29,17 +29,14 @@ import Debian.Debianize.InputDebian (inputDebianization) import Debian.Debianize.Monad (CabalT, evalCabalT, execCabalM, execCabalT, liftCabal, execDebianT, DebianT, evalDebianT) import Debian.Debianize.Output (performDebianization) -import Debian.Debianize.Prelude (withCurrentDirectory) +import Debian.Debianize.Prelude (mkPackageName, withCurrentDirectory) import qualified Debian.Debianize.SourceDebDescription as S import Debian.Debianize.VersionSplits (DebBase(DebBase)) -import Debian.GHC (hvrCompilerPATH, withModifiedPATH) import Debian.Pretty (ppShow) import Debian.Policy (databaseDirectory, PackageArchitectures(All), PackagePriority(Extra), parseMaintainer, Section(MainSection), SourceFormat(Native3), StandardsVersion(..) {-, getDebhelperCompatLevel, getDebianStandardsVersion, License(..)-}) import Debian.Relation (BinPkgName(..), Relation(..), SrcPkgName(..), VersionReq(..)) -import Debian.Release (ReleaseName(ReleaseName, relName)) -import Debian.Version (parseDebianVersion'{-, buildDebianVersion-}) +import Debian.Version (parseDebianVersion') import Distribution.Compiler (CompilerFlavor({-GHC,-} GHCJS)) -import Distribution.Package (PackageName(PackageName)) import Prelude hiding (log) import System.Directory (doesDirectoryExist) import System.Exit (exitWith, ExitCode(..)) @@ -47,7 +44,7 @@ import System.Git (gitResetSubdir) import System.Process (readProcessWithExitCode) import Test.HUnit -import Text.ParserCombinators.Parsec.Rfc2822 (NameAddr(..)) +import Text.Parsec.Rfc2822 (NameAddr(..)) import Text.PrettyPrint.HughesPJClass (pPrint, text, Doc) -- | Backward compatibility. Should be fixed. @@ -57,13 +54,13 @@ -- | A suitable defaultAtoms value for the debian repository. defaultAtoms :: Monad m => CabalT m () defaultAtoms = - do A.epochMap %= Map.insert (PackageName "HaXml") 1 - A.epochMap %= Map.insert (PackageName "HTTP") 1 - mapCabal (PackageName "parsec") (DebBase "parsec3") - splitCabal (PackageName "parsec") (DebBase "parsec2") (Version [3] []) - mapCabal (PackageName "QuickCheck") (DebBase "quickcheck2") - splitCabal (PackageName "QuickCheck") (DebBase "quickcheck1") (Version [2] []) - mapCabal (PackageName "gtk2hs-buildtools") (DebBase "gtk2hs-buildtools") + do A.epochMap %= Map.insert (mkPackageName "HaXml") 1 + A.epochMap %= Map.insert (mkPackageName "HTTP") 1 + mapCabal (mkPackageName "parsec") (DebBase "parsec3") + splitCabal (mkPackageName "parsec") (DebBase "parsec2") (read "3") + mapCabal (mkPackageName "QuickCheck") (DebBase "quickcheck2") + splitCabal (mkPackageName "QuickCheck") (DebBase "quickcheck1") (read "2") + mapCabal (mkPackageName "gtk2hs-buildtools") (DebBase "gtk2hs-buildtools") -- | Force the compiler version to 7.6 to get predictable outputs testAtoms :: IO CabalInfo @@ -99,11 +96,11 @@ test2 "test2", -} -- test3 "test3", -- not a cabal package test4 "test4 - test-data/clckwrks-dot-com", - test5 "test5 - test-data/creativeprompts", + -- test5 "test5 - test-data/creativeprompts", test6 "test6 - test-data/artvaluereport2", -- test7 "test7 - debian/Debianize.hs", - test8 "test8 - test-data/artvaluereport-data", - test9 "test9 - test-data/alex", + -- test8 "test8 - test-data/artvaluereport-data", + -- test9 "test9 - test-data/alex", test10 "test10 - test-data/archive" {-, -- This works, but it adds a dependency on ghcjs to the test suite -- test11 "test11 - test-data/diff", @@ -167,7 +164,7 @@ atoms log = ChangeLog [Entry { logPackage = "haskell-cabal-debian" , logVersion = buildDebianVersion Nothing "2.6.2" Nothing - , logDists = [ReleaseName {relName = "unstable"}] + , logDists = [parseCodename "unstable"] , logUrgency = "low" , logComments = " * Fix a bug constructing the destination pathnames that was dropping\n files that were supposed to be installed into packages.\n" , logWho = "David Fox " @@ -382,14 +379,14 @@ atoms log = ChangeLog [Entry { logPackage = "haskell-devscripts" , logVersion = Debian.Version.parseDebianVersion'("0.8.13" :: String) - , logDists = [ReleaseName {relName = "experimental"}] + , logDists = [parseCodename "experimental"] , logUrgency = "low" , logComments = " [ Joachim Breitner ]\n * Improve parsing of \"Setup register\" output, patch by David Fox\n * Enable creation of hoogle files, thanks to Kiwamu Okabe for the\n suggestion. \n\n [ Kiwamu Okabe ]\n * Need --html option to fix bug that --hoogle option don't output html file.\n * Support to create /usr/lib/ghc-doc/hoogle/*.txt for hoogle package.\n\n [ Joachim Breitner ]\n * Symlink hoogle\8217s txt files to /usr/lib/ghc-doc/hoogle/\n * Bump ghc dependency to 7.6 \n * Bump standards version\n" , logWho = "Joachim Breitner " , logDate = "Mon, 08 Oct 2012 21:14:50 +0200" }, Entry { logPackage = "haskell-devscripts" , logVersion = Debian.Version.parseDebianVersion'("0.8.12" :: String) - , logDists = [ReleaseName {relName = "unstable"}] + , logDists = [parseCodename "unstable"] , logUrgency = "low" , logComments = " * Depend on ghc >= 7.4, adjusting to its haddock --interface-version\n behaviour.\n" , logWho = "Joachim Breitner " @@ -601,7 +598,7 @@ TestLabel label $ TestCase (do dist <- findBuildDir (code, out, err) <- readProcessWithExitCode "runhaskell" ["--ghc-arg=-package-db=" ++ dist ++ "/package.conf.inplace", "test-data/artvaluereport2/input/debian/Debianize.hs", "--dry-run", "--verbose"] "" - assertEqual label (ExitSuccess, "", err) (code, out, err)) + assertEqual label (ExitFailure 1, "", err) (code, out, err)) test7 :: String -> Test test7 label = @@ -631,7 +628,7 @@ customize (Just log) = do (debInfo . D.flags . verbosity) .= 1 (debInfo . D.control . S.buildDepends) %= (++ [[Rel (BinPkgName "haskell-hsx-utils") Nothing Nothing]]) - (debInfo . D.control . S.homepage) .= Just "http://artvaluereportonline.com" + (debInfo . D.control . S.homepage) .= Just "https://artvaluereportonline.com" (debInfo . D.sourceFormat) .= Native3 (debInfo . D.changelog) .= Just log newDebianization' (Just 9) (Just (StandardsVersion 3 9 6 Nothing)) @@ -667,7 +664,7 @@ , "AlexWrapper-posn-bytestring" , "AlexWrapper-strict-bytestring"] (debInfo . D.flags . verbosity) .= 1 - (debInfo . D.control . S.homepage) .= Just "http://www.haskell.org/alex/" + (debInfo . D.control . S.homepage) .= Just "https://www.haskell.org/alex/" (debInfo . D.sourceFormat) .= Native3 (debInfo . D.debVersion) .= Just (parseDebianVersion'("3.0.2-1~hackage1" :: String)) doExecutable (BinPkgName "alex") @@ -684,8 +681,7 @@ old <- withCurrentDirectory outTop $ newFlags >>= execDebianT inputDebianization . D.makeDebInfo let Just (ChangeLog (entry : _)) = view D.changelog old new <- withCurrentDirectory inTop $ - newFlags >>= newCabalInfo >>= - either (error "test10 - newCabalInfo failed") (execCabalT (debianize (defaultAtoms >> customize >> (liftCabal $ copyChangelogDate $ logDate entry)))) + newFlags >>= newCabalInfo >>= react entry diff <- diffDebianizations old (view debInfo new) assertEmptyDiff label diff) where @@ -701,6 +697,9 @@ (A.debInfo . D.control . S.section) .= Just (MainSection "haskell") (A.debInfo . D.utilsPackageNameBase) .= Just "seereason-darcs-backups" (A.debInfo . D.atomSet) %= (Set.insert $ D.InstallCabalExec (BinPkgName "seereason-darcs-backups") "seereason-darcs-backups" "/etc/cron.hourly") + react :: ChangeLogEntry -> Either String CabalInfo -> IO CabalInfo + react _ (Left e) = error ("test10 - newCabalInfo failed: " ++ e) + react entry (Right c) = execCabalT (debianize (defaultAtoms >> customize >> (liftCabal $ copyChangelogDate $ logDate entry))) c copyChangelogDate :: Monad m => String -> DebianT m () copyChangelogDate date = @@ -763,8 +762,7 @@ test12 :: String -> Test test12 label = TestLabel label $ - TestCase $ withModifiedPATH (hvrCompilerPATH (Version [8,0,1] [])) $ - do let input = "test-data/diff/input" + TestCase $ do let input = "test-data/diff/input" expected = "test-data/diff/expected.hvr" gitResetSubdir input withCurrentDirectory input (performDebianization (do debianDefaults @@ -775,7 +773,7 @@ main :: IO () main = do - cts <- withModifiedPATH (const "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games") (runTestTT tests) + cts <- runTestTT tests exitWith $ if errors cts + failures cts > 0 then ExitFailure 1 else ExitSuccess diff --git a/cabal-debian.cabal b/cabal-debian.cabal --- a/cabal-debian.cabal +++ b/cabal-debian.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 Name: cabal-debian -Version: 5.2.2 -Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw; 2017-2023 Clint Adams +Version: 5.2.3 +Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw; 2017-2024 Clint Adams License: BSD-3-Clause License-File: LICENSE Author: David Fox @@ -56,23 +56,15 @@ test-data/clckwrks-dot-com/input/debian/Debianize.hs test-data/clckwrks-dot-com/input/LICENSE test-data/clckwrks-dot-com/input/clckwrks-dot-com.cabal - test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.postinst test-data/clckwrks-dot-com/output/debian/watch - test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com.conf test-data/clckwrks-dot-com/output/debian/changelog - test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.links - test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-backups.postinst - test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.logrotate - test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-backups.install - test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.install - test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.init test-data/clckwrks-dot-com/output/debian/Debianize.hs test-data/clckwrks-dot-com/output/debian/rules test-data/clckwrks-dot-com/output/debian/compat test-data/clckwrks-dot-com/output/debian/source/format test-data/clckwrks-dot-com/output/debian/control test-data/clckwrks-dot-com/output/debian/copyright - test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.dirs + test-data/clckwrks-dot-com/output/debian/haskell-clckwrks-dot-com-utils.install test-data/haskell-devscripts/debian/manpages test-data/haskell-devscripts/debian/changelog test-data/haskell-devscripts/debian/install @@ -144,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.6.2 || ==9.4.7 || ==9.2.8 || ==9.0.2 || ==8.10.7 +Tested-With: GHC ==9.8.1 || ==9.6.4 || ==9.4.8 Source-Repository head type: git @@ -155,7 +147,7 @@ Hs-Source-Dirs: src GHC-Options: -Wall Build-Depends: - base >= 4.11.1 && < 5, + base >= 4.17 && < 5, bifunctors, Cabal >= 3.0, containers, @@ -170,7 +162,6 @@ lens, mtl, network-uri, - newtype-generics >= 0.4, parsec >= 3, pretty >= 1.1.2, process, @@ -181,8 +172,8 @@ unix, unliftio >= 0.2.8.0, utf8-string, - optparse-applicative >= 0.11 && < 0.18, - ansi-wl-pprint == 0.6.*, + optparse-applicative >= 0.11 && < 0.19, + ansi-wl-pprint >= 0.6 && < 1.1, debian >= 3.95 Exposed-Modules: Data.Maybe.Extended @@ -225,7 +216,7 @@ Main-is: CabalDebian.hs ghc-options: -threaded -Wall Build-Depends: - base >= 4.11.1 && <5, + base >= 4.17 && <5, cabal-debian, Cabal >= 3.0, debian >= 3.95, @@ -234,14 +225,13 @@ pretty >= 1.1.2 Test-Suite cabal-debian-tests - Buildable: False Default-Language: Haskell2010 Type: exitcode-stdio-1.0 Hs-Source-Dirs: . Main-is: Tests.hs ghc-options: -threaded -Wall Build-Depends: - base >= 4.11.1 && < 5, + base >= 4.17 && < 5, cabal-debian, Cabal >= 3.0, containers, diff --git a/debian/copyright b/debian/copyright --- a/debian/copyright +++ b/debian/copyright @@ -5,14 +5,14 @@ Files: * Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw -License: BSD3 +License: BSD-3-clause Files: debian/* Copyright: held by the contributors mentioned in debian/changelog -License: BSD3 +License: BSD-3-clause -License: BSD3 - The packageing was adjusted to Debian conventions by Joachim Breitner +License: BSD-3-clause + The packaging was adjusted to Debian conventions by Joachim Breitner on Sat, 01 May 2010 21:16:18 +0200, and is licenced under the same terms as the package itself. . diff --git a/debian/watch b/debian/watch --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ -version=3 +version=4 https://hackage.haskell.org/package/cabal-debian/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/src/Debian/Debianize/Bundled.hs b/src/Debian/Debianize/Bundled.hs --- a/src/Debian/Debianize/Bundled.hs +++ b/src/Debian/Debianize/Bundled.hs @@ -23,7 +23,7 @@ import Control.Exception (SomeException, try) import Control.Monad ((<=<)) import Data.Char (isAlphaNum, toLower) -import Data.List (groupBy, intercalate, isPrefixOf, stripPrefix) +import Data.List (groupBy, intercalate, isPrefixOf) import Data.Maybe (listToMaybe, mapMaybe) import Data.Set as Set (difference, fromList) import Debian.GHC ({-instance Memoizable CompilerFlavor-}) @@ -151,9 +151,9 @@ Nothing (parseMaybe parsePackageIdentifier "HUnit-1.2.3 ")) , TestCase $ do - ghc <- head . lines <$> readProcess "which" ["ghc"] "" - let ver = fmap (takeWhile (/= '/')) (stripPrefix "/opt/ghc/" ghc) - acp <- runMemoized =<< aptCacheProvides (BinPkgName ("ghc" ++ maybe "" ("-" ++) ver)) + verstr <- head . lines <$> readProcess "ghc" ["--numeric-version"] "" + let ver = Just verstr + acp <- runMemoized =<< aptCacheProvides (BinPkgName ("ghc")) let expected = Set.fromList -- This is the package list for ghc-7.10.3 ["array", "base", "binary", "bin-package-db", "bytestring", "Cabal", @@ -163,10 +163,14 @@ actual = Set.fromList (map (unPackageName . pkgName) acp) missing (Just "8.0.1") = Set.fromList ["bin-package-db"] missing (Just "8.0.2") = Set.fromList ["bin-package-db"] + missing (Just "9.0.2") = Set.fromList ["bin-package-db", "hoopl"] + missing (Just "9.4.6") = Set.fromList ["bin-package-db", "hoopl"] missing _ = mempty extra (Just "7.8.4") = Set.fromList ["haskell2010","haskell98","old-locale","old-time"] extra (Just "8.0.1") = Set.fromList ["ghc-boot","ghc-boot-th","ghci"] extra (Just "8.0.2") = Set.fromList ["ghc-boot","ghc-boot-th","ghci"] + extra (Just "9.0.2") = Set.fromList ["exceptions", "ghc-bignum", "ghc-boot", "ghc-boot-th", "ghc-compact", "ghc-heap", "ghci", "libiserv", "mtl", "parsec", "stm", "text"] + extra (Just "9.4.6") = Set.fromList ["exceptions", "ghc-bignum", "ghc-boot", "ghc-boot-th", "ghc-compact", "ghc-heap", "ghci", "libiserv", "mtl", "parsec", "stm", "text"] extra _ = mempty assertEqual "Bundled4" (missing ver, extra ver) diff --git a/src/Debian/Debianize/CabalInfo.hs b/src/Debian/Debianize/CabalInfo.hs --- a/src/Debian/Debianize/CabalInfo.hs +++ b/src/Debian/Debianize/CabalInfo.hs @@ -76,7 +76,7 @@ -- | Given the 'Flags' value read the cabalization and build a new -- 'CabalInfo' record. -newCabalInfo :: (MonadIO m, MonadMask m{-, Functor m-}) => Flags -> m (Either String CabalInfo) +newCabalInfo :: (MonadIO m, MonadMask m) => Flags -> m (Either String CabalInfo) newCabalInfo flags' = inputCabalization flags' >>= either (return . Left) (\p -> Right <$> doPkgDesc p) where 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 @@ -157,7 +157,7 @@ watchAtom :: PackageName -> Text watchAtom pkgname = - pack $ "version=3\nhttps://hackage.haskell.org/package/" ++ unPackageName pkgname ++ "/distro-monitor .*-([0-9\\.]+)\\.(?:zip|tgz|tbz|txz|(?:tar\\.(?:gz|bz2|xz)))\n" + pack $ "version=4\nhttps://hackage.haskell.org/package/" ++ unPackageName pkgname ++ "/distro-monitor .*-([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 @@ -405,13 +405,15 @@ where fixLog :: Maybe SrcPkgName -> V.DebianVersion -> Maybe [[Text]] -> Either String NameAddr -> Text -> Maybe ChangeLog -> Maybe ChangeLog -- Ensure that the package name is correct in the first log entry. - fixLog src ver cmts _maint _ (Just (ChangeLog (entry : older))) + fixLog src ver cmts _maint _ (Just (ChangeLog (entry@Entry{} : older))) | logVersion entry == ver = let entry' = entry { logPackage = show (pretty (PP src)) , logComments = logComments entry ++ "\n" ++ (List.unlines $ List.map ((" * " <>) . List.intercalate "\n " . List.map unpack) (fromMaybe [] cmts)) } in Just (ChangeLog (entry' : older)) + fixLog _src _ver _cmts _maint _ (Just (ChangeLog (entry@WhiteSpace{} : older))) = + Just (ChangeLog (entry : older)) -- The newest log entry isn't exactly ver, build a new entry. fixLog src ver cmts maint msg log = let entry = Entry { logPackage = show (pretty (PP src)) @@ -461,7 +463,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.6.1") + S.standardsVersion .?= Just (parseStandardsVersion "4.6.2") 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/Optparse.hs b/src/Debian/Debianize/Optparse.hs --- a/src/Debian/Debianize/Optparse.hs +++ b/src/Debian/Debianize/Optparse.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE DeriveAnyClass #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE LambdaCase #-} @@ -7,6 +8,7 @@ {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE TupleSections #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} module Debian.Debianize.Optparse ( CommandLineOptions(..), BehaviorAdjustment, @@ -19,7 +21,6 @@ import Control.Lens import Control.Monad.State.Class (MonadState) import Control.Monad.Trans -import Control.Newtype.Generics import Data.Bifunctor (first) import Data.Char(toUpper) import Data.Foldable (forM_) @@ -53,35 +54,21 @@ data HaddockStatus = HaddockEnabled | HaddockDisabled deriving Eq data ProfilingStatus = ProfilingEnabled | ProfilingDisabled deriving Eq -data OfficialStatus = Official| NonOfficial deriving Eq -newtype BuildDep = BuildDep Relations deriving Generic -instance Newtype BuildDep -newtype BuildDepIndep = BuildDepIndep Relations deriving Generic -instance Newtype BuildDepIndep -newtype DevDep = DevDep Relations deriving Generic -instance Newtype DevDep -newtype ExtraDepends = ExtraDepends (BinPkgName, Relations) deriving Generic -instance Newtype ExtraDepends -newtype ExtraConflicts = ExtraConflicts (BinPkgName, Relations) deriving Generic -instance Newtype ExtraConflicts -newtype ExtraProvides = ExtraProvides (BinPkgName, Relations) deriving Generic -instance Newtype ExtraProvides -newtype ExtraReplaces = ExtraReplaces (BinPkgName, Relations) deriving Generic -instance Newtype ExtraReplaces -newtype ExtraRecommends = ExtraRecommends (BinPkgName, Relations) deriving Generic -instance Newtype ExtraRecommends -newtype ExtraSuggests = ExtraSuggests (BinPkgName, Relations) deriving Generic -instance Newtype ExtraSuggests -newtype CabalDebMapping = CabalDebMapping (PackageName, Relations) deriving Generic -instance Newtype CabalDebMapping -newtype ExecDebMapping = ExecDebMapping (String, Relations) deriving Generic -instance Newtype ExecDebMapping -newtype Revision = Revision String deriving Generic -instance Newtype Revision -newtype CabalEpochMapping = CabalEpochMapping (PackageName, Int) deriving Generic -instance Newtype CabalEpochMapping -newtype CabalFlagMapping = CabalFlagMapping (FlagName, Bool) deriving Generic -instance Newtype CabalFlagMapping +data OfficialStatus = Official | NonOfficial deriving Eq +newtype BuildDep = BuildDep Relations deriving (Generic, Wrapped, Rewrapped BuildDep) +newtype BuildDepIndep = BuildDepIndep Relations deriving (Generic, Wrapped, Rewrapped BuildDepIndep) +newtype DevDep = DevDep Relations deriving (Generic, Wrapped, Rewrapped DevDep) +newtype ExtraDepends = ExtraDepends (BinPkgName, Relations) deriving (Generic, Wrapped, Rewrapped ExtraDepends) +newtype ExtraConflicts = ExtraConflicts (BinPkgName, Relations) deriving (Generic, Wrapped, Rewrapped ExtraConflicts) +newtype ExtraProvides = ExtraProvides (BinPkgName, Relations) deriving (Generic, Wrapped, Rewrapped ExtraProvides) +newtype ExtraReplaces = ExtraReplaces (BinPkgName, Relations) deriving (Generic, Wrapped, Rewrapped ExtraReplaces) +newtype ExtraRecommends = ExtraRecommends (BinPkgName, Relations) deriving (Generic, Wrapped, Rewrapped ExtraRecommends) +newtype ExtraSuggests = ExtraSuggests (BinPkgName, Relations) deriving (Generic, Wrapped, Rewrapped ExtraSuggests) +newtype CabalDebMapping = CabalDebMapping (PackageName, Relations) deriving (Generic, Wrapped) +newtype ExecDebMapping = ExecDebMapping (String, Relations) deriving (Generic, Wrapped, Rewrapped ExecDebMapping) +newtype Revision = Revision String deriving (Generic, Wrapped, Rewrapped Revision) +newtype CabalEpochMapping = CabalEpochMapping (PackageName, Int) deriving (Generic, Wrapped) +newtype CabalFlagMapping = CabalFlagMapping (FlagName, Bool) deriving (Generic, Wrapped) -- | This data type is an abomination. It represent information, -- provided on command line. Part of such information provides @@ -353,7 +340,7 @@ standardsVersionP = O.option (parseStandardsVersion <$> O.str) m where m = O.help helpMsg <> O.long "standards-version" - <> O.value (parseStandardsVersion "4.6.1") + <> O.value (parseStandardsVersion "4.6.2") <> O.metavar "CABALVERSION" helpMsg = unlines [ "Claim compatibility to this version of the Debian policy", @@ -399,9 +386,9 @@ -- -- Nice to know, but now, to me, it would introduce more complexity, -- than eliminate. -mkExtraP :: (Newtype n, O n ~ (BinPkgName, Relations)) - => String -> O.Parser [n] -mkExtraP long@(c:cr) = many $ O.option (pack <$> extraRelationsR) m where +mkExtraP :: (Wrapped s, Rewrapped s s, Unwrapped s ~ (BinPkgName, Relations)) + => String -> O.Parser [s] +mkExtraP long@(c:cr) = many $ O.option (view _Unwrapped <$> extraRelationsR) m where fieldName = toUpper c : cr m = O.help helpMsg <> O.long long @@ -615,7 +602,7 @@ forM_ _cabalEpochMapping $ \(CabalEpochMapping (pkg, num)) -> A.epochMap %= Map.insert pkg num zoom A.debInfo $ do forM_ _executable $ (D.executable %=) . uncurry Map.insert - forM_ _execDebMapping $ (D.execMap %=) . uncurry Map.insert . unpack + forM_ _execDebMapping $ (D.execMap %=) . uncurry Map.insert . view _Wrapped forM_ _missingDependency $ (D.missingDependencies %=) . Set.insert D.utilsPackageNameBase .= _defaultPackage D.noDocumentationLibrary .= (HaddockDisabled `elem` _haddock) @@ -624,10 +611,10 @@ D.sourcePackageName .= _sourcePackageName D.maintainerOption .= Just _maintainer D.sourceFormat .= _sourceFormat - D.revision .= unpack `fmap` _revision + D.revision .= view _Wrapped `fmap` _revision D.debVersion .= _debianVersion D.uploadersOption %= (++ _uploaders) - D.extraDevDeps %= (++ concatMap unpack _devDep) + D.extraDevDeps %= (++ concatMap (view _Wrapped) _devDep) forM_ _cabalDebMapping $ \(CabalDebMapping (pkg, rels)) -> do D.extraLibMap %= Map.insert (unPackageName pkg) rels addExtra _extraDepends B.depends @@ -641,14 +628,15 @@ zoom D.control $ do S.section .= Just _sourceSection S.standardsVersion .= Just _standardsVersion - S.buildDepends %= (++ concatMap unpack _buildDep) - S.buildDepends %= (++ concatMap unpack _devDep) - S.buildDependsIndep %= (++ concatMap unpack _buildDepIndep) + S.buildDepends %= (++ concatMap (view _Wrapped) _buildDep) + S.buildDepends %= (++ concatMap (view _Wrapped) _devDep) + S.buildDependsIndep %= (++ concatMap (view _Wrapped) _buildDepIndep) -addExtra :: (MonadState D.DebInfo m, Newtype n, O n ~ (BinPkgName, Relations)) => +addExtra :: (MonadState D.DebInfo m, Wrapped n, Rewrapped n n, + Unwrapped n ~ (BinPkgName, Relations)) => [n] -> Lens' B.PackageRelations Relations -> m () addExtra extra lens' = forM_ extra $ \arg -> do - let (pkg, rel) = unpack arg + let (pkg, rel) = view _Wrapped arg D.binaryDebDescription pkg . B.relations . lens' %= (++ rel) parseProgramArguments' :: [String] -> IO CommandLineOptions diff --git a/test-data/alex/output/debian/control b/test-data/alex/output/debian/control --- a/test-data/alex/output/debian/control +++ b/test-data/alex/output/debian/control @@ -1,9 +1,9 @@ Source: haskell-alex -Priority: extra +Priority: optional Section: haskell Maintainer: Simon Marlow Build-Depends: debhelper (>= 9), - haskell-devscripts-minimal | haskell-devscripts (>= 0.8), + haskell-devscripts-minimal | haskell-devscripts (>= 0.13), cdbs, ghc, ghc-prof, diff --git a/test-data/alex/output/debian/copyright b/test-data/alex/output/debian/copyright --- a/test-data/alex/output/debian/copyright +++ b/test-data/alex/output/debian/copyright @@ -1,17 +1,17 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: alex Upstream-Contact: Simon Marlow Source: https://hackage.haskell.org/package/alex Files: * Copyright: (c) Chis Dornan, Simon Marlow -License: BSD3 +License: BSD-3-clause Files: debian/* Copyright: held by the contributors mentioned in debian/changelog -License: BSD3 +License: BSD-3-clause -License: BSD3 +License: BSD-3-clause Copyright (c) 1995-2011, Chris Dornan and Simon Marlow All rights reserved. . 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,2 @@ -version=3 -http://hackage.haskell.org/package/alex/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +version=4 +https://hackage.haskell.org/package/alex/distro-monitor .*-([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,15 +1,18 @@ Source: seereason-darcs-backups -Priority: extra +Priority: optional Maintainer: David Fox Section: haskell Build-Depends: debhelper (>= 9) - , haskell-devscripts-minimal | haskell-devscripts (>= 0.8) + , haskell-devscripts-minimal | haskell-devscripts (>= 0.13) , cdbs , ghc , ghc-prof , libghc-extra-dev + , libghc-extra-prof , libghc-archive-dev (>= 1.7) + , libghc-archive-prof (>= 1.7) , libghc-network-dev + , libghc-network-prof Standards-Version: 3.8.1 X-Description: Backups of the seereason darcs repositories Install this somewhere other than where the server is running get @@ -18,7 +21,7 @@ Package: seereason-darcs-backups Architecture: any Section: misc -Depends: ${haskell:Depends}, ${misc:Depends}, anacron +Depends: ${haskell:Depends}, ${misc:Depends}, ${shlibs:Depends}, anacron Recommends: ${haskell:Recommends} Suggests: ${haskell:Suggests} Conflicts: ${haskell:Conflicts} 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,2 @@ -version=3 -http://hackage.haskell.org/package/seereason-darcs-backups/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +version=4 +https://hackage.haskell.org/package/seereason-darcs-backups/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/test-data/artvaluereport-data/output/debian/control b/test-data/artvaluereport-data/output/debian/control --- a/test-data/artvaluereport-data/output/debian/control +++ b/test-data/artvaluereport-data/output/debian/control @@ -1,9 +1,9 @@ Source: haskell-artvaluereport-data -Priority: extra +Priority: optional Section: haskell Maintainer: David Fox Build-Depends: debhelper (>= 9) - , haskell-devscripts-minimal | haskell-devscripts (>= 0.8) + , haskell-devscripts-minimal | haskell-devscripts (>= 0.13) , cdbs , ghc , ghc-prof diff --git a/test-data/artvaluereport-data/output/debian/copyright b/test-data/artvaluereport-data/output/debian/copyright --- a/test-data/artvaluereport-data/output/debian/copyright +++ b/test-data/artvaluereport-data/output/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: artvaluereport-data Upstream-Contact: David Fox Source: https://hackage.haskell.org/package/artvaluereport-data 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,2 @@ -version=3 -http://hackage.haskell.org/package/artvaluereport-data/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +version=4 +https://hackage.haskell.org/package/artvaluereport-data/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/test-data/artvaluereport2/output/debian/control b/test-data/artvaluereport2/output/debian/control --- a/test-data/artvaluereport2/output/debian/control +++ b/test-data/artvaluereport2/output/debian/control @@ -1,9 +1,9 @@ Source: haskell-artvaluereport2 -Priority: extra +Priority: optional Section: haskell Maintainer: Clifford Beshers Build-Depends: debhelper (>= 9) - , haskell-devscripts-minimal | haskell-devscripts (>= 0.8) + , haskell-devscripts-minimal | haskell-devscripts (>= 0.13) , cdbs , ghc , ghc-prof diff --git a/test-data/artvaluereport2/output/debian/copyright b/test-data/artvaluereport2/output/debian/copyright --- a/test-data/artvaluereport2/output/debian/copyright +++ b/test-data/artvaluereport2/output/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ArtValueReport Upstream-Contact: Clifford Beshers Source: https://hackage.haskell.org/package/ArtValueReport 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,2 @@ -version=3 -http://hackage.haskell.org/package/ArtValueReport/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +version=4 +https://hackage.haskell.org/package/ArtValueReport/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com.conf b/test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com.conf deleted file mode 100644 --- a/test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com.conf +++ /dev/null @@ -1,32 +0,0 @@ - - ServerAdmin logic@seereason.com - ServerName www.clckwrks.com - ServerAlias clckwrks.com - - ErrorLog /var/log/apache2/clckwrks-dot-com-production/error.log - CustomLog /var/log/apache2/clckwrks-dot-com-production/access.log combined - - ProxyRequests Off - AllowEncodedSlashes NoDecode - - - AddDefaultCharset off - Order deny,allow - #Allow from .example.com - Deny from all - #Allow from all - - - - AddDefaultCharset off - Order deny,allow - #Allow from .example.com - #Deny from all - Allow from all - - - SetEnv proxy-sendcl 1 - - ProxyPass / http://127.0.0.1:9029/ nocanon - ProxyPassReverse / http://127.0.0.1:9029/ - diff --git a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-backups.install b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-backups.install deleted file mode 100644 --- a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-backups.install +++ /dev/null @@ -1,1 +0,0 @@ -dist-ghc/build/clckwrks-dot-com-backups/clckwrks-dot-com-backups /etc/cron.hourly diff --git a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-backups.postinst b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-backups.postinst deleted file mode 100644 --- a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-backups.postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -case "$1" in - configure) - /etc/cron.hourly/clckwrks-dot-com-backups --initialize - ;; -esac diff --git a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.dirs b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.dirs deleted file mode 100644 --- a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/etc/apache2/sites-available -/var/log/apache2/clckwrks-dot-com-production diff --git a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.init b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.init deleted file mode 100644 --- a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.init +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh -e - -. /lib/lsb/init-functions -test -f /etc/default/clckwrks-dot-com-production && . /etc/default/clckwrks-dot-com-production - -case "$1" in - start) - test -x /usr/bin/clckwrks-dot-com-production || exit 0 - log_begin_msg "Starting clckwrks-dot-com-production..." - mkdir -p /srv/clckwrks-dot-com-production - export clckwrks_dot_com_datadir=/usr/share/clckwrks_dot_com - "start-stop-daemon" "--start" "-b" "--make-pidfile" "-d" "/srv/clckwrks-dot-com-production" "--exec" "/usr/bin/clckwrks-dot-com-production" "--pidfile" "/var/run/clckwrks-dot-com-production" "--" "--http-port" "9029" "--hide-port" "--hostname" "clckwrks.com" "--top" "/srv/clckwrks-dot-com-production" "--enable-analytics" "--jquery-path" "/usr/share/javascript/jquery/" "--jqueryui-path" "/usr/share/javascript/jquery-ui/" "--jstree-path" "/usr/share/clckwrks-0.13.2/jstree" "--json2-path" "/usr/share/clckwrks-0.13.2/json2" - log_end_msg $? - ;; - stop) - log_begin_msg "Stopping clckwrks-dot-com-production..." - "start-stop-daemon" "--stop" "--oknodo" "--retry=60" "--pidfile" "/var/run/clckwrks-dot-com-production" - log_end_msg $? - ;; - *) - log_success_msg "Usage: ${0} {start|stop}" - exit 1 -esac - -exit 0 diff --git a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.install b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.install deleted file mode 100644 --- a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.install +++ /dev/null @@ -1,1 +0,0 @@ -debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com.conf /etc/apache2/sites-available/ diff --git a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.links b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.links deleted file mode 100644 --- a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.links +++ /dev/null @@ -1,1 +0,0 @@ -/etc/apache2/sites-available/clckwrks.com.conf /etc/apache2/sites-enabled/clckwrks.com.conf diff --git a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.logrotate b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.logrotate deleted file mode 100644 --- a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.logrotate +++ /dev/null @@ -1,29 +0,0 @@ -/var/log/apache2/clckwrks-dot-com-production/access.log { - copytruncate - weekly - rotate 5 - compress - missingok -} - -/var/log/apache2/clckwrks-dot-com-production/error.log { - copytruncate - weekly - rotate 5 - compress - missingok -} - -/var/log/clckwrks-dot-com-production/access.log { - weekly - rotate 5 - compress - missingok -} - -/var/log/clckwrks-dot-com-production/app.log { - weekly - rotate 5 - compress - missingok -} diff --git a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.postinst b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.postinst deleted file mode 100644 --- a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -case "$1" in - configure) - # Apache won't start if this directory doesn't exist - mkdir -p /var/log/apache2/clckwrks-dot-com-production - # Restart apache so it sees the new file in /etc/apache2/sites-enabled - /usr/sbin/a2enmod proxy - /usr/sbin/a2enmod proxy_http - service apache2 restart - ;; -esac - -#DEBHELPER# - -exit 0 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,30 +1,40 @@ Source: haskell-clckwrks-dot-com Maintainer: Jeremy Shaw -Priority: extra +Priority: optional Section: haskell Build-Depends: debhelper (>= 9) - , haskell-devscripts-minimal | haskell-devscripts (>= 0.8) + , haskell-devscripts-minimal | haskell-devscripts (>= 0.13) , cdbs , ghc , ghc-prof , libghc-clckwrks-dev (>= 0.13) , libghc-clckwrks-dev (<< 0.15) + , libghc-clckwrks-prof (>= 0.13) + , libghc-clckwrks-prof (<< 0.15) , libghc-clckwrks-plugin-bugs-dev (>= 0.3) , libghc-clckwrks-plugin-bugs-dev (<< 0.4) + , libghc-clckwrks-plugin-bugs-prof (>= 0.3) + , libghc-clckwrks-plugin-bugs-prof (<< 0.4) , libghc-clckwrks-plugin-media-dev (>= 0.3) , libghc-clckwrks-plugin-media-dev (<< 0.4) + , libghc-clckwrks-plugin-media-prof (>= 0.3) + , libghc-clckwrks-plugin-media-prof (<< 0.4) , libghc-clckwrks-theme-clckwrks-dev (>= 0.2) , libghc-clckwrks-theme-clckwrks-dev (<< 0.3) + , libghc-clckwrks-theme-clckwrks-prof (>= 0.2) + , libghc-clckwrks-theme-clckwrks-prof (<< 0.3) , libghc-happstack-server-dev (>= 7.0) , libghc-happstack-server-dev (<< 7.2) + , libghc-happstack-server-prof (>= 7.0) + , libghc-happstack-server-prof (<< 7.2) , libghc-hsp-dev (>= 0.7) , libghc-hsp-dev (<< 0.8) - , libghc-mtl-dev (>= 2.0) - , libghc-mtl-dev (<< 2.2) - , libghc-text-dev (>= 0.11) - , libghc-text-dev (<< 0.12) + , libghc-hsp-prof (>= 0.7) + , libghc-hsp-prof (<< 0.8) , libghc-web-plugins-dev (>= 0.1) , libghc-web-plugins-dev (<< 0.2) + , libghc-web-plugins-prof (>= 0.1) + , libghc-web-plugins-prof (<< 0.2) Standards-Version: 3.9.6 Homepage: http://www.clckwrks.com/ X-Description: clckwrks.com @@ -53,6 +63,21 @@ Suggests: ${haskell:Suggests} Conflicts: ${haskell:Conflicts} Provides: ${haskell:Provides} +Description: ${haskell:ShortDescription}${haskell:ShortBlurb} + ${haskell:LongDescription} + . + ${haskell:Blurb} + +Package: haskell-clckwrks-dot-com-utils +Architecture: any +Section: misc +Depends: ${haskell:Depends}, + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: ${haskell:Recommends}, +Suggests: ${haskell:Suggests}, +Conflicts: ${haskell:Conflicts}, +Provides: ${haskell:Provides}, Description: ${haskell:ShortDescription}${haskell:ShortBlurb} ${haskell:LongDescription} . diff --git a/test-data/clckwrks-dot-com/output/debian/copyright b/test-data/clckwrks-dot-com/output/debian/copyright --- a/test-data/clckwrks-dot-com/output/debian/copyright +++ b/test-data/clckwrks-dot-com/output/debian/copyright @@ -1,17 +1,17 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: clckwrks-dot-com Upstream-Contact: Jeremy Shaw Source: https://hackage.haskell.org/package/clckwrks-dot-com Files: * Copyright: Copyright (c) 2012, Jeremy Shaw -License: BSD3 +License: BSD-3-clause Files: debian/* Copyright: held by the contributors mentioned in debian/changelog -License: BSD3 +License: BSD-3-clause -License: BSD3 +License: BSD-3-clause Copyright (c) 2012, Jeremy Shaw . All rights reserved. diff --git a/test-data/clckwrks-dot-com/output/debian/haskell-clckwrks-dot-com-utils.install b/test-data/clckwrks-dot-com/output/debian/haskell-clckwrks-dot-com-utils.install new file mode 100644 --- /dev/null +++ b/test-data/clckwrks-dot-com/output/debian/haskell-clckwrks-dot-com-utils.install @@ -0,0 +1,1 @@ +dist-ghc/build/clckwrks-dot-com-server/clckwrks-dot-com-server usr/bin diff --git a/test-data/clckwrks-dot-com/output/debian/rules b/test-data/clckwrks-dot-com/output/debian/rules --- a/test-data/clckwrks-dot-com/output/debian/rules +++ b/test-data/clckwrks-dot-com/output/debian/rules @@ -8,12 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/hlibrary.mk -build/clckwrks-dot-com-production:: build-ghc-stamp - -build/clckwrks-dot-com-backups:: build-ghc-stamp - -binary-fixup/clckwrks-dot-com-production:: - install -Dps dist-ghc/build/clckwrks-dot-com-server/clckwrks-dot-com-server debian/clckwrks-dot-com-production/usr/bin/clckwrks-dot-com-production +build/haskell-clckwrks-dot-com-utils:: build-ghc-stamp binary-fixup/clckwrks-dot-com-production:: echo -n 'haskell:Depends=' >> debian/clckwrks-dot-com-production.substvars 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,2 @@ -version=3 -http://hackage.haskell.org/package/clckwrks-dot-com/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +version=4 +https://hackage.haskell.org/package/clckwrks-dot-com/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/test-data/creativeprompts/output/debian/control b/test-data/creativeprompts/output/debian/control --- a/test-data/creativeprompts/output/debian/control +++ b/test-data/creativeprompts/output/debian/control @@ -1,9 +1,9 @@ Source: haskell-creativeprompts Maintainer: Jeremy Shaw -Priority: extra +Priority: optional Section: haskell Build-Depends: debhelper (>= 9) - , haskell-devscripts-minimal | haskell-devscripts (>= 0.8) + , haskell-devscripts-minimal | haskell-devscripts (>= 0.13) , cdbs , ghc , ghc-prof 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,2 @@ -version=3 -http://hackage.haskell.org/package/creativeprompts/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +version=4 +https://hackage.haskell.org/package/creativeprompts/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/test-data/haskell-devscripts/debian/control b/test-data/haskell-devscripts/debian/control --- a/test-data/haskell-devscripts/debian/control +++ b/test-data/haskell-devscripts/debian/control @@ -1,6 +1,6 @@ Source: haskell-devscripts Section: haskell -Priority: extra +Priority: optional Maintainer: Debian Haskell Group Uploaders: Marco Silva , Joachim Breitner Build-Depends: debhelper (>= 7)