From 55f7540fed4d6defc702ef8d16af037d1a72b83b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Aug 2017 17:59:06 -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 8a3adcf39204157d80e52b17ca2cc3b28fa5169e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Aug 2017 17:59:37 -0400 Subject: releasing package propellor version 4.7.6 --- debian/changelog | 4 ++-- propellor.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ec899f56..9a0bc864 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -propellor (4.7.6) UNRELEASED; urgency=medium +propellor (4.7.6) unstable; urgency=medium * Sbuild: Add Sbuild.userConfig property. Thanks, Sean Whitton * Locale: Make sure that the locales package is installed when enabling locales. - -- Joey Hess Tue, 01 Aug 2017 15:33:49 -0400 + -- Joey Hess Tue, 01 Aug 2017 17:59:07 -0400 propellor (4.7.5) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index a6c5c0fc..cf6739de 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 4.7.5 +Version: 4.7.6 Cabal-Version: >= 1.20 License: BSD2 Maintainer: Joey Hess -- cgit v1.2.3 From 656458f9c04a3c329fefb49de85f83c30d751e36 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Aug 2017 17:59:54 -0400 Subject: add news item for propellor 4.7.6 --- doc/news/version_4.7.1.mdwn | 4 ---- doc/news/version_4.7.6.mdwn | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 doc/news/version_4.7.1.mdwn create mode 100644 doc/news/version_4.7.6.mdwn diff --git a/doc/news/version_4.7.1.mdwn b/doc/news/version_4.7.1.mdwn deleted file mode 100644 index 7b8b2abc..00000000 --- a/doc/news/version_4.7.1.mdwn +++ /dev/null @@ -1,4 +0,0 @@ -propellor 4.7.1 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Added Mount.isMounted. - * Grub.bootsMounted: Bugfix."""]] \ No newline at end of file diff --git a/doc/news/version_4.7.6.mdwn b/doc/news/version_4.7.6.mdwn new file mode 100644 index 00000000..4c8abd97 --- /dev/null +++ b/doc/news/version_4.7.6.mdwn @@ -0,0 +1,6 @@ +propellor 4.7.6 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Sbuild: Add Sbuild.userConfig property. + Thanks, Sean Whitton + * Locale: Make sure that the locales package is installed when enabling + locales."""]] \ No newline at end of file -- cgit v1.2.3