summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-09-08 22:37:11 -0400
committerJoey Hess2015-09-08 22:37:11 -0400
commit386281202d5cb526d1b35022b3709b1f1064f68e (patch)
tree7dcea4e59765d4e1bb76ca23b864befc4546068a /debian
parentb38cedc0a81085dd5e4267866d1f460054d9c50d (diff)
parentd7a9157e7e1e8f447864d9d0cdd20ed1839fc23c (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog14
-rw-r--r--debian/control2
2 files changed, 15 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 1fa8c1f1..8b02e942 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+propellor (2.8.0) UNRELEASED; urgency=medium
+
+ * Added Propellor.Property.Rsync.
+ * Convert Info to use Data.Dynamic, so properties can export and consume
+ info of any type that is Typeable and a Monoid, including data types
+ private to a module. (API change)
+ Thanks to Joachim Breitner for the idea.
+ * Improve propellor wrapper to better handle installation cloning
+ the public propellor repo, by setting that repo to be upstream,
+ so propellor doesnt try to push to a read-only repo.
+
+ -- Joey Hess <id@joeyh.name> Fri, 04 Sep 2015 10:36:40 -0700
+
propellor (2.7.3) unstable; urgency=medium
* Fix bug that caused provisioning new chroots to fail.
@@ -319,6 +332,7 @@ propellor (0.9.2) unstable; urgency=medium
* Apache: Fix daemon reload when enabling a new module or site.
* Docker: Stop using docker.io; that was a compat symlink in
the Debian package which has been removed in docker.io 1.3.1~dfsg1-2.
+ Closes: #769452
* Orphaned the Debian package, as I am retiring from Debian.
-- Joey Hess <joeyh@debian.org> Sat, 08 Nov 2014 15:57:36 -0400
diff --git a/debian/control b/debian/control
index 05101be0..7f42c916 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
git,
make,
Description: property-based host configuration management in haskell
- Propellor enures that the system it's run in satisfies a list of
+ 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.
.
It is configured using haskell.