From d0868b037073576e938a582895f8b673a30fcb28 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Aug 2017 16:18:36 -0400 Subject: Locale: Display an error message when /etc/locale.gen does not contain the requested locale. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ec899f56..da1dc5a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ propellor (4.7.6) UNRELEASED; urgency=medium Thanks, Sean Whitton * Locale: Make sure that the locales package is installed when enabling locales. + * Locale: Display an error message when /etc/locale.gen does not contain + the requested locale. -- Joey Hess Tue, 01 Aug 2017 15:33:49 -0400 -- cgit v1.3-2-g0d8e From a11d4b95d53e526244fdf5e6d5913b9b442cb4e7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 22 Aug 2017 16:41:37 -0400 Subject: deprecate attic and obnam * Attic module is deprecated and will warn when used. Attic is no longer available in Debian and appears to have been mostly supersceded by Borg. * Obnam module is deprecated and will warn when used. Obnam has been retired by its author. Keeping the modules in propellor for now; propellor supports debian oldstable which still has attic in it, and obnam is not gone yet. This commit was sponsored by Francois Marier on Patreon. --- debian/changelog | 5 +++++ src/Propellor/Property/Attic.hs | 6 +++++- src/Propellor/Property/Obnam.hs | 5 ++++- 3 files changed, 14 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index da1dc5a9..157a7c98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,11 @@ propellor (4.7.6) UNRELEASED; urgency=medium locales. * Locale: Display an error message when /etc/locale.gen does not contain the requested locale. + * Attic module is deprecated and will warn when used. + Attic is no longer available in Debian and appears to have been + mostly supersceded by Borg. + * Obnam module is deprecated and will warn when used. + Obnam has been retired by its author. -- Joey Hess Tue, 01 Aug 2017 15:33:49 -0400 diff --git a/src/Propellor/Property/Attic.hs b/src/Propellor/Property/Attic.hs index 3059a04b..9e024356 100644 --- a/src/Propellor/Property/Attic.hs +++ b/src/Propellor/Property/Attic.hs @@ -1,8 +1,12 @@ -- | Maintainer: Félix Sipma -- -- Support for the Attic backup tool +-- +-- This module is deprecated because Attic is not available in debian +-- stable any longer (so the installed property no longer works), and it +-- appears to have been mostly supersceded by Borg. -module Propellor.Property.Attic +module Propellor.Property.Attic {-# DEPRECATED "Use Borg instead" #-} ( installed , repoExists , init diff --git a/src/Propellor/Property/Obnam.hs b/src/Propellor/Property/Obnam.hs index 66d3c08d..7943b46e 100644 --- a/src/Propellor/Property/Obnam.hs +++ b/src/Propellor/Property/Obnam.hs @@ -1,6 +1,9 @@ -- | Support for the Obnam backup tool +-- +-- This module is deprecated because Obnam has been retired by its +-- author. -module Propellor.Property.Obnam where +module Propellor.Property.Obnam {-# DEPRECATED "Obnam has been retired; time to transition to something else" #-} where import Propellor.Base import qualified Propellor.Property.Apt as Apt -- cgit v1.3-2-g0d8e From 3a7bfdb84fc6b0aa0e6ca3580580e4403a8e0f59 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Aug 2017 11:41:08 -0400 Subject: move unrelased part of changelog --- debian/changelog | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 40474c05..9de29229 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,5 @@ -propellor (4.7.6) unstable; urgency=medium +propellor (4.7.7) UNRELEASED; urgency=medium - * Sbuild: Add Sbuild.userConfig property. - Thanks, Sean Whitton - * Locale: Make sure that the locales package is installed when enabling - locales. * Locale: Display an error message when /etc/locale.gen does not contain the requested locale. * Attic module is deprecated and will warn when used. @@ -12,6 +8,15 @@ propellor (4.7.6) unstable; urgency=medium * Obnam module is deprecated and will warn when used. Obnam has been retired by its author. + -- Joey Hess Wed, 23 Aug 2017 11:41:01 -0400 + +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 17:59:07 -0400 propellor (4.7.5) unstable; urgency=medium -- cgit v1.3-2-g0d8e From 5ec42dd1b78c5d60d53c00d6494511c4b2adb943 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Aug 2017 11:48:18 -0400 Subject: Add Typeable instance to Bootstrapper, fixing build with old versions of ghc. (Previous attempt was incomplete.) --- debian/changelog | 2 ++ .../comment_1_c35f458b4c958f6397fe726f5676b700._comment | 7 +++++++ src/Propellor/Bootstrap.hs | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 doc/forum/propellor_4.7.6_does_not_compile_on_jessie/comment_1_c35f458b4c958f6397fe726f5676b700._comment (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9de29229..f6ed0d58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ propellor (4.7.7) UNRELEASED; urgency=medium mostly supersceded by Borg. * Obnam module is deprecated and will warn when used. Obnam has been retired by its author. + * Add Typeable instance to Bootstrapper, fixing build with old versions + of ghc. (Previous attempt was incomplete.) -- Joey Hess Wed, 23 Aug 2017 11:41:01 -0400 diff --git a/doc/forum/propellor_4.7.6_does_not_compile_on_jessie/comment_1_c35f458b4c958f6397fe726f5676b700._comment b/doc/forum/propellor_4.7.6_does_not_compile_on_jessie/comment_1_c35f458b4c958f6397fe726f5676b700._comment new file mode 100644 index 00000000..98b2d00a --- /dev/null +++ b/doc/forum/propellor_4.7.6_does_not_compile_on_jessie/comment_1_c35f458b4c958f6397fe726f5676b700._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-08-23T15:41:55Z" + content=""" +I've added a typeable instance for Bootstrapper which should fix that. +"""]] diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 21d29bcc..08af6878 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -33,7 +33,7 @@ type ShellCommand = String -- `OSOnly` uses the OS's native packages of Cabal and all of propellor's -- build dependencies. It may not work on all systems. data Bootstrapper = Robustly Builder | OSOnly - deriving (Show) + deriving (Show, Typeable) data Builder = Cabal | Stack deriving (Show, Typeable) -- cgit v1.3-2-g0d8e