From 41ce00bdb0fee2b68fb33d53b535b843c134aff8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jul 2017 20:02:47 -0400 Subject: clean up after merge --- config.hs | 2 +- privdata/relocate | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 privdata/relocate 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/privdata/relocate b/privdata/relocate deleted file mode 100644 index 271692d8..00000000 --- a/privdata/relocate +++ /dev/null @@ -1 +0,0 @@ -.joeyconfig -- cgit v1.2.3 From 69c1eff8a375d97c313a5a3540fd4fb1d0a4f76a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jul 2017 20:04:02 -0400 Subject: releasing package propellor version 4.6.0 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 Tue, 25 Jul 2017 21:01:23 -0400 + -- Joey Hess Wed, 26 Jul 2017 20:02:50 -0400 propellor (4.5.2) unstable; urgency=medium -- cgit v1.2.3 From 8ab7c1a3680ad59a3017eaa21d7985e662c669a0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jul 2017 20:04:22 -0400 Subject: add news item for propellor 4.6.0 --- doc/news/version_4.4.0.mdwn | 8 -------- doc/news/version_4.6.0.mdwn | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 doc/news/version_4.4.0.mdwn create mode 100644 doc/news/version_4.6.0.mdwn 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 -- cgit v1.2.3