diff -Nru cabal-debian-4.38/cabal-debian.cabal cabal-debian-4.38.2/cabal-debian.cabal --- cabal-debian-4.38/cabal-debian.cabal 2018-04-29 17:08:37.000000000 +0000 +++ cabal-debian-4.38.2/cabal-debian.cabal 2018-10-23 19:55:46.000000000 +0000 @@ -1,5 +1,5 @@ Name: cabal-debian -Version: 4.38 +Version: 4.38.2 Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw License: BSD3 License-File: LICENSE diff -Nru cabal-debian-4.38/changelog cabal-debian-4.38.2/changelog --- cabal-debian-4.38/changelog 2018-04-29 17:08:37.000000000 +0000 +++ cabal-debian-4.38.2/changelog 2018-10-23 19:55:46.000000000 +0000 @@ -1,3 +1,40 @@ +haskell-cabal-debian (4.38.2) unstable; urgency=medium + + * Support for Cabal-2.2 + + -- David Fox Tue, 03 Jul 2018 07:48:47 -0700 + +haskell-cabal-debian (4.38) unstable; urgency=medium + + * It turns out we now need to install the profiling libraries for + executable and test suite build dependencies. + + -- David Fox Sat, 28 Apr 2018 09:14:20 -0700 + +haskell-cabal-debian (4.37) unstable; urgency=medium + + * Decouple the website building code from the rest. + + -- David Fox Fri, 27 Apr 2018 14:28:42 -0700 + +haskell-cabal-debian (4.36.1) unstable; urgency=medium + + * Disable some debug output. + + -- David Fox Wed, 22 Nov 2017 03:42:18 -0800 + +haskell-cabal-debian (4.36) unstable; urgency=medium + + * Support for Cabal-2 + + -- David Fox Fri, 13 Oct 2017 00:11:19 -0700 + +haskell-cabal-debian (4.35.7) unstable; urgency=low + + * Remove logrotate from standard server package site config. + + -- David Fox Sun, 11 Dec 2016 12:26:58 -0800 + haskell-cabal-debian (4.35.6) unstable; urgency=low * Restore ghc-7.6.3 support diff -Nru cabal-debian-4.38/debian/changelog cabal-debian-4.38.2/debian/changelog --- cabal-debian-4.38/debian/changelog 2018-06-11 12:20:11.000000000 +0000 +++ cabal-debian-4.38.2/debian/changelog 2018-11-01 13:02:20.000000000 +0000 @@ -1,3 +1,30 @@ +cabal-debian (4.38.2-1) unstable; urgency=medium + + * New upstream release + * Set license to BSD-3-clause + + -- Ilias Tsitsimpis Thu, 01 Nov 2018 15:02:20 +0200 + +cabal-debian (4.38.1-3) unstable; urgency=medium + + * Remove build dependency on libghc-parsec3-dev (provided by ghc- + 8.4.3) + + -- Ilias Tsitsimpis Wed, 03 Oct 2018 12:06:10 +0300 + +cabal-debian (4.38.1-2) unstable; urgency=medium + + * Remove build dependency on libghc-mtl-dev (provided by ghc-8.4.3) + * Remove build dependency on libghc-text-dev (provided by ghc-8.4.3) + + -- Ilias Tsitsimpis Mon, 01 Oct 2018 13:47:24 +0300 + +cabal-debian (4.38.1-1) unstable; urgency=medium + + * New upstream release + + -- Ilias Tsitsimpis Sat, 29 Sep 2018 14:12:40 +0300 + cabal-debian (4.38-1) unstable; urgency=medium [ Clint Adams ] diff -Nru cabal-debian-4.38/debian/control cabal-debian-4.38.2/debian/control --- cabal-debian-4.38/debian/control 2018-06-11 12:20:11.000000000 +0000 +++ cabal-debian-4.38.2/debian/control 2018-11-01 13:00:43.000000000 +0000 @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10), haskell-devscripts (>= 0.13), cdbs, - ghc, + ghc (>= 8.4.3), ghc-prof, libghc-diff-dev (>= 0.3.1), libghc-diff-prof, @@ -34,16 +34,12 @@ libghc-lens-prof, libghc-memoize-dev (>= 0.7), libghc-memoize-prof, - libghc-mtl-dev, - libghc-mtl-prof, libghc-network-uri-dev, libghc-network-uri-prof, libghc-newtype-generics-dev (>= 0.4), libghc-newtype-generics-prof, libghc-optparse-applicative-dev (>= 0.11), libghc-optparse-applicative-prof, - libghc-parsec3-dev (>= 3), - libghc-parsec3-prof, libghc-puremd5-dev, libghc-puremd5-prof, libghc-regex-tdfa-dev, @@ -52,11 +48,9 @@ libghc-set-extra-prof, libghc-syb-dev, libghc-syb-prof, - libghc-text-dev, - libghc-text-prof, libghc-utf8-string-dev, libghc-utf8-string-prof, -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 Homepage: https://github.com/ddssff/cabal-debian Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/cabal-debian] Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/cabal-debian diff -Nru cabal-debian-4.38/debian/copyright cabal-debian-4.38.2/debian/copyright --- cabal-debian-4.38/debian/copyright 2018-06-11 12:10:20.000000000 +0000 +++ cabal-debian-4.38.2/debian/copyright 2018-11-01 13:02:02.000000000 +0000 @@ -6,13 +6,13 @@ Files: * Copyright: 2007-2014 David Fox 2011-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 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff -Nru cabal-debian-4.38/src/Debian/Debianize/BuildDependencies.hs cabal-debian-4.38.2/src/Debian/Debianize/BuildDependencies.hs --- cabal-debian-4.38/src/Debian/Debianize/BuildDependencies.hs 2018-04-29 17:08:37.000000000 +0000 +++ cabal-debian-4.38.2/src/Debian/Debianize/BuildDependencies.hs 2018-10-23 19:55:46.000000000 +0000 @@ -17,6 +17,7 @@ import Data.List as List (filter, groupBy, intercalate, map, minimumBy, nub, sortBy) import Data.Map as Map (lookup, Map) import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing, listToMaybe, mapMaybe) +import Data.Monoid ((<>)) import Data.Set as Set (empty, fold, fromList, map, member, Set, singleton, toList, union) import Debian.Debianize.Prelude import Debian.Debianize.BasicInfo (buildEnv, compilerFlavor, EnvSet(dependOS)) @@ -122,6 +123,14 @@ debianBuildDeps :: (MonadIO m, Functor m) => PackageDescription -> CabalT m D.Relations debianBuildDeps pkgDesc = do hflavor <- use (A.debInfo . D.flags . compilerFlavor) + prof <- not <$> use (A.debInfo . D.noProfilingLibrary) + let hcPackageTypes :: CompilerFlavor -> Set B.PackageType + hcPackageTypes GHC = fromList ([B.Development] <> if prof then [B.Profiling] else []) +#if MIN_VERSION_Cabal(1,22,0) + hcPackageTypes GHCJS = fromList [B.Development] +#endif + hcPackageTypes hc = error $ "Unsupported compiler flavor: " ++ show hc + let hcs = singleton hflavor -- vestigial let hcTypePairs = fold union empty $ @@ -145,7 +154,6 @@ ] bDeps <- use (A.debInfo . D.control . S.buildDepends) - prof <- not <$> use (A.debInfo . D.noProfilingLibrary) official <- use (A.debInfo . D.official) compat <- use (A.debInfo . D.compat) let ghcdev = compilerPackageName hflavor B.Development @@ -166,13 +174,6 @@ cDeps filterMissing xs where - hcPackageTypes :: CompilerFlavor -> Set B.PackageType - hcPackageTypes GHC = fromList [B.Development, B.Profiling] -#if MIN_VERSION_Cabal(1,22,0) - hcPackageTypes GHCJS = fromList [B.Development] -#endif - hcPackageTypes hc = error $ "Unsupported compiler flavor: " ++ show hc - -- No point in installing profiling packages for the -- dependencies of binaries and test suites. (I take it back, -- some executable builds fail if the profiling library isn't diff -Nru cabal-debian-4.38/src/Debian/Debianize/Bundled.hs cabal-debian-4.38.2/src/Debian/Debianize/Bundled.hs --- cabal-debian-4.38/src/Debian/Debianize/Bundled.hs 2018-04-29 17:08:37.000000000 +0000 +++ cabal-debian-4.38.2/src/Debian/Debianize/Bundled.hs 2018-10-23 19:55:46.000000000 +0000 @@ -139,6 +139,7 @@ dropRequiredSuffix suff x = let (x', suff') = splitAt (length x - length suff) x in if suff == suff' then Just x' else Nothing +-- | A list of the files in a binary deb binPkgFiles :: String -> BinPkgName -> [FilePath] binPkgFiles root hcname = lines $ unsafePerformIO (chroot root (readProcess "dpkg" ["-L", unBinPkgName hcname] "")) diff -Nru cabal-debian-4.38/src/Debian/Debianize/CopyrightDescription.hs cabal-debian-4.38.2/src/Debian/Debianize/CopyrightDescription.hs --- cabal-debian-4.38/src/Debian/Debianize/CopyrightDescription.hs 2018-04-29 17:08:37.000000000 +0000 +++ cabal-debian-4.38.2/src/Debian/Debianize/CopyrightDescription.hs 2018-10-23 19:55:46.000000000 +0000 @@ -44,11 +44,15 @@ import Debug.Trace import qualified Distribution.License as Cabal (License(UnknownLicense)) import qualified Distribution.Package as Cabal +#if MIN_VERSION_Cabal(2,2,0) +import qualified Distribution.PackageDescription as Cabal (PackageDescription(licenseFiles, copyright, licenseRaw, package, maintainer)) +#else #if MIN_VERSION_Cabal(1,20,0) import qualified Distribution.PackageDescription as Cabal (PackageDescription(licenseFiles, copyright, license, package, maintainer)) #else import qualified Distribution.PackageDescription as Cabal (PackageDescription(licenseFile, copyright, license, package, maintainer)) #endif +#endif import Network.URI (URI, parseURI) import Prelude hiding (init, init, log, log, unlines, readFile) import Text.PrettyPrint.HughesPJClass (Pretty(pPrint), text) @@ -237,7 +241,11 @@ where mkLicenseDescription (path, txt) = LicenseDescription { +#if MIN_VERSION_Cabal(2,2,0) + _license = fromCabalLicense (Cabal.UnknownLicense path) +#else _license = fromCabalLicense (Cabal.UnknownLicense path) +#endif , _licenseText = txt , _comment = mempty } @@ -254,7 +262,11 @@ #else let (debianCopyrightPath, otherLicensePaths) = partition (== "debian/copyright") [Cabal.licenseFile pkgDesc] #endif +#if MIN_VERSION_Cabal(2,2,0) + license = either (\x -> OtherLicense ("SPDX license: " ++ show x)) fromCabalLicense $ Cabal.licenseRaw pkgDesc +#else license = fromCabalLicense $ Cabal.license pkgDesc +#endif pkgname = unPackageName . Cabal.pkgName . Cabal.package $ pkgDesc maintainer = Cabal.maintainer $ pkgDesc -- This is an @Nothing@ unless debian/copyright is (for some diff -Nru cabal-debian-4.38/src/Debian/Debianize/Details.hs cabal-debian-4.38.2/src/Debian/Debianize/Details.hs --- cabal-debian-4.38/src/Debian/Debianize/Details.hs 2018-04-29 17:08:37.000000000 +0000 +++ cabal-debian-4.38.2/src/Debian/Debianize/Details.hs 2018-10-23 19:55:46.000000000 +0000 @@ -41,11 +41,14 @@ mapM_ (\name -> (A.debInfo . D.execMap) %= Map.insert name [[Rel (BinPkgName name) Nothing Nothing]]) ["ghc", "happy", "alex", "hsx2hs"] -- The parsec debs are suffixed with either "2" or "3" +#if !MIN_VERSION_base(4,11,1) +-- The deb of ghc-8.4.3 changes the libghc-parsec3-dev name to libghc-parsec-deb #if MIN_VERSION_Cabal(2,0,0) mapCabal (mkPackageName "parsec") (DebBase "parsec3") #else mapCabal (PackageName "parsec") (DebBase "parsec3") #endif +#endif -- Similar split for quickcheck #if MIN_VERSION_Cabal(2,0,0) mapCabal (mkPackageName "QuickCheck") (DebBase "quickcheck2") diff -Nru cabal-debian-4.38/src/Debian/Debianize/ExecAtoms.hs cabal-debian-4.38.2/src/Debian/Debianize/ExecAtoms.hs --- cabal-debian-4.38/src/Debian/Debianize/ExecAtoms.hs 2018-04-29 17:08:37.000000000 +0000 +++ cabal-debian-4.38.2/src/Debian/Debianize/ExecAtoms.hs 2018-10-23 19:55:46.000000000 +0000 @@ -1,7 +1,7 @@ -- | Things that seem like they could be clients of this library, but -- are instead included as part of the library. {-# LANGUAGE CPP, FlexibleContexts, OverloadedStrings #-} -{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind -ddump-minimal-imports #-} +{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind #-} module Debian.Debianize.ExecAtoms ( execAtoms ) where diff -Nru cabal-debian-4.38/src/Debian/Debianize/Goodies.hs cabal-debian-4.38.2/src/Debian/Debianize/Goodies.hs --- cabal-debian-4.38/src/Debian/Debianize/Goodies.hs 2018-04-29 17:08:37.000000000 +0000 +++ cabal-debian-4.38.2/src/Debian/Debianize/Goodies.hs 2018-10-23 19:55:46.000000000 +0000 @@ -4,8 +4,8 @@ {-# OPTIONS_GHC -fno-warn-unused-do-bind #-} module Debian.Debianize.Goodies ( tightDependencyFixup - , expandWebsite, doServer - , expandServer, doWebsite + , expandWebsite, doWebsite + , expandServer, doServer , expandBackups, doBackups , doExecutable , oldClckwrksSiteFlags diff -Nru cabal-debian-4.38/src/Debian/Debianize/InputCabal.hs cabal-debian-4.38.2/src/Debian/Debianize/InputCabal.hs --- cabal-debian-4.38/src/Debian/Debianize/InputCabal.hs 2018-04-29 17:08:37.000000000 +0000 +++ cabal-debian-4.38.2/src/Debian/Debianize/InputCabal.hs 2018-10-23 19:55:46.000000000 +0000 @@ -28,10 +28,21 @@ 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.Parsec (readGenericPackageDescription) +#else +#if MIN_VERSION_Cabal(2,0,0) +import Distribution.PackageDescription.Parse (readGenericPackageDescription) +#else import Distribution.PackageDescription.Parse (readPackageDescription) +#endif +#endif import Distribution.Simple.Utils (defaultPackageDesc, die, setupMessage) import Distribution.System as Cabal (buildArch, Platform(..)) import qualified Distribution.System as Cabal (buildOS) +#if MIN_VERSION_Cabal(2,2,0) +import Distribution.Types.GenericPackageDescription (mkFlagAssignment) +#endif import Distribution.Verbosity (Verbosity) import Prelude hiding (break, lines, log, null, readFile, sum) import System.Directory (doesFileExist, getCurrentDirectory) @@ -57,8 +68,16 @@ -- Load a GenericPackageDescription from the current directory -- and from that create a finalized PackageDescription for the -- given CompilerId. +#if MIN_VERSION_Cabal(2,0,0) + genPkgDesc <- liftIO $ defaultPackageDesc vb >>= readGenericPackageDescription vb +#else 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 +#else let finalized = finalizePackageDescription (toList fs) (const True) (Platform buildArch Cabal.buildOS) cinfo [] genPkgDesc +#endif ePkgDesc <- either (return . Left) (\ (pkgDesc, _) -> do liftIO $ bracket (setFileCreationMask 0o022) setFileCreationMask $ \ _ -> autoreconf vb pkgDesc return (Right pkgDesc)) diff -Nru cabal-debian-4.38/src/Debian/Debianize/Optparse.hs cabal-debian-4.38.2/src/Debian/Debianize/Optparse.hs --- cabal-debian-4.38/src/Debian/Debianize/Optparse.hs 2018-04-29 17:08:37.000000000 +0000 +++ cabal-debian-4.38.2/src/Debian/Debianize/Optparse.hs 2018-10-23 19:55:46.000000000 +0000 @@ -499,7 +499,10 @@ profilingP = O.flag ProfilingEnabled ProfilingDisabled m where m = O.help helpMsg <> O.long "disable-profiling" - helpMsg = "Do not generate profiling (-prof) library package." + helpMsg = unlines [ + "Do not generate profiling (-prof) library package, do not", + "add -prof packages to the build dependency list." + ] haddockP :: O.Parser [HaddockStatus] haddockP = (: []) <$> (O.flag HaddockEnabled HaddockDisabled m) where