From 01713948829dc36944cb79db89881b8ad56d5a37 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 28 May 2022 15:48:06 +0200
Subject: [PATCH] release v2.14

---
 CHANGELOG      | 12 ++++++++++++
 I3LOCK_VERSION |  1 -
 meson.build    |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 delete mode 100644 I3LOCK_VERSION

diff --git a/CHANGELOG b/CHANGELOG
index 3d387b5..e6b436e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,15 @@
+2022-05-28 i3lock 2.14
+
+ • Change default background color to #a3a3a3
+   See https://github.com/i3/i3lock/pull/300 for extensive
+   discussion and rationale for this change.
+ • Recommend using xss-lock to start i3lock in the README
+   and i3lock.1 man page. xss-lock is the best way to ensure
+   your screen truly is locked before your computer suspends.
+ • Display modifier key warning before unlocking, too,
+   not just on failed attempts like before.
+ • Switch build system from autotools to meson.
+
 2020-10-27 i3lock 2.13
 
  • Throw error when trying to start on Wayland
diff --git a/I3LOCK_VERSION b/I3LOCK_VERSION
deleted file mode 100644
index 5a05135..0000000
--- a/I3LOCK_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.13-non-git
diff --git a/meson.build b/meson.build
index c10b16c..8853b57 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@
 project(
   'i3lock',
   'c',
-  version: '2.13',
+  version: '2.14',
   default_options: [
     'c_std=c11',
     'warning_level=1',  # enable all warnings (-Wall)