summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2018-02-04 11:59:02 -0400
committerJoey Hess2018-02-04 11:59:02 -0400
commitdcae58d6262117122dc8af0a0e6fc63ed2c25c88 (patch)
treec394be44bd65b8e4b7be4d8c90e3608400e148fc /debian
parentc0a2701284a800f55abdd61f0b8619582c399a9e (diff)
parentab7a7f421c9b57b5963a44e57a6a4df7c594aca6 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog14
1 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 23172a22..a0471182 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-propellor (5.3.0) UNRELEASED; urgency=medium
+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 <id@joeyh.name> 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
is run on a Debian system, but ~/.propellor was not cloned from the
@@ -8,12 +16,14 @@ 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.
* Run su with --login, to avoid inheriting some problematic environment
variables, such as TMP, from the caller.
* Grub: Added properties to configure /etc/default/grub.
* Laptop: New module, starting with powertopAutoTuneOnBoot.
- -- Joey Hess <id@joeyh.name> Tue, 02 Jan 2018 13:06:45 -0400
+ -- Joey Hess <id@joeyh.name> Thu, 01 Feb 2018 12:27:01 -0400
propellor (5.2.0) unstable; urgency=medium