Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: nx-l...@packages.debian.org
Control: affects -1 + src:nx-libs
We received a report about font problems with nxagent/x2goagent
in Debian that occur with the official DEB packages but not
with the upstream-provided DEB packages.
See:
https://github.com/ArcticaProject/nx-libs/issues/1039
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006662
[ Reason ]
Users of X2Go shall not see application complaints about missing
fonts. This requires placing a symlink /usr/share/nx/fonts
pointing to /usr/share/fonts/X11 into one of the nx-libs-provided
packages (i.e. nx-x11-common).
[ Impact ]
xterm and other applications expecting fonts from
/usr/share/fonts/X11/misc being available will continue complaining.
[ Tests ]
Manual test on Debian bookworm and testing/unstable.
[ Risks ]
Minimal. No code change, only the symlink has been added.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
+ * debian/nx-x11-common.{dir,links}:
+ + Assure that a symlink from from /usr/share/nx/fonts to
+ /usr/share/fonts/X11 gets provided by the nx-x11-common bin:pkg.
+ (Closes: #1006662).
-> explanation, see above
+ * debian/patches:
+ + Add 0008_nx-X11-programs-Xserver-hw-nxagent-man-nxagent.1-Fix.patch. Fix
+ groff error in man page, properly show all text in the keystrokes.cfg
+ passage. Thanks, lintian.
-> explanation, see under [ Other info ]
[ Other info ]
Also a groff error in the nxagent.1 man page gets resolved with this.
diff -Nru nx-libs-3.5.99.26/debian/changelog nx-libs-3.5.99.26/debian/changelog
--- nx-libs-3.5.99.26/debian/changelog 2021-10-30 13:38:02.000000000 +0200
+++ nx-libs-3.5.99.26/debian/changelog 2023-08-27 14:45:11.000000000 +0200
@@ -1,3 +1,16 @@
+nx-libs (2:3.5.99.26-5+deb12u1) bookworm; urgency=medium
+
+ * debian/nx-x11-common.{dir,links}:
+ + Assure that a symlink from from /usr/share/nx/fonts to
+ /usr/share/fonts/X11 gets provided by the nx-x11-common bin:pkg.
+ (Closes: #1006662).
+ * debian/patches:
+ + Add 0008_nx-X11-programs-Xserver-hw-nxagent-man-nxagent.1-Fix.patch. Fix
+ groff error in man page, properly show all text in the keystrokes.cfg
+ passage. Thanks, lintian.
+
+ -- Mike Gabriel <sunwea...@debian.org> Sun, 27 Aug 2023 14:45:11 +0200
+
nx-libs (2:3.5.99.26-5) unstable; urgency=medium
* debian/patches:
diff -Nru nx-libs-3.5.99.26/debian/nx-x11-common.dirs
nx-libs-3.5.99.26/debian/nx-x11-common.dirs
--- nx-libs-3.5.99.26/debian/nx-x11-common.dirs 1970-01-01 01:00:00.000000000
+0100
+++ nx-libs-3.5.99.26/debian/nx-x11-common.dirs 2023-08-27 14:44:03.000000000
+0200
@@ -0,0 +1,2 @@
+# we symlink to this dir, so make sure it exists
+usr/share/fonts/X11
diff -Nru nx-libs-3.5.99.26/debian/nx-x11-common.links
nx-libs-3.5.99.26/debian/nx-x11-common.links
--- nx-libs-3.5.99.26/debian/nx-x11-common.links 1970-01-01
01:00:00.000000000 +0100
+++ nx-libs-3.5.99.26/debian/nx-x11-common.links 2023-08-27
14:44:03.000000000 +0200
@@ -0,0 +1 @@
+usr/share/fonts/X11 usr/share/nx/fonts
diff -Nru
nx-libs-3.5.99.26/debian/patches/0008_nx-X11-programs-Xserver-hw-nxagent-man-nxagent.1-Fix.patch
nx-libs-3.5.99.26/debian/patches/0008_nx-X11-programs-Xserver-hw-nxagent-man-nxagent.1-Fix.patch
---
nx-libs-3.5.99.26/debian/patches/0008_nx-X11-programs-Xserver-hw-nxagent-man-nxagent.1-Fix.patch
1970-01-01 01:00:00.000000000 +0100
+++
nx-libs-3.5.99.26/debian/patches/0008_nx-X11-programs-Xserver-hw-nxagent-man-nxagent.1-Fix.patch
2023-08-27 14:44:24.000000000 +0200
@@ -0,0 +1,27 @@
+From bdb4eefb6224f2146a0bcc43459651a4d3b2a22f Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
+Date: Sun, 27 Aug 2023 12:19:34 +0200
+Subject: [PATCH] nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1: Fix groff
+ error reported by lintian in nxagent man page.
+
+Signed-off-by: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
+---
+ nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+index 5f87fa8d4..0f57c3dcf 100644
+--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
++++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+@@ -575,7 +575,7 @@ file is taken). If \fBnxagent\fR is run as \fBx2goagent\fR
the defaults are
+ .IR ~/.x2go/keystrokes.cfg
+ and
+ .IR /etc/x2go/keystrokes.cfg
+-. Any keystrokes
++Any keystrokes
+ \fBnxagent\fR knows about that are not defined in this file are
+ ignored. (Only) if no file is found built-in defaults are used. The
+ keystroke file can be re-read by a keystroke (ctrl-alt-k by default).
+--
+2.39.2
+
diff -Nru nx-libs-3.5.99.26/debian/patches/series
nx-libs-3.5.99.26/debian/patches/series
--- nx-libs-3.5.99.26/debian/patches/series 2021-10-30 13:37:19.000000000
+0200
+++ nx-libs-3.5.99.26/debian/patches/series 2023-08-27 14:44:38.000000000
+0200
@@ -6,3 +6,4 @@
0004_document-additional-options-only-nxagent-knows-about.patch
0005_fix-building-with-binutils-2.36.patch
0006_nx-X11-Add-support-for-riscv64-architecture.patch
+0008_nx-X11-programs-Xserver-hw-nxagent-man-nxagent.1-Fix.patch
