summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-01-04 19:52:09 -0400
committerJoey Hess2015-01-04 19:52:09 -0400
commite22002a7a99ceaaf193a6aa83d3c03e256d79f52 (patch)
tree8a6460e3da5abfd0109d40e518fd1a8f233dc35b /debian
parent2de60a902794669b40fae8c7135f989ccca2f8d5 (diff)
parent0794dfbd7c6f854c3e517486be0722e4cf61db34 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
-rw-r--r--debian/control2
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 1cf57117..224f0fe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+propellor (1.3.1) unstable; urgency=medium
+
+ * Fix bug that prevented deploying ssh host keys when the file for the
+ key didn't already exist.
+ * DNS records for hosts with known ssh public keys now automatically
+ include SSHFP records.
+
+ -- Joey Hess <id@joeyh.name> Sun, 04 Jan 2015 19:51:34 -0400
+
propellor (1.3.0) unstable; urgency=medium
* --spin checks if the DNS matches any configured IP address property
diff --git a/debian/control b/debian/control
index c5f9e5a8..24ff39cb 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
libghc-mtl-dev,
libghc-monadcatchio-transformers-dev,
Maintainer: Gergely Nagy <algernon@madhouse-project.org>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Vcs-Git: git://git.kitenet.net/propellor
Homepage: http://propellor.branchable.com/