summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-05-06 14:29:12 -0400
committerJoey Hess2015-05-06 14:29:12 -0400
commit9ec4b33dbb62e42b8d284d1aeddf32a395fd7cc0 (patch)
treeb9067a945a430af4868be1a0fcf052db5c4cd5fc /debian
parentb4877efea5375cb83951d6dd1d3dbf9d70208cf8 (diff)
parent160eff0eb7ebbb2da2c3864dbe83bf7db76c8bb6 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog13
-rw-r--r--debian/control6
2 files changed, 14 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 6ef509ca..ae8deef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-propellor (2.3.1) 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.
Thanks, Jelmer Vernooij.
* Removed Obnam.latestVersion which was only needed for Debian wheezy
backport.
-
- -- Joey Hess <id@joeyh.name> Wed, 22 Apr 2015 20:59:59 -0400
+ * 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 <id@joeyh.name> Wed, 06 May 2015 14:28:59 -0400
propellor (2.3.0) unstable; urgency=medium
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 <algernon@madhouse-project.org>
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