summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2018-06-12 10:55:00 -0400
committerJoey Hess2018-06-12 10:55:00 -0400
commitd1164739fb1844dd9a5c4e57c76ce1cd2dbddebc (patch)
tree781c4133132251559bf7a647fd821f395f332e57 /debian
parent70f318e44d12500c62dd1ad1164fbf7fd9ca8726 (diff)
parentdca1c56e612757c4bb306fb45675337dc52eb201 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
-rw-r--r--debian/control4
2 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ae97e9db..c4707e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+propellor (5.4.1) UNRELEASED; urgency=medium
+
+ * Modernized and simplified the MetaTypes implementation now that
+ compatability with ghc 7 is no longer needed.
+ * Use git verify-commit to verify gpg signatures, rather than the old
+ method of parsing git log output. Needs git 2.0.
+
+ -- Joey Hess <id@joeyh.name> Fri, 18 May 2018 10:25:05 -0400
+
propellor (5.4.0) unstable; urgency=medium
[ Sean Whitton ]
diff --git a/debian/control b/debian/control
index 5a041c90..0a8701a0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Build-Depends:
debhelper (>= 9),
- git,
+ git (>= 2.0),
ghc (>= 7.6),
cabal-install,
libghc-async-dev,
@@ -43,7 +43,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
libghc-stm-dev,
libghc-text-dev,
libghc-hashable-dev,
- git,
+ git (>= 2.0),
Description: property-based host configuration management in haskell
Propellor ensures that the system it's run in satisfies a list of
properties, taking action as necessary when a property is not yet met.