Merging debian version 3.4-4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 14 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index a5179c9..277f3e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tmux (3.4-4) unstable; urgency=medium
+
+  * Add tmpfiles.d configuration file to prevent automatic removal of tmux
+    user directories under /tmp (closes: #1070724).
+  * Update metadata on upstream patches.
+  * Bump Standards-Version to 4.7.0.
+
+ -- Romain Francoise <rfrancoise@debian.org>  Wed, 08 May 2024 18:46:48 +0200
+
 tmux (3.4-3~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 5206889..8f43488 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: bison,
                libutempter-dev,
                libutil-freebsd-dev [kfreebsd-any],
                pkgconf
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Rules-Requires-Root: no
 Homepage: https://tmux.github.io/
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/tmux
diff --git a/debian/patches/upstream-6c0067c103.diff b/debian/patches/upstream-6c0067c103.diff
index ed9423b..bbcf2d8 100644
--- a/debian/patches/upstream-6c0067c103.diff
+++ b/debian/patches/upstream-6c0067c103.diff
@@ -1,6 +1,7 @@
 commit 6c0067c10360880334afa50815b880d04edcbf42
 Author: Nicholas Marriott <nicholas.marriott@gmail.com>
 Date:   Thu Mar 21 11:30:42 2024 +0000
+Forwarded: not-needed
 
     Do not notify window-layout-changed if the window is about to be
     destroyed (since it may have been freed by the time the notify happens),
diff --git a/debian/patches/upstream-aa17f0e0c1.diff b/debian/patches/upstream-aa17f0e0c1.diff
index deb8e6a..ccf3966 100644
--- a/debian/patches/upstream-aa17f0e0c1.diff
+++ b/debian/patches/upstream-aa17f0e0c1.diff
@@ -1,6 +1,7 @@
 commit aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae
 Author: Nicholas Marriott <nicholas.marriott@gmail.com>
 Date:   Thu Mar 21 11:37:09 2024 +0000
+Forwarded: not-needed
 
     Fix crash if SIXEL colour register is invalid and remove SIXEL images before
     reflow to avoid a different crash, from Anindya Mukherjee.
diff --git a/debian/patches/upstream-bd29a48b56.diff b/debian/patches/upstream-bd29a48b56.diff
index 3386da0..dd4c4c3 100644
--- a/debian/patches/upstream-bd29a48b56.diff
+++ b/debian/patches/upstream-bd29a48b56.diff
@@ -1,6 +1,7 @@
 commit bd29a48b56ae649d425fd6939d60f75d79d767da
 Author: Nicholas Marriott <nicholas.marriott@gmail.com>
 Date:   Wed Mar 6 21:32:39 2024 +0000
+Forwarded: not-needed
 
     Check for the right flag to fix split-window -p, from Bryan Childs.
 
diff --git a/debian/tmux.tmpfiles b/debian/tmux.tmpfiles
new file mode 100644
index 0000000..1471601
--- /dev/null
+++ b/debian/tmux.tmpfiles
@@ -0,0 +1 @@
+x /tmp/tmux-*