cabal-debian 4.36 → 4.36.1

raw patch · 4 files changed

+16/−12 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• cabal-debian.cabal +4/−4
• src/Debian/Debianize/BuildDependencies.hs +4/−4
• src/Debian/Debianize/Finalize.hs +3/−3
• src/Debian/Debianize/Prelude.hs +5/−1

@@ -1,5 +1,5 @@ Name:           cabal-debian-Version:        4.36+Version:        4.36.1 Copyright:      Copyright (c) 2007-2014, David Fox, Jeremy Shaw License:        BSD3 License-File:   LICENSE@@ -157,7 +157,7 @@ Library   Default-Language: Haskell2010   Hs-Source-Dirs: src-  GHC-Options: -Wall -O2+  GHC-Options: -Wall   Build-Depends:     base < 5,     bifunctors,@@ -230,7 +230,7 @@   Default-Language: Haskell2010   Hs-Source-Dirs: .   Main-is: CabalDebian.hs-  ghc-options: -threaded -Wall -O2+  ghc-options: -threaded -Wall   Build-Depends:     base,     cabal-debian,@@ -251,7 +251,7 @@   Type: exitcode-stdio-1.0   Hs-Source-Dirs: .   Main-is: Tests.hs-  ghc-options: -threaded -Wall -O2+  ghc-options: -threaded -Wall   Build-Depends:     base < 5,     cabal-debian,

@@ -137,10 +137,10 @@        binDeps <- allBuildDepends (List.map buildInfo (Cabal.executables pkgDesc))        testDeps <- allBuildDepends (List.map testBuildInfo (Cabal.testSuites pkgDesc)) -       liftIO (putStrLn ("library dependencies: " ++ show libDeps))-       liftIO (putStrLn ("executable dependencies: " ++ show binDeps))-       liftIO (putStrLn (intercalate "\n  " ("executables:" :  fmap show (Cabal.executables pkgDesc))))-       liftIO (putStrLn ("test suite dependencies: " ++ show testDeps))+       -- liftIO (putStrLn ("library dependencies: " ++ show libDeps))+       -- liftIO (putStrLn ("executable dependencies: " ++ show binDeps))+       -- liftIO (putStrLn (intercalate "\n  " ("executables:" :  fmap show (Cabal.executables pkgDesc))))+       -- liftIO (putStrLn ("test suite dependencies: " ++ show testDeps))         testsStatus <- use (A.debInfo . D.testsStatus) 

@@ -42,7 +42,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(Extra), parseMaintainer, parseStandardsVersion, Section(..), SourceFormat(Native3))+import Debian.Policy (getCurrentDebianUser, getDebhelperCompatLevel, haskellMaintainer, maintainerOfLastResort, PackageArchitectures(Any, All), PackagePriority(Optional), parseMaintainer, parseStandardsVersion, Section(..), SourceFormat(Native3)) import Debian.Pretty (PP(..), ppShow) import Debian.Relation (BinPkgName, BinPkgName(BinPkgName), Relation(Rel), Relations, SrcPkgName(SrcPkgName)) import qualified Debian.Relation as D (BinPkgName(BinPkgName), Relation(..))@@ -125,7 +125,7 @@        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 Extra+       (A.debInfo . D.control . S.priority) .?= Just Optional        (A.debInfo . D.compat) .?= debhelperCompat        finalizeChangelog date currentUser        finalizeControl currentUser@@ -388,7 +388,7 @@          let packagesURI = "https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/" <> pack src         zoom D.control $ do-           S.standardsVersion .?= Just (parseStandardsVersion "3.9.8")+           S.standardsVersion .?= Just (parseStandardsVersion "4.1.1") #if MIN_VERSION_Cabal(2,0,0)            S.homepage .?= Just ("http://hackage.haskell.org/package/" <> pack (unPackageName cabal)) #else

@@ -44,6 +44,7 @@     , module Distribution.Package #else     , module Data.Version+    , mkFlagName     , mkPackageName     , mkVersion     , mkVersion'@@ -75,10 +76,11 @@ import Debian.Relation.Common () import Debian.Version (DebianVersion, parseDebianVersion', prettyDebianVersion) #if MIN_VERSION_Cabal(2,0,0)-import Distribution.Package (PackageIdentifier(..), PackageName, unPackageName)+import Distribution.Package (PackageIdentifier(..), PackageName, mkPackageName, unPackageName) import Distribution.Version #else import Distribution.Package (PackageIdentifier(..), PackageName(..))+import Distribution.PackageDescription (FlagName(..)) import Data.Version #endif import Distribution.Verbosity (intToVerbosity, Verbosity)@@ -365,6 +367,8 @@ escapeDebianWildcards "" = ""  #if !MIN_VERSION_Cabal(2,0,0)+mkFlagName :: String -> FlagName+mkFlagName = FlagName mkPackageName :: String -> PackageName mkPackageName = PackageName mkVersion :: [Int] -> Version