summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-02-11 12:50:35 -0400
committerJoey Hess2016-02-11 12:50:35 -0400
commit528154b3a9a0de10b1892550bee328a76772d688 (patch)
treeee750767a2788493f4741040fd9a2cf5470bcab7
parente6cbbe3926c4dbc0817a3ed383da91e38ee384b4 (diff)
parent0abe166137af8c4339d6324b476a078c7973f177 (diff)
Merge branch 'joeyconfig'
-rw-r--r--debian/changelog4
-rw-r--r--propellor.cabal2
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index b93059b4..729fe42d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (2.15.4) UNRELEASED; urgency=medium
+propellor (2.15.4) unstable; urgency=medium
* Build /usr/src/propellor/propellor.git reproducibly,
which makes the whole Debian package build reproducibly.
@@ -14,7 +14,7 @@ propellor (2.15.4) UNRELEASED; urgency=medium
* Allow using combineProperties and propertyList with lists of
RevertableProperty.
- -- Joey Hess <id@joeyh.name> Mon, 18 Jan 2016 13:15:30 -0400
+ -- Joey Hess <id@joeyh.name> Thu, 11 Feb 2016 12:49:10 -0400
propellor (2.15.3) unstable; urgency=medium
diff --git a/propellor.cabal b/propellor.cabal
index fc2d3f1f..3e6c3c37 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 2.15.3
+Version: 2.15.4
Cabal-Version: >= 1.8
License: BSD3
Maintainer: Joey Hess <id@joeyh.name>