From a730bbda2b91cf2bac9b63be8647ba322691e57f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Jan 2018 13:32:04 -0400 Subject: Add HasCallStack constraint to pickOS and unsupportedOS, so the call stack includes the caller. This commit was sponsored by Jochen Bartl on Patreon. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4545bcd1..2ffe4f8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ propellor (5.3.0) UNRELEASED; urgency=medium * Added rawPartition to PartSpec, for specifying partitions with no filesystem. * Added BiosGrubFlag to PartFlag. + * Add HasCallStack constraint to pickOS and unsupportedOS, so the + call stack includes the caller. -- Joey Hess Tue, 02 Jan 2018 13:06:45 -0400 -- cgit v1.2.3 From b6000d75626114c7234c67da5f9a665e084923c6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 1 Feb 2018 12:28:13 -0400 Subject: releasing package propellor version 5.3.0 --- debian/changelog | 4 ++-- propellor.cabal | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fcbd3951..b1fb27af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -propellor (5.3.0) UNRELEASED; urgency=medium +propellor (5.3.0) unstable; urgency=medium * Avoid bogus warning about new upstream version when /usr/bin/propellor is run on a Debian system, but ~/.propellor was not cloned from the @@ -15,7 +15,7 @@ propellor (5.3.0) UNRELEASED; urgency=medium * Grub: Added properties to configure /etc/default/grub. * Laptop: New module, starting with powertopAutoTuneOnBoot. - -- Joey Hess Tue, 02 Jan 2018 13:06:45 -0400 + -- Joey Hess Thu, 01 Feb 2018 12:27:01 -0400 propellor (5.2.0) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index e59a55a4..f716b978 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 5.2.0 +Version: 5.3.0 Cabal-Version: >= 1.20 License: BSD2 Maintainer: Joey Hess @@ -126,8 +126,8 @@ Library Propellor.Property.Installer.Target Propellor.Property.Journald Propellor.Property.Kerberos - Propellor.Property.LetsEncrypt Propellor.Property.Laptop + Propellor.Property.LetsEncrypt Propellor.Property.List Propellor.Property.LightDM Propellor.Property.Locale -- cgit v1.2.3 From ab7a7f421c9b57b5963a44e57a6a4df7c594aca6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 4 Feb 2018 11:58:42 -0400 Subject: Last release mistakenly contained my personal branch not master. * Last release mistakenly contained my personal branch not master. * contrib/post-merge-hook documentation updated to recommend also using it as a post-checkout hook, to avoid such problems. --- contrib/post-merge-hook | 4 ++-- debian/changelog | 8 ++++++++ propellor.cabal | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/contrib/post-merge-hook b/contrib/post-merge-hook index fa9ab5b6..4bbb1de7 100755 --- a/contrib/post-merge-hook +++ b/contrib/post-merge-hook @@ -1,7 +1,7 @@ #!/bin/sh # -# git post-merge hook, used by propellor's author to maintain a -# joeyconfig branch with some changes while being able to merge +# git post-merge (and post-checkout) hook, used by propellor's author to +# maintain a joeyconfig branch with some changes while being able to merge # between it and branches without the changes. # # Each time this hook is run, it checks if it's on a branch with diff --git a/debian/changelog b/debian/changelog index b1fb27af..a0471182 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +propellor (5.3.1) UNRELEASED; urgency=medium + + * Last release mistakenly contained my personal branch not master. + * contrib/post-merge-hook documentation updated to recommend also using + it as a post-checkout hook, to avoid such problems. + + -- Joey Hess Sun, 04 Feb 2018 11:54:28 -0400 + propellor (5.3.0) unstable; urgency=medium * Avoid bogus warning about new upstream version when /usr/bin/propellor diff --git a/propellor.cabal b/propellor.cabal index f716b978..4f90c49c 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 5.3.0 +Version: 5.3.1 Cabal-Version: >= 1.20 License: BSD2 Maintainer: Joey Hess -- cgit v1.2.3