From d216a5c9d3298ef6fb3109547bfda43ea18b6cb7 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 19 Oct 2021 08:37:58 +0200
Subject: [PATCH 1/3] release i3 4.20

---
 RELEASE-NOTES-4.19.2                     | 25 ------------------------
 RELEASE-NOTES-next => RELEASE-NOTES-4.20 | 14 +++++++++++++
 meson.build                              |  4 ++--
 3 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 RELEASE-NOTES-4.19.2
 rename RELEASE-NOTES-next => RELEASE-NOTES-4.20 (85%)

diff --git a/RELEASE-NOTES-4.19.2 b/RELEASE-NOTES-4.19.2
deleted file mode 100644
index df859a8a2..000000000
--- a/RELEASE-NOTES-4.19.2
+++ /dev/null
@@ -1,25 +0,0 @@
-
- ┌──────────────────────────────┐
- │ Release notes for i3 v4.19.2 │
- └──────────────────────────────┘
-
-This is i3 v4.19. This version is considered stable. All users of i3 are
-strongly encouraged to upgrade.
-
-This is a bugfix release for v4.19
-
- ┌────────────────────────────┐
- │ Bugfixes                   │
- └────────────────────────────┘
-
-  • fix release tarball version number and debug log settings
-
- ┌────────────────────────────┐
- │ Thanks!                    │
- └────────────────────────────┘
-
-Thanks for testing, bugfixes, discussions and everything I forgot go out to:
-
-  Stuart Henderson
-
--- Michael Stapelberg, 2021-02-27
diff --git a/RELEASE-NOTES-next b/RELEASE-NOTES-4.20
similarity index 85%
rename from RELEASE-NOTES-next
rename to RELEASE-NOTES-4.20
index a7800138a..4345a56bd 100644
--- a/RELEASE-NOTES-next
+++ b/RELEASE-NOTES-4.20
@@ -77,3 +77,17 @@ In case you notice any issues regarding your background/wallpaper, note:
   • clear pixmap before drawing to prevent visual garbage
   • fix crash with "layout default"
   • send an "output" event on XRandR 1.5 monitor configuration change
+
+ ┌────────────────────────────┐
+ │ Thanks!                    │
+ └────────────────────────────┘
+
+Thanks for testing, bugfixes, discussions and everything I forgot go out to:
+
+  ajakk, Albert Safin, Anaël Beutot, Antoine Martin, Dmitri Goutnik, ekarpp,
+  Imran Virani, Ingo Bürk, Isaac Garzon, Ivan Milov, Jay Khandkar, j-jzk, Ken
+  Gilmer, Kjetil Torgrim Homme, lbonn, Michael Stapelberg, Orestis Floros, Ralph
+  Gutkowski, Romuald Brunet, tomty89, Tristan Giles, Tudor Brindus, Uli
+  Schlachter, Vincent Bernat, Vladimir Panteleev
+
+-- Michael Stapelberg, 2021-10-19
diff --git a/meson.build b/meson.build
index 00cd9e94d..eb02f369e 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@
 project(
   'i3',
   'c',
-  version: '4.19.2',
+  version: '4.20',
   default_options: [
     'c_std=c11',
     'warning_level=1',  # enable all warnings (-Wall)
@@ -63,7 +63,7 @@ config_h = declare_dependency(
   sources: vcs_tag(
     input: config_h_in,
     output: 'config.h',
-    fallback: meson.project_version() + '-non-git',
+    fallback: meson.project_version() + ' (2021-10-19)',
   )
 )
 

From 2472f8b8b467b133bf53916ec30bd8051b55d48d Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 19 Oct 2021 08:38:14 +0200
Subject: [PATCH 2/3] Restore non-git version suffix

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index eb02f369e..5c3410da6 100644
--- a/meson.build
+++ b/meson.build
@@ -63,7 +63,7 @@ config_h = declare_dependency(
   sources: vcs_tag(
     input: config_h_in,
     output: 'config.h',
-    fallback: meson.project_version() + ' (2021-10-19)',
+    fallback: meson.project_version() + '-non-git',
   )
 )
 

From 46f4fe4ecc314ebe3c9b2d7ad1a7206409cf47d2 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 19 Oct 2021 08:45:28 +0200
Subject: [PATCH 3/3] debian: update changelog

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 96b855f95..448251f66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i3-wm (4.20-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Stapelberg <stapelberg@debian.org>  Tue, 19 Oct 2021 08:45:18 +0200
+
 i3-wm (4.19.2-1) unstable; urgency=medium
 
   * New upstream release.