summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------config.hs2
-rw-r--r--debian/changelog4
-rw-r--r--doc/news/version_4.4.0.mdwn8
-rw-r--r--doc/news/version_4.6.0.mdwn8
-rw-r--r--privdata/relocate1
5 files changed, 11 insertions, 12 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 0e7c6314..3944f454 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (4.6.0) UNRELEASED; urgency=medium
+propellor (4.6.0) unstable; urgency=medium
* Add Typeable instance to Bootstrapper, fixing build with old versions
of ghc.
@@ -7,7 +7,7 @@ propellor (4.6.0) UNRELEASED; urgency=medium
Network.preserveStatic.
(Minor API change)
- -- Joey Hess <id@joeyh.name> Tue, 25 Jul 2017 21:01:23 -0400
+ -- Joey Hess <id@joeyh.name> Wed, 26 Jul 2017 20:02:50 -0400
propellor (4.5.2) unstable; urgency=medium
diff --git a/doc/news/version_4.4.0.mdwn b/doc/news/version_4.4.0.mdwn
deleted file mode 100644
index db86c536..00000000
--- a/doc/news/version_4.4.0.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-propellor 4.4.0 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * Propellor.Property.Timezone: New module, contributed by Sean Whitton.
- * Propellor.Property.Sudo.enabledFor: Made revertable.
- (minor API change)
- * Propellor.Property.LightDM.autoLogin: Made revertable.
- (minor API change)
- * Propellor.Property.Conffile: Added lacksIniSetting."""]] \ No newline at end of file
diff --git a/doc/news/version_4.6.0.mdwn b/doc/news/version_4.6.0.mdwn
new file mode 100644
index 00000000..673051ea
--- /dev/null
+++ b/doc/news/version_4.6.0.mdwn
@@ -0,0 +1,8 @@
+propellor 4.6.0 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * Add Typeable instance to Bootstrapper, fixing build with old versions
+ of ghc.
+ * Network.static changed to take address and gateway parameters.
+ If you used the old Network.static property, it has been renamed to
+ Network.preserveStatic.
+ (Minor API change)"""]] \ 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