summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2016-05-23 11:25:41 -0400
committerJoey Hess2016-05-23 11:25:41 -0400
commit9435ca9d7916c59fa37e2e4c3983dcd6eb20d8c0 (patch)
treec7cea9fad8eb237f3aee7543fbcbc81b368cf7ef /debian
parent7869b471f953c16fa73bc45f3651dba6138a1af6 (diff)
parent864d47361ba34d851a9bbb34a6242854c042e556 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 261989c2..02bf0d1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+propellor (3.0.5) UNRELEASED; urgency=medium
+
+ * Modules added for Sbuild and Ccache.
+ Thanks, Sean Whitton
+
+ -- Joey Hess <id@joeyh.name> Mon, 23 May 2016 11:19:28 -0400
+
propellor (3.0.4) unstable; urgency=medium
* Run letsencrypt with --noninteractive.
diff --git a/debian/control b/debian/control
index 898e558d..9194b6c2 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
libghc-text-dev,
libghc-concurrent-output-dev,
Maintainer: Joey Hess <id@joeyh.name>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Vcs-Git: git://git.joeyh.name/propellor
Homepage: http://propellor.branchable.com/