summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-11-17 17:02:47 -0400
committerJoey Hess2014-11-17 17:02:47 -0400
commit2fab1a08b4f197874ad6c613f118315ab0d474a3 (patch)
tree025353fea85436242bb706cd75914d85c3fca98f /debian
parent90f5cff061e11a06d3f37fdd5424b49678a2b07d (diff)
parentfbd8ea3b3d46b8cb56f3b9c82847cc849a37f89d (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/copyright2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3fef3404..3858ac2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ propellor (0.9.3) UNRELEASED; urgency=medium
* Can be used to configure tor hidden services. Thanks, Félix Sipma.
* When multiple gpg keys are added, ensure that the privdata file
can be decrypted by all of them.
+ * Convert GpgKeyId to newtype.
+ * DigitalOcean.distroKernel property now reboots into the distribution
+ kernel when necessary.
-- Joey Hess <joeyh@debian.org> Mon, 10 Nov 2014 11:15:27 -0400
diff --git a/debian/copyright b/debian/copyright
index 3bdd0103..1d333cc3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: native package
Files: *
-Copyright: © 2010-2014 Joey Hess <joey@kitenet.net>
+Copyright: © 2010-2014 Joey Hess <id@joeyh.name>
License: BSD-2-clause
License: BSD-2-clause