debian-build 0.7.1.0 → 0.7.1.1

raw patch · 3 files changed

+14/−13 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• debian-build.cabal +1/−1
• src/Debian/Package/Build/Cabal.hs +1/−1
• src/Debian/Package/Build/Command.hs +12/−11

@@ -1,5 +1,5 @@ name:                debian-build-version:             0.7.1.0+version:             0.7.1.1 synopsis:            Debian package build sequence tools description:         This package provides build sequence functions                      for debian package, and includes on-the-fly

@@ -30,7 +30,7 @@ import Distribution.Verbosity (silent) import Distribution.Package (pkgName, pkgVersion) import Distribution.PackageDescription-  (GenericPackageDescription, packageDescription, PackageDescription, package)+  (packageDescription, PackageDescription, package) import Distribution.PackageDescription.Parse (readPackageDescription)  import Distribution.Simple (defaultMain)

@@ -42,7 +42,7 @@ import qualified System.Directory as D import qualified System.Process as Process import System.Exit (ExitCode (..))-import Data.Version (Version, versionBranch, showVersion)+import Data.Version (versionBranch, showVersion)  import Debian.Package.Data   (Hackage, ghcLibraryBinPackages, ghcLibraryPackages, ghcLibraryDocPackage,@@ -153,17 +153,18 @@ cabalDebian' :: Maybe String -> Trace () cabalDebian' mayRev = do   ver <-  origVersion' <$> packageVersion "cabal-debian"-  case versionBranch ver of-    (x:_) | x <= 1     ->  fail $ "Version of cabal-debian is TOO OLD: " ++ showVersion ver ++-                           " - Under version 1 generates wrong dependencies."-          | otherwise  ->  return ()-    []                 ->  return ()+  let revision = fromMaybe "1~autogen1" mayRev+      oldArgs = ["--quilt", "--revision=" ++ revision]+  args <- case versionBranch ver of+    (x:y:_)  | x <= 1             ->  fail+                                      $ "Version of cabal-debian is TOO OLD: "+                                      ++ showVersion ver+                                      ++ " - Under version 1 generates wrong dependencies."+             | x == 4 && y >= 19  ->  return ["--revision=" ++ '-' : revision]+             | otherwise          ->  return oldArgs+    _                             ->  return oldArgs -  rawSystem'-    [ "cabal-debian"-    , "--quilt"-    , "--revision=" ++ fromMaybe "1~autogen1" mayRev-    ]+  rawSystem' $ "cabal-debian" : args  -- | Call /cabal-debian/ command under specified directory cabalDebian :: FilePath -> Maybe String -> Trace ()