From 681e4dbbcb880e8e2526519fc58d4f2994a41577 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 29 Apr 2015 14:26:13 -0400 Subject: propellor spin --- debian/changelog | 5 ++++- debian/control | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6ef509ca..592c75a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -propellor (2.3.1) UNRELEASED; urgency=medium +propellor (2.4.0) UNRELEASED; urgency=medium * Git.bareRepo: Fix bug in calls to userScriptProperty. Thanks, Jelmer Vernooij. * Removed Obnam.latestVersion which was only needed for Debian wheezy backport. + * Merged Utility changes from git-annex. + * Switched from MonadCatchIO-transformers to the newer transformers and + exceptions libraries. -- Joey Hess Wed, 22 Apr 2015 20:59:59 -0400 diff --git a/debian/control b/debian/control index a9b6c2ce..2bebd6f3 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,8 @@ Build-Depends: libghc-network-dev, libghc-quickcheck2-dev, libghc-mtl-dev, - libghc-monadcatchio-transformers-dev, + libghc-transformers-dev, + libghc-exceptions-dev, Maintainer: Gergely Nagy Standards-Version: 3.9.6 Vcs-Git: git://git.joeyh.name/propellor @@ -36,7 +37,8 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libghc-network-dev, libghc-quickcheck2-dev, libghc-mtl-dev, - libghc-monadcatchio-transformers-dev, + libghc-transformers-dev, + libghc-exceptions-dev, git, Description: property-based host configuration management in haskell Propellor enures that the system it's run in satisfies a list of -- cgit v1.2.3 From a5842683349d6d5f41c46414e1721253f5b4779e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 29 Apr 2015 14:31:54 -0400 Subject: Ensure build deps are installed before building propellor in --spin and cron job, even if propellor was already built before, to deal with upgrades that add new dependencies. --- debian/changelog | 3 +++ src/Propellor/Bootstrap.hs | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 592c75a7..5c166f0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ propellor (2.4.0) UNRELEASED; urgency=medium * Merged Utility changes from git-annex. * Switched from MonadCatchIO-transformers to the newer transformers and exceptions libraries. + * Ensure build deps are installed before building propellor in --spin + and cron job, even if propellor was already built before, to deal with + upgrades that add new dependencies. -- Joey Hess Wed, 22 Apr 2015 20:59:59 -0400 diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 3c28edf0..260d8117 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -17,12 +17,10 @@ type ShellCommand = String -- Should be run inside the propellor config dir, and will install -- all necessary build dependencies and build propellor. bootstrapPropellorCommand :: ShellCommand -bootstrapPropellorCommand = "if ! test -x ./propellor; then " ++ go ++ "; fi;" ++ checkBinaryCommand - where - go = intercalate " && " - [ depsCommand - , buildCommand - ] +bootstrapPropellorCommand = depsCommand ++ + "&& if ! test -x ./propellor; then " + ++ buildCommand ++ + "; fi;" ++ checkBinaryCommand -- Use propellor --check to detect if the local propellor binary has -- stopped working (eg due to library changes), and must be rebuilt. -- cgit v1.2.3 From fec92abcc8d84dc2ce49388ed6416535532e74d9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 29 Apr 2015 14:43:50 -0400 Subject: changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5c166f0b..2e7f4605 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ propellor (2.4.0) UNRELEASED; urgency=medium + * Propellor no longer supports Debian wheezy (oldstable). * Git.bareRepo: Fix bug in calls to userScriptProperty. Thanks, Jelmer Vernooij. * Removed Obnam.latestVersion which was only needed for Debian wheezy -- cgit v1.2.3 From 160eff0eb7ebbb2da2c3864dbe83bf7db76c8bb6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 May 2015 14:29:03 -0400 Subject: prep release --- debian/changelog | 4 ++-- propellor.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2e7f4605..ae8deef6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -propellor (2.4.0) UNRELEASED; urgency=medium +propellor (2.4.0) unstable; urgency=medium * Propellor no longer supports Debian wheezy (oldstable). * Git.bareRepo: Fix bug in calls to userScriptProperty. @@ -12,7 +12,7 @@ propellor (2.4.0) UNRELEASED; urgency=medium and cron job, even if propellor was already built before, to deal with upgrades that add new dependencies. - -- Joey Hess Wed, 22 Apr 2015 20:59:59 -0400 + -- Joey Hess Wed, 06 May 2015 14:28:59 -0400 propellor (2.3.0) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index 11b14bb9..5120ab89 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 2.3.0 +Version: 2.4.0 Cabal-Version: >= 1.6 License: BSD3 Maintainer: Joey Hess -- cgit v1.2.3