diff -Nru i3-wm-4.22/debian/changelog i3-wm-4.22/debian/changelog
--- i3-wm-4.22/debian/changelog	2023-01-07 11:51:54.000000000 +0000
+++ i3-wm-4.22/debian/changelog	2023-01-21 17:48:33.000000000 +0000
@@ -1,3 +1,10 @@
+i3-wm (4.22-2) unstable; urgency=medium
+
+  * Fix i3bar nonprimary output regression
+  * Update years in d/copyright
+
+ -- Jakob Haufe <sur5r@debian.org>  Sat, 21 Jan 2023 18:48:33 +0100
+
 i3-wm (4.22-1) unstable; urgency=medium
 
   * New upstream version 4.22
diff -Nru i3-wm-4.22/debian/copyright i3-wm-4.22/debian/copyright
--- i3-wm-4.22/debian/copyright	2022-04-21 18:47:05.000000000 +0000
+++ i3-wm-4.22/debian/copyright	2023-01-21 15:34:44.000000000 +0000
@@ -4,11 +4,12 @@
 Source: https://i3wm.org/
 
 Files: *
-Copyright: 2009 Michael Stapelberg
+Copyright: 2009-2023 Michael Stapelberg
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2009 Michael Stapelberg
+Copyright: 2009-2019 Michael Stapelberg
+ 2019-2023 Jakob Haufe
 License: BSD-3-clause
 
 License: BSD-3-clause
diff -Nru i3-wm-4.22/debian/patches/fix-i3bar-nonprimary-regression i3-wm-4.22/debian/patches/fix-i3bar-nonprimary-regression
--- i3-wm-4.22/debian/patches/fix-i3bar-nonprimary-regression	1970-01-01 00:00:00.000000000 +0000
+++ i3-wm-4.22/debian/patches/fix-i3bar-nonprimary-regression	2023-01-21 15:30:27.000000000 +0000
@@ -0,0 +1,82 @@
+commit fa25afedd26dac12907f4af9c6f0b2ddf1cbbf2f
+Author: Orestis Floros <orestisflo@gmail.com>
+Date:   Fri Jan 6 22:24:08 2023 +0100
+
+    Do not canonicalize "nonprimary" output for i3bar
+    
+    Fixes #5346
+
+diff --git a/release-notes/bugfixes/1-i3bar-nonprimary b/release-notes/bugfixes/1-i3bar-nonprimary
+new file mode 100644
+index 00000000..b787a5a6
+--- /dev/null
++++ b/release-notes/bugfixes/1-i3bar-nonprimary
+@@ -0,0 +1 @@
++fix regression with i3bar's output nonprimary
+diff --git a/src/ipc.c b/src/ipc.c
+index f69ba2ae..28a86092 100644
+--- a/src/ipc.c
++++ b/src/ipc.c
+@@ -739,7 +739,7 @@ static void dump_bar_bindings(yajl_gen gen, Barconfig *config) {
+ 
+ static char *canonicalize_output_name(char *name) {
+     /* Do not canonicalize special output names. */
+-    if (strcasecmp(name, "primary") == 0) {
++    if (strcasecmp(name, "primary") == 0 || strcasecmp(name, "nonprimary") == 0) {
+         return name;
+     }
+     Output *output = get_output_by_name(name, false);
+diff --git a/testcases/t/538-i3bar-primary-output.t b/testcases/t/538-i3bar-primary-output.t
+index 249d5777..d5581dd8 100644
+--- a/testcases/t/538-i3bar-primary-output.t
++++ b/testcases/t/538-i3bar-primary-output.t
+@@ -17,8 +17,10 @@
+ # Tests that i3bars configured to use the primary output do not have
+ # their output names canonicalized to something other than "primary".
+ # Ticket: #2948
++# Ticket: #5346
+ # Bug still in: 4.14-93-ga3a7d04a
+-use i3test i3_config => <<EOT;
++use i3test i3_autostart => 0;
++my $config = <<EOT;
+ # i3 config file (v4)
+ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+ 
+@@ -28,6 +30,7 @@ bar {
+     output primary
+ }
+ EOT
++my $pid = launch_with_config($config);
+ 
+ my $bars = i3->get_bar_config()->recv;
+ is(@$bars, 1, 'one bar configured');
+@@ -36,5 +39,29 @@ my $bar_id = shift @$bars;
+ 
+ my $bar_config = i3->get_bar_config($bar_id)->recv;
+ is_deeply($bar_config->{outputs}, [ "primary" ], 'bar_config output is primary');
++exit_gracefully($pid);
++
++# Same but for "nonprimary"
++
++$config = <<EOT;
++# i3 config file (v4)
++font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
++
++fake-outputs 1024x768+0+0P,1024x768+0+0
++
++bar {
++    output nonprimary
++}
++EOT
++$pid = launch_with_config($config);
++
++$bars = i3->get_bar_config()->recv;
++is(@$bars, 1, 'one bar configured');
++
++$bar_id = shift @$bars;
++
++$bar_config = i3->get_bar_config($bar_id)->recv;
++is_deeply($bar_config->{outputs}, [ "nonprimary" ], 'bar_config output is nonprimary');
++exit_gracefully($pid);
+ 
+ done_testing;
diff -Nru i3-wm-4.22/debian/patches/series i3-wm-4.22/debian/patches/series
--- i3-wm-4.22/debian/patches/series	2022-10-02 19:36:10.000000000 +0000
+++ i3-wm-4.22/debian/patches/series	2023-01-21 15:30:34.000000000 +0000
@@ -1 +1,2 @@
 fix-perl-interpreter-path
+fix-i3bar-nonprimary-regression