-- cgit v1.3-2-g0d8e From 5ead4f8162873db7d627cf1c2d0b64413d51ef38 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 12 Jan 2016 12:35:55 -0400 Subject: add missing Control.Applicative imports for old ghc --- src/Propellor/Git.hs | 2 ++ src/Propellor/Git/Config.hs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Propellor/Git.hs b/src/Propellor/Git.hs index 5a16b3db..949f430b 100644 --- a/src/Propellor/Git.hs +++ b/src/Propellor/Git.hs @@ -4,6 +4,8 @@ import Utility.Process import Utility.Exception import System.Directory +import Control.Applicative +import Prelude getCurrentBranch :: IO String getCurrentBranch = takeWhile (/= '\n') diff --git a/src/Propellor/Git/Config.hs b/src/Propellor/Git/Config.hs index 97835231..f5b6678d 100644 --- a/src/Propellor/Git/Config.hs +++ b/src/Propellor/Git/Config.hs @@ -7,6 +7,8 @@ import Utility.SafeCommand import Utility.Monad import Control.Monad +import Control.Applicative +import Prelude getGitConfigValue :: String -> IO (Maybe String) getGitConfigValue key = do -- cgit v1.3-2-g0d8e -- cgit v1.3-2-g0d8e From 53bd284df14e154c17493dd192ca872d2383a640 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 12 Jan 2016 12:37:21 -0400 Subject: changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index e2aaa670..8e2ebbfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ propellor (2.15.3) UNRELEASED; urgency=medium * Added Git.bareRepoDefaultBranch property Thanks, Sean Whitton. + * Add missing Control.Applicative imports needed by older versions of ghc. -- Joey Hess Tue, 05 Jan 2016 13:30:21 -0400 -- cgit v1.3-2-g0d8e From f3d86f4583fdb7626119210503512a6f78b95f5e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 12 Jan 2016 12:37:31 -0400 Subject: prep release --- debian/changelog | 4 ++-- propellor.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8e2ebbfd..72145793 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -propellor (2.15.3) UNRELEASED; urgency=medium +propellor (2.15.3) unstable; urgency=medium * Added Git.bareRepoDefaultBranch property Thanks, Sean Whitton. * Add missing Control.Applicative imports needed by older versions of ghc. - -- Joey Hess Tue, 05 Jan 2016 13:30:21 -0400 + -- Joey Hess Tue, 12 Jan 2016 12:37:22 -0400 propellor (2.15.2) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index 42270819..56b64ce7 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 2.15.2 +Version: 2.15.3 Cabal-Version: >= 1.8 License: BSD3 Maintainer: Joey Hess -- cgit v1.3-2-g0d8e