summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-05-18 10:15:26 -0400
committerJoey Hess2018-05-18 10:15:26 -0400
commitf4ac700c77869ed017fc85dc86984a3c72d3440a (patch)
tree4328c71de1ed2a801bc62cc8ecfe7f563205eea4
parent14aa80fc6e9bddbfda0acb41400466c73a37b026 (diff)
parent8c418011fdb0b819c9fa9528fecde5c45729521a (diff)
Merge branch 'master' into joeyconfig
-rw-r--r--debian/changelog9
-rw-r--r--doc/news/version_5.3.2.mdwn10
-rw-r--r--doc/news/version_5.4.0.mdwn13
-rw-r--r--propellor.cabal2
4 files changed, 19 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog
index 8383f0a0..ae97e9db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
-propellor (5.4.0) UNRELEASED; urgency=medium
+propellor (5.4.0) unstable; urgency=medium
- * Restic.installed: stop trying to install a backport on jessie, because no
- such backport exists.
+ [ Sean Whitton ]
* Apt.installedBackport replaced with Apt.backportInstalled. (API change)
The old property would install dependencies from backports even when
the versions in stable satisfy the requested backport's dependencies.
@@ -10,8 +9,10 @@ propellor (5.4.0) UNRELEASED; urgency=medium
So in some cases, you may need to list additional backports to install,
that would not have needed to be listed before. Due to this behavior
change the property has been renamed so uses of it will be checked.
+ * Restic.installed: stop trying to install a backport on jessie, because no
+ such backport exists.
- -- Sean Whitton <spwhitton@spwhitton.name> Thu, 17 May 2018 00:12:42 -0700
+ -- Joey Hess <id@joeyh.name> Thu, 17 May 2018 10:43:20 -0400
propellor (5.3.6) unstable; urgency=medium
diff --git a/doc/news/version_5.3.2.mdwn b/doc/news/version_5.3.2.mdwn
deleted file mode 100644
index cd16116e..00000000
--- a/doc/news/version_5.3.2.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-propellor 5.3.2 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * Added Propellor.Property.Atomic, which can make a non-atomic property
- that operates on a directory into an atomic property.
- (Inspired by Vaibhav Sagar's talk on Functional Devops in a
- Dysfunctional World at LCA 2018.)
- * Added Git.pulled.
- * Systemd.machined: Install systemd-container on Debian
- stretch.
- Thanks, Sean Whitton"""]] \ No newline at end of file
diff --git a/doc/news/version_5.4.0.mdwn b/doc/news/version_5.4.0.mdwn
new file mode 100644
index 00000000..e63f8c6c
--- /dev/null
+++ b/doc/news/version_5.4.0.mdwn
@@ -0,0 +1,13 @@
+propellor 5.4.0 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * [ Sean Whitton ]
+ * Apt.installedBackport replaced with Apt.backportInstalled. (API change)
+ The old property would install dependencies from backports even when
+ the versions in stable satisfy the requested backport's dependencies.
+ The new property installs only the listed packages from backports;
+ all other dependencies come from stable.
+ So in some cases, you may need to list additional backports to install,
+ that would not have needed to be listed before. Due to this behavior
+ change the property has been renamed so uses of it will be checked.
+ * Restic.installed: stop trying to install a backport on jessie, because no
+ such backport exists."""]] \ No newline at end of file
diff --git a/propellor.cabal b/propellor.cabal
index 669577a5..6c8c42e1 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 5.3.6
+Version: 5.4.0
Cabal-Version: 1.20
License: BSD2
Maintainer: Joey Hess <id@joeyh.name>