summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-08-14 15:01:57 -0400
committerJoey Hess2015-08-14 15:01:57 -0400
commit00dead44a10b1d28737052bf9d3f84653cb6bd12 (patch)
treea1a6bc3132f94f33f95a748b3462baf8b2b79a15 /debian
parent205114b108a046e23e24a8e8bafb0d8bb682185e (diff)
parenteb76708b2023f214829d979673cd5e2721ba5fc5 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/control1
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2decb1f0..1116016a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+propellor (2.7.1) unstable; urgency=medium
+
+ * Make sure that make is installed when bootstrapping propellor.
+ * Fix bug in Firewall's Port datatype to iptable parameter translation code.
+ Thanks, Antoine Eiche.
+
+ -- Joey Hess <id@joeyh.name> Fri, 14 Aug 2015 15:01:37 -0400
+
propellor (2.7.0) unstable; urgency=medium
* Ssh.permitRootLogin type changed to allow configuring WithoutPassword
diff --git a/debian/control b/debian/control
index 51107783..25c3d474 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
libghc-transformers-dev,
libghc-exceptions-dev (>= 0.6),
git,
+ make,
Description: property-based host configuration management in haskell
Propellor enures that the system it's run in satisfies a list of
properties, taking action as necessary when a property is not yet met.