summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------config.hs2
-rw-r--r--debian/changelog4
-rw-r--r--doc/news/version_5.3.3.mdwn8
-rw-r--r--doc/news/version_5.4.1.mdwn14
-rw-r--r--privdata/relocate1
-rw-r--r--propellor.cabal2
6 files changed, 18 insertions, 13 deletions
diff --git a/config.hs b/config.hs
index 97d90636..ec313725 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-joeyconfig.hs \ No newline at end of file
+config-simple.hs \ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 2c481cb9..171cd8fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (5.4.1) UNRELEASED; urgency=medium
+propellor (5.4.1) unstable; urgency=medium
* Modernized and simplified the MetaTypes implementation now that
compatability with ghc 7 is no longer needed.
@@ -13,7 +13,7 @@ propellor (5.4.1) UNRELEASED; urgency=medium
Seeking a maintainer for the Docker module; I anticipate
removing the CloudAtCost module in the next API bump.
- -- Joey Hess <id@joeyh.name> Fri, 18 May 2018 10:25:05 -0400
+ -- Joey Hess <id@joeyh.name> Wed, 08 Aug 2018 10:29:27 -0400
propellor (5.4.0) unstable; urgency=medium
diff --git a/doc/news/version_5.3.3.mdwn b/doc/news/version_5.3.3.mdwn
deleted file mode 100644
index 18f80d5f..00000000
--- a/doc/news/version_5.3.3.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-propellor 5.3.3 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * Warn again about new upstream version when ~/.propellor was cloned from the
- Debian git bundle using an older version of propellor that set up an
- upstream remote.
- * Avoid crashing if initial fetch from origin fails when spinning a host.
- * Added Propllor.Property.Openssl module contributed by contributed by
- FĂ©lix Sipma."""]] \ No newline at end of file
diff --git a/doc/news/version_5.4.1.mdwn b/doc/news/version_5.4.1.mdwn
new file mode 100644
index 00000000..ebb0e261
--- /dev/null
+++ b/doc/news/version_5.4.1.mdwn
@@ -0,0 +1,14 @@
+propellor 5.4.1 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * Modernized and simplified the MetaTypes implementation now that
+ compatability with ghc 7 is no longer needed.
+ * Use git verify-commit to verify gpg signatures, rather than the old
+ method of parsing git log output. Needs git 2.0.
+ * Added ConfFile.containsShellSetting, ConfFile.lacksShellSetting,
+ and EtcDefault.set properties. Thanks, Sean Whitton
+ * Dns: Support TXT values longer than bind's maximum string length
+ of 255 bytes. Thanks, rsiddharth.
+ * Docker and HostingProvider.CloudAtCost modules are not being
+ maintained, so marked them as such.
+ Seeking a maintainer for the Docker module; I anticipate
+ removing the CloudAtCost module in the next API bump."""]] \ No newline at end of file
diff --git a/privdata/relocate b/privdata/relocate
deleted file mode 100644
index 271692d8..00000000
--- a/privdata/relocate
+++ /dev/null
@@ -1 +0,0 @@
-.joeyconfig
diff --git a/propellor.cabal b/propellor.cabal
index a2a24912..26c05a1d 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 5.4.0
+Version: 5.4.1
Cabal-Version: 1.20
License: BSD2
Maintainer: Joey Hess <id@joeyh.name>