diff --git a/Tests.hs b/Tests.hs --- a/Tests.hs +++ b/Tests.hs @@ -147,8 +147,8 @@ (S.maintainer . D.control . debInfo) ~= Just (NameAddr (Just "David Fox") "dsf@seereason.com") (S.standardsVersion . D.control . debInfo) ~= Just (StandardsVersion 3 9 3 (Just 1)) -- This will change as new versions of debian-policy are released (S.buildDepends . D.control . debInfo) %= - (++ [[Rel (BinPkgName "debhelper") (Just (GRE (parseDebianVersion ("7.0" :: String)))) Nothing], - [Rel (BinPkgName "haskell-devscripts") (Just (GRE (parseDebianVersion ("0.8" :: String)))) Nothing], + (++ [[Rel (BinPkgName "debhelper") (Just (GRE (parseDebianVersion ("9" :: String)))) Nothing], + [Rel (BinPkgName "haskell-devscripts") (Just (GRE (parseDebianVersion ("0.9" :: String)))) Nothing], [Rel (BinPkgName "cdbs") Nothing Nothing], [Rel (BinPkgName "ghc") Nothing Nothing], [Rel (BinPkgName "ghc-prof") Nothing Nothing]]) @@ -283,7 +283,7 @@ "\trm -f $(manpages)", "", ""]) - (debInfo . D.compat) ~= Just 7 + (debInfo . D.compat) ~= Just 9 (debInfo . D.copyright) %= (Just . id . fromMaybe (readCopyrightDescription "This package was debianized by John Goerzen on\nWed, 6 Oct 2004 09:46:14 -0500.\n\nCopyright information removed from this test data.\n")) (debInfo . D.control . S.source) ~= Just (SrcPkgName {unSrcPkgName = "haskell-devscripts"}) (debInfo . D.control . S.maintainer) ~= Just (NameAddr {nameAddr_name = Just "Debian Haskell Group", nameAddr_addr = "pkg-haskell-maintainers@lists.alioth.debian.org"}) @@ -409,7 +409,7 @@ (A.debInfo . D.missingDependencies) += (BinPkgName "libghc-clckwrks-theme-clckwrks-doc") (A.debInfo . D.sourceFormat) ~= Just Native3 (A.debInfo . D.control . S.homepage) ~= Just "http://www.clckwrks.com/" - newDebianization' (Just 7) (Just (StandardsVersion 3 9 4 Nothing)) + newDebianization' (Just 9) (Just (StandardsVersion 3 9 6 Nothing)) {- customize log = modifyM (lift . customize' log) customize' :: Maybe ChangeLog -> CabalInfo -> IO CabalInfo @@ -608,7 +608,7 @@ (debInfo . D.control . S.homepage) ~= Just "http://artvaluereportonline.com" (debInfo . D.sourceFormat) ~= Just Native3 (debInfo . D.changelog) ~= Just log - newDebianization' (Just 7) (Just (StandardsVersion 3 9 3 Nothing)) + newDebianization' (Just 9) (Just (StandardsVersion 3 9 6 Nothing)) test9 :: String -> Test test9 label = @@ -622,7 +622,7 @@ assertEqual label [] diff) where customize = - do newDebianization' (Just 7) (Just (StandardsVersion 3 9 3 Nothing)) + do newDebianization' (Just 9) (Just (StandardsVersion 3 9 6 Nothing)) mapM_ (\ name -> (debInfo . D.atomSet) %= (Set.insert $ D.InstallData (BinPkgName "alex") name name)) [ "AlexTemplate" , "AlexTemplate-debug" @@ -662,7 +662,7 @@ customize = do (A.debInfo . D.sourceFormat) ~= Just Native3 (A.debInfo . D.sourcePackageName) ~= Just (SrcPkgName "seereason-darcs-backups") - (A.debInfo . D.compat) ~= Just 5 + (A.debInfo . D.compat) ~= Just 9 (A.debInfo . D.control . S.standardsVersion) ~= Just (StandardsVersion 3 8 1 Nothing) (A.debInfo . D.control . S.maintainer) ~= either (const Nothing) Just (parseMaintainer "David Fox ") (A.debInfo . D.binaryDebDescription (BinPkgName "seereason-darcs-backups") . B.relations . B.depends) %= (++ [[Rel (BinPkgName "anacron") Nothing Nothing]]) diff --git a/cabal-debian.cabal b/cabal-debian.cabal --- a/cabal-debian.cabal +++ b/cabal-debian.cabal @@ -1,5 +1,5 @@ Name: cabal-debian -Version: 4.24.3 +Version: 4.24.5 Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw License: BSD3 License-File: LICENSE @@ -154,7 +154,7 @@ GHC-Options: -Wall -O2 Build-Depends: base < 5, - Cabal >= 1.9, + Cabal >= 1.18, containers, data-default, deepseq, @@ -273,7 +273,7 @@ Hs-Source-Dirs: . Main-is: CabalDebian.hs ghc-options: -threaded -Wall -O2 - Build-Depends: base, cabal-debian, Cabal >= 1.9, lens, mtl, pretty + Build-Depends: base, cabal-debian, Cabal >= 1.18, lens, mtl, pretty if !flag(local-debian) Build-Depends: debian >= 3.87 @@ -281,6 +281,6 @@ Hs-Source-Dirs: . Main-is: Tests.hs ghc-options: -threaded -Wall -O2 - Build-Depends: base, cabal-debian, Cabal >= 1.9, containers, filepath, hsemail, HUnit, lens, prettyclass, process, text + Build-Depends: base, cabal-debian, Cabal >= 1.18, containers, filepath, hsemail, HUnit, lens, prettyclass, process, text if !flag(local-debian) Build-Depends: debian >= 3.87 diff --git a/debian/Debianize.hs b/debian/Debianize.hs --- a/debian/Debianize.hs +++ b/debian/Debianize.hs @@ -18,8 +18,10 @@ import Data.Monoid (mempty) import Data.Set as Set (singleton, insert) import Data.Text as Text (Text, pack) +import Data.Version (Version(Version)) import Debian.Changes (ChangeLog(ChangeLog)) import Debian.Debianize +import Distribution.Package (PackageName(PackageName)) {- import Debian.Debianize (inputChangeLog, inputDebianization) import Debian.Debianize.Details (debianDefaultAtoms) @@ -66,7 +68,9 @@ where customize :: Monad m => CabalT m () customize = - do (debInfo . sourceFormat) ~= Just Native3 + do mapCabal (PackageName "Cabal") (DebBase "cabal-122") + splitCabal (PackageName "Cabal") (DebBase "cabal") (Version [1,22] []) + (debInfo . sourceFormat) ~= Just Native3 (debInfo . control . standardsVersion) ~= Just (StandardsVersion 3 9 3 Nothing) (debInfo . compat) ~= Just 9 (debInfo . utilsPackageNameBase) ~= Just "cabal-debian" diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +haskell-cabal-debian (4.24.5) unstable; urgency=low + + * Patch from Dmitry Bogatov for filling in debian/copyright fields + * Patch from Dmitry Bogatov for debhelper and haskell-devscripts build deps + * Patch from Dmitry Bogatov for default changelog message + * Add a --no-run-tests flag to control the nocheck option + * Compatibility with different GHC versions + + -- David Fox Sat, 21 Mar 2015 10:14:48 -0700 + haskell-cabal-debian (4.24.3) unstable; urgency=low * Always include the test suite build dependencies in debian/control, 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 @@ -119,8 +119,9 @@ cDeps <- allBuildDepends noTestSuite pkgDesc >>= mapM (buildDependencies hcTypePairs) >>= return . {-nub .-} concat bDeps <- access (A.debInfo . D.control . S.buildDepends) prof <- not <$> access (A.debInfo . D.noProfilingLibrary) - let xs = nub $ [[D.Rel (D.BinPkgName "debhelper") (Just (D.GRE (parseDebianVersion ("7.0" :: String)))) Nothing], - [D.Rel (D.BinPkgName "haskell-devscripts") (Just (D.GRE (parseDebianVersion ("0.8" :: String)))) Nothing], + compat <- access (A.debInfo . D.compat) + let xs = nub $ [maybe [] (\ n -> [D.Rel (D.BinPkgName "debhelper") (Just (D.GRE (parseDebianVersion (show n)))) Nothing]) compat, + [D.Rel (D.BinPkgName "haskell-devscripts") (Just (D.GRE (parseDebianVersion ("0.9" :: String)))) Nothing], anyrel "cdbs"] ++ (if member GHC hcs then [anyrel' (compilerPackageName GHC B.Development)] ++ if prof then [anyrel' (compilerPackageName GHC B.Profiling)] else [] 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 @@ -30,7 +30,7 @@ import Data.Monoid (Monoid(..)) import Data.Text as Text (null, pack, strip) import Debian.Debianize.BasicInfo (Flags) -import Debian.Debianize.DebInfo as D (control, copyright, DebInfo, makeDebInfo, noTestSuite, rulesSettings, official) +import Debian.Debianize.DebInfo as D (control, copyright, DebInfo, makeDebInfo, noTestSuite, noTestSuiteRun, rulesSettings) import Debian.Debianize.BinaryDebDescription (Canonical(canonical)) import Debian.Debianize.CopyrightDescription (defaultCopyrightDescription) import Debian.Debianize.InputCabal (inputCabalization) @@ -98,7 +98,10 @@ x -> Just x noTests <- access (debInfo . noTestSuite) unless (List.null (Cabal.testSuites pkgDesc) || noTests) - (do (debInfo . rulesSettings) %= (++ ["DEB_ENABLE_TESTS = yes", "DEB_BUILD_OPTIONS += nocheck"]))) + (do (debInfo . rulesSettings) %= (++ ["DEB_ENABLE_TESTS = yes"]) + noRun <- access (debInfo . noTestSuiteRun) + when noRun $ (debInfo . rulesSettings) %= (++ ["DEB_BUILD_OPTIONS += nocheck"]) + )) (makeCabalInfo flags' pkgDesc) makeCabalInfo :: Flags -> PackageDescription -> CabalInfo diff --git a/src/Debian/Debianize/CopyrightDescription.hs b/src/Debian/Debianize/CopyrightDescription.hs --- a/src/Debian/Debianize/CopyrightDescription.hs +++ b/src/Debian/Debianize/CopyrightDescription.hs @@ -1,5 +1,5 @@ -- | -{-# LANGUAGE CPP, DeriveDataTypeable, FlexibleInstances, OverloadedStrings, ScopedTypeVariables, TemplateHaskell, TupleSections #-} +{-# LANGUAGE CPP, DeriveDataTypeable, FlexibleInstances, OverloadedStrings, ScopedTypeVariables, TemplateHaskell, TupleSections, LambdaCase #-} module Debian.Debianize.CopyrightDescription ( CopyrightDescription(..) , FilesOrLicenseDescription(..) @@ -39,15 +39,18 @@ import Debian.Policy (License(..), readLicense, fromCabalLicense) import Debian.Pretty (prettyText, ppText) import qualified Distribution.License as Cabal (License(UnknownLicense)) +import qualified Distribution.Package as Cabal #if MIN_VERSION_Cabal(1,20,0) -import qualified Distribution.PackageDescription as Cabal (PackageDescription(licenseFiles, copyright, license)) +import qualified Distribution.PackageDescription as Cabal (PackageDescription(licenseFiles, copyright, license, package, maintainer)) #else -import qualified Distribution.PackageDescription as Cabal (PackageDescription(licenseFile, copyright, license)) +import qualified Distribution.PackageDescription as Cabal (PackageDescription(licenseFile, copyright, license, package, maintainer)) #endif import Network.URI (URI, parseURI) import Prelude hiding (init, init, log, log, unlines, readFile) import Text.PrettyPrint.HughesPJClass (Pretty(pPrint), text) +unPackageName (Cabal.PackageName x) = x + -- | Description of the machine readable debian/copyright file. A -- special case is used to represeent the old style free format file - -- if the value is equal to newCopyrightDescription except for the @@ -170,6 +173,39 @@ [ Field ("License", " " <> prettyText (_license ld)) ] ++ maybe [] (\ t -> [Field ("Comment", " " <> t)]) (_comment ld) + +sourceDefaultFilesDescription :: Maybe Text -> License -> FilesOrLicenseDescription +sourceDefaultFilesDescription copyrt license = + FilesDescription { + _filesPattern = "*" + , _filesCopyright = fromMaybe "(No copyright field in cabal file)" copyrt + , _filesLicense = license + , _filesComment = mempty + } + + + +debianDefaultFilesDescription :: License -> FilesOrLicenseDescription +debianDefaultFilesDescription license = + FilesDescription { + _filesPattern = "*/debian" + , _filesCopyright = "held by the contributors mentioned in debian/changelog" + , _filesLicense = license + , _filesComment = mempty + } + +defaultLicenseDescriptions :: License -> [(FilePath, Maybe Text)] + -> [FilesOrLicenseDescription] +defaultLicenseDescriptions license = \case + [] -> [] + [(_, comment)] -> [LicenseDescription license comment] + pairs -> map mkLicenseDescription pairs where + mkLicenseDescription (path, comment) = + LicenseDescription { + _license = fromCabalLicense (Cabal.UnknownLicense path) + , _comment = comment + } + -- | Infer a 'CopyrightDescription' from a Cabal package description. -- This will try to read any copyright files listed in the cabal -- configuration. Inputs include the license field from the cabal @@ -183,6 +219,8 @@ let (debianCopyrightPath, otherLicensePaths) = partition (== "debian/copyright") [Cabal.licenseFile pkgDesc] #endif license = fromCabalLicense $ Cabal.license pkgDesc + pkgname = unPackageName . Cabal.pkgName . Cabal.package $ pkgDesc + maintainer = Cabal.maintainer $ pkgDesc -- This is an @Nothing@ unless debian/copyright is (for some -- reason) mentioned in the cabal file. debianCopyrightText <- mapM readFileMaybe debianCopyrightPath >>= return . listToMaybe . catMaybes @@ -194,25 +232,14 @@ -- All we have is the name of the license let copyrt = fmap dots $ nothingIf (Text.null . strip) (pack (Cabal.copyright pkgDesc)) in def { _filesAndLicenses = - [ FilesDescription - { _filesPattern = "*" - , _filesCopyright = fromMaybe (pack "(No copyright field in cabal file)") copyrt - , _filesLicense = license - , _filesComment = mempty } - , FilesDescription - { _filesPattern = "*/debian" - , _filesCopyright = "held by the contributors mentioned in debian/changelog" - , _filesLicense = license - , _filesComment = mempty } ] ++ - case licenseCommentPairs of - [] -> [] - [(_, comment)] -> - [ LicenseDescription - { _license = license - , _comment = comment } ] - _ -> map (\ (path, comment) -> LicenseDescription - { _license = fromCabalLicense (Cabal.UnknownLicense path) - , _comment = comment }) licenseCommentPairs } + [ sourceDefaultFilesDescription copyrt license, + debianDefaultFilesDescription license ] ++ + defaultLicenseDescriptions license licenseCommentPairs + , _upstreamName = Just . pack $ pkgname + , _upstreamSource = Just . pack $ "https://hackage.haskell.org/package/" ++ pkgname + , _upstreamContact = nothingIf Text.null (pack maintainer) + } + {- -- We don't really have a way to associate licenses with -- file patterns, so we will just cover some simple cases, diff --git a/src/Debian/Debianize/DebInfo.hs b/src/Debian/Debianize/DebInfo.hs --- a/src/Debian/Debianize/DebInfo.hs +++ b/src/Debian/Debianize/DebInfo.hs @@ -68,6 +68,7 @@ , extraDevDeps , official , noTestSuite + , noTestSuiteRun , allowDebianSelfBuildDeps , binaryDebDescription @@ -253,6 +254,8 @@ -- ^ Whether this packaging is created by the Debian Haskell Group , _noTestSuite :: Bool -- ^ Force omission of the test suites from the debianization + , _noTestSuiteRun :: Bool + -- ^ Prevent the test suite from being run during the package build , _allowDebianSelfBuildDeps :: Bool -- ^ Normally self dependencies are filtered out of the debian -- build dependency list because they usually reflect @@ -366,6 +369,7 @@ , _extraDevDeps = mempty , _official = False , _noTestSuite = False + , _noTestSuiteRun = False , _allowDebianSelfBuildDeps = False } 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 @@ -281,7 +281,7 @@ cmts <- access (A.debInfo . D.comments) (A.debInfo . D.changelog) %= fmap (dropFutureEntries ver) prog <- liftIO getProgName - let msg = pack ("Debianization generated by cabal-debian-" ++ showVersion version ++ " (" ++ show prog ++ ")") + let msg = "Initial release (Closes: #nnnn)" (A.debInfo . D.changelog) %= fixLog src ver cmts debianMaintainer msg where fixLog :: Maybe SrcPkgName -> DebianVersion -> Maybe [[Text]] -> NameAddr -> Text -> Maybe ChangeLog -> Maybe ChangeLog @@ -335,7 +335,7 @@ do pkgDesc <- access A.packageDescription let PackageName cabal = pkgName (Cabal.package pkgDesc) - (A.debInfo . D.control . S.standardsVersion) ~?= Just (parseStandardsVersion "3.9.5") + (A.debInfo . D.control . S.standardsVersion) ~?= Just (parseStandardsVersion "3.9.6") (A.debInfo . D.control . S.homepage) ~?= Just ("http://hackage.haskell.org/package/" <> pack cabal) (A.debInfo . D.omitProfVersionDeps) ~= True SrcPkgName src <- access (A.debInfo . D.sourcePackageName) >>= maybe (error "officialSettings: no sourcePackageName") return diff --git a/src/Debian/Debianize/Options.hs b/src/Debian/Debianize/Options.hs --- a/src/Debian/Debianize/Options.hs +++ b/src/Debian/Debianize/Options.hs @@ -184,7 +184,9 @@ , "run by haskell-devscripts. The build subdirectory is added to match the" , "behavior of the --builddir option in the Setup script."]), Option "" ["no-test-suite"] (NoArg ((A.debInfo . D.noTestSuite) ~= True)) - "Don't build or run the test suite.", + "Don't build the test suite.", + Option "" ["no-test-suite-run"] (NoArg ((A.debInfo . D.noTestSuiteRun) ~= True)) + "Don't run the test suite during the build.", Option "" ["allow-debian-self-build-deps"] (NoArg ((A.debInfo . D.allowDebianSelfBuildDeps) ~= True)) (unlines [ "Set this to allow self dependencies in the debian package build dependencies." , "This may occasionally be necessary for a package that relies on an older" diff --git a/src/Debian/GHC.hs b/src/Debian/GHC.hs --- a/src/Debian/GHC.hs +++ b/src/Debian/GHC.hs @@ -15,7 +15,7 @@ import Control.DeepSeq (force) import Control.Exception (SomeException, try) import Control.Monad (when) -import Data.Char (isSpace, toLower, toUpper) +import Data.Char ({-isSpace, toLower,-} toUpper) import Data.Function.Memoize (deriveMemoizable, memoize2) import Data.Maybe (fromMaybe) import Data.Version (showVersion, Version(Version)) diff --git a/test-data/alex/output/debian/changelog b/test-data/alex/output/debian/changelog --- a/test-data/alex/output/debian/changelog +++ b/test-data/alex/output/debian/changelog @@ -1,5 +1,5 @@ haskell-alex (3.0.2-1~hackage1) UNRELEASED; urgency=low - * Debianization generated by cabal-debian-4.24 ("cabal-debian-tests") + * Initial release (Closes: #nnnn) -- Simon Marlow Thu, 31 Jan 2013 10:51:47 -0800 diff --git a/test-data/alex/output/debian/compat b/test-data/alex/output/debian/compat --- a/test-data/alex/output/debian/compat +++ b/test-data/alex/output/debian/compat @@ -1,1 +1,1 @@ -7 +9 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 @@ -2,8 +2,8 @@ Priority: extra Section: haskell Maintainer: Simon Marlow -Build-Depends: debhelper (>= 7.0), - haskell-devscripts (>= 0.8), +Build-Depends: debhelper (>= 9), + haskell-devscripts (>= 0.9), cdbs, ghc, ghc-prof, @@ -12,7 +12,7 @@ libghc-quickcheck2-prof (>= 2), Build-Depends-Indep: ghc-doc , libghc-quickcheck2-doc (>= 2) | libghc-quickcheck1-doc (<< 2) -Standards-Version: 3.9.3 +Standards-Version: 3.9.6 Homepage: http://www.haskell.org/alex/ X-Description: Alex is a tool for generating lexical analysers in Haskell 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,4 +1,7 @@ Format: http://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 diff --git a/test-data/archive/output/debian/compat b/test-data/archive/output/debian/compat --- a/test-data/archive/output/debian/compat +++ b/test-data/archive/output/debian/compat @@ -1,1 +1,1 @@ -5 +9 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 @@ -2,8 +2,8 @@ Priority: extra Maintainer: David Fox Section: haskell -Build-Depends: debhelper (>= 7.0) - , haskell-devscripts (>= 0.8) +Build-Depends: debhelper (>= 9) + , haskell-devscripts (>= 0.9) , cdbs , ghc , ghc-prof diff --git a/test-data/artvaluereport-data/output/debian/compat b/test-data/artvaluereport-data/output/debian/compat --- a/test-data/artvaluereport-data/output/debian/compat +++ b/test-data/artvaluereport-data/output/debian/compat @@ -1,1 +1,1 @@ -7 +9 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 @@ -2,8 +2,8 @@ Priority: extra Section: haskell Maintainer: David Fox -Build-Depends: debhelper (>= 7.0) - , haskell-devscripts (>= 0.8) +Build-Depends: debhelper (>= 9) + , haskell-devscripts (>= 0.9) , cdbs , ghc , ghc-prof @@ -132,7 +132,7 @@ , libghc-syb-with-class-doc , libghc-text-doc , libghc-utf8-string-doc -Standards-Version: 3.9.3 +Standards-Version: 3.9.6 Homepage: http://artvaluereportonline.com X-Description: Data structures used by the fine art appraisal application Data structures used by the fine art appraisal application 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,7 @@ Format: http://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 Files: * Copyright: (c) 2008-2011, SeeReason Partners LLC diff --git a/test-data/artvaluereport2/input/debian/Debianize.hs b/test-data/artvaluereport2/input/debian/Debianize.hs --- a/test-data/artvaluereport2/input/debian/Debianize.hs +++ b/test-data/artvaluereport2/input/debian/Debianize.hs @@ -15,7 +15,7 @@ -- import Debian.Debianize.SourceDebDescription (SourceDebDescription) -- import Debian.Debianize.Output (compareDebianization) -- import Debian.Debianize.Prelude ((~=), (%=), (+=), (++=), (+++=), (~?=), withCurrentDirectory) -import Debian.Pretty (ppDisplay) +import Debian.Pretty (ppShow) import Debian.Policy (databaseDirectory, PackageArchitectures(All), StandardsVersion(StandardsVersion)) import Debian.Relation (BinPkgName(BinPkgName), Relation(Rel), SrcPkgName(..), VersionReq(SLT)) import Debian.Version (parseDebianVersion) @@ -64,9 +64,9 @@ (debInfo . binaryDebDescription (BinPkgName "artvaluereport2-development") . architecture) ~= Just All -- utilsPackageNames [BinPkgName "artvaluereport2-server"] (debInfo . sourcePackageName) ~= Just (SrcPkgName "haskell-artvaluereport2") - (debInfo . control . standardsVersion) ~= Just (StandardsVersion 3 9 1 Nothing) + (debInfo . control . standardsVersion) ~= Just (StandardsVersion 3 9 6 Nothing) (debInfo . control . homepage) ~= Just "http://appraisalreportonline.com" - (debInfo . compat) ~= Just 7 + (debInfo . compat) ~= Just 9 addServerDeps :: CabalT IO () addServerDeps = mapM_ addDeps (map BinPkgName ["artvaluereport2-development", "artvaluereport2-staging", "artvaluereport2-production"]) @@ -101,7 +101,7 @@ BinPkgName "artvaluereport2-production" -> "http://" ++ hostname' ++ "/" _ -> "http://seereason.com:" ++ show (portNum deb) ++ "/" , "--top", databaseDirectory deb - , "--logs", "/var/log/" ++ ppDisplay deb + , "--logs", "/var/log/" ++ ppShow deb , "--log-mode", case deb of BinPkgName "artvaluereport2-production" -> "Production" _ -> "Development" @@ -116,7 +116,7 @@ , "--json2-path",json2Path ] -}) , installFile = InstallFile { execName = "artvaluereport2-server" - , destName = ppDisplay deb + , destName = ppShow deb , sourceDir = Nothing , destDir = Nothing } } diff --git a/test-data/artvaluereport2/output/debian/compat b/test-data/artvaluereport2/output/debian/compat --- a/test-data/artvaluereport2/output/debian/compat +++ b/test-data/artvaluereport2/output/debian/compat @@ -1,1 +1,1 @@ -7 +9 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 @@ -2,8 +2,8 @@ Priority: extra Section: haskell Maintainer: Clifford Beshers -Build-Depends: debhelper (>= 7.0) - , haskell-devscripts (>= 0.8) +Build-Depends: debhelper (>= 9) + , haskell-devscripts (>= 0.9) , cdbs , ghc , ghc-prof @@ -194,7 +194,7 @@ , libghc-web-routes-happstack-doc , libghc-web-routes-hsp-doc , libghc-web-routes-th-doc -Standards-Version: 3.9.1 +Standards-Version: 3.9.6 Homepage: http://appraisalreportonline.com X-Description: Haskell modules for fine art appraisal applications Haskell modules for fine art appraisal applications 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,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ArtValueReport +Upstream-Contact: Clifford Beshers +Source: https://hackage.haskell.org/package/ArtValueReport Files: * Copyright: (c) 2008-2011, SeeReason Partners LLC diff --git a/test-data/clckwrks-dot-com/output/debian/compat b/test-data/clckwrks-dot-com/output/debian/compat --- a/test-data/clckwrks-dot-com/output/debian/compat +++ b/test-data/clckwrks-dot-com/output/debian/compat @@ -1,1 +1,1 @@ -7 +9 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 @@ -2,8 +2,8 @@ Maintainer: Jeremy Shaw Priority: extra Section: haskell -Build-Depends: debhelper (>= 7.0) - , haskell-devscripts (>= 0.8) +Build-Depends: debhelper (>= 9) + , haskell-devscripts (>= 0.9) , cdbs , ghc , ghc-prof @@ -52,7 +52,7 @@ , libghc-mtl-doc , libghc-text-doc , libghc-web-plugins-doc -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://www.clckwrks.com/ X-Description: clckwrks.com 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,4 +1,7 @@ Format: http://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 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 @@ -2,8 +2,8 @@ Maintainer: Jeremy Shaw Priority: extra Section: haskell -Build-Depends: debhelper (>= 7.0) - , haskell-devscripts (>= 0.8) +Build-Depends: debhelper (>= 9) + , haskell-devscripts (>= 0.9) , cdbs , ghc , ghc-prof diff --git a/test-data/creativeprompts/output/debian/creativeprompts-data.install b/test-data/creativeprompts/output/debian/creativeprompts-data.install --- a/test-data/creativeprompts/output/debian/creativeprompts-data.install +++ b/test-data/creativeprompts/output/debian/creativeprompts-data.install @@ -1,13 +1,13 @@ -static/theme/comment-bottom.png usr/share/creativeprompts/static/theme -static/theme/comment-middle.png usr/share/creativeprompts/static/theme -static/theme/comment-top.png usr/share/creativeprompts/static/theme -static/theme/creative-prompts-logo.png usr/share/creativeprompts/static/theme -static/theme/entry-bottom.png usr/share/creativeprompts/static/theme -static/theme/entry-middle.png usr/share/creativeprompts/static/theme -static/theme/entry-top.png usr/share/creativeprompts/static/theme -static/theme/json2.js usr/share/creativeprompts/static/theme -static/theme/menu-bar-background.png usr/share/creativeprompts/static/theme -static/theme/menu-gradient.png usr/share/creativeprompts/static/theme -static/theme/paint-background.jpg usr/share/creativeprompts/static/theme -static/theme/site.js usr/share/creativeprompts/static/theme -static/theme/style.css usr/share/creativeprompts/static/theme +./static/theme/comment-bottom.png usr/share/creativeprompts/static/theme +./static/theme/comment-middle.png usr/share/creativeprompts/static/theme +./static/theme/comment-top.png usr/share/creativeprompts/static/theme +./static/theme/creative-prompts-logo.png usr/share/creativeprompts/static/theme +./static/theme/entry-bottom.png usr/share/creativeprompts/static/theme +./static/theme/entry-middle.png usr/share/creativeprompts/static/theme +./static/theme/entry-top.png usr/share/creativeprompts/static/theme +./static/theme/json2.js usr/share/creativeprompts/static/theme +./static/theme/menu-bar-background.png usr/share/creativeprompts/static/theme +./static/theme/menu-gradient.png usr/share/creativeprompts/static/theme +./static/theme/paint-background.jpg usr/share/creativeprompts/static/theme +./static/theme/site.js usr/share/creativeprompts/static/theme +./static/theme/style.css usr/share/creativeprompts/static/theme