From c355dc91d35c74234c24dfbf013dfac98110d352 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 08:16:35 +0200 Subject: Makefile,debian/*,nx-libs.spec,: Drop references to X2Go Project, esp. drop x2goagent. The x2goagent package is being replaced by an x2goserver bin:package named x2goserver-x2goagent. This x2goserver-x2goagent bin:package will be maintained in the X2Go Project's namespace and basically wraps around nxagent. Furthermore, declare Arctica Project as upstream source for nx-libs. --- debian/nxagent.install | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/nxagent.install') diff --git a/debian/nxagent.install b/debian/nxagent.install index eaaa847e9..123971a7c 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,6 +1,7 @@ etc/nxagent/keystrokes.cfg etc/nxagent/rgb usr/share/nx/rgb +usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/nx/bin/nxagent usr/bin/nxagent -- cgit v1.2.3 From 5934d03efdcf32e8ecdf61cc29a80b2088e6de9c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 30 Jun 2016 23:50:12 +0200 Subject: Rework nxagent and nxproxy wrapper scripts. o Install nxagent/nxproxy executables into multi-arch path. o Fake libNX_X11.so* as $LIBDIR/nx-X11/libX11.so*. o Allow injecting different $NXAPP containing the executable name. o For e.g. x2goagent this requires the following changes: - Move x2goagent symlink from /usr/lib/x2go/bin/x2goagent to $LIBDIR/nx/bin/x2goagent - Replace /usr/bin/x2goagent by a two-liner... ``` #!/bin/sh export NXAPP=x2goagent nxagent ``` --- debian/nxagent.install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/nxagent.install') diff --git a/debian/nxagent.install b/debian/nxagent.install index 123971a7c..75e72fcde 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -3,7 +3,8 @@ etc/nxagent/rgb usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* -usr/lib/nx/bin/nxagent +usr/lib/*/nx/bin/nxagent +usr/lib/*/nx-X11/ usr/bin/nxagent usr/share/pixmaps/nxagent.xpm etc/nxagent/nxagent.keyboard -- cgit v1.2.3 From c45cab1ba5a6ffe3832039d89c26a6d11068d417 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 18:52:04 +0100 Subject: Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) with nx-X11 internal naming schemes (and use /usr//nx/X11 rather than /usr//nx-X11). --- debian/nxagent.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/nxagent.install') diff --git a/debian/nxagent.install b/debian/nxagent.install index 75e72fcde..5f6a9de35 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -4,7 +4,7 @@ usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/*/nx/bin/nxagent -usr/lib/*/nx-X11/ +usr/lib/*/nx/X11/ usr/bin/nxagent usr/share/pixmaps/nxagent.xpm etc/nxagent/nxagent.keyboard -- cgit v1.2.3 From 744e288d104a7df040ccb9a095c3e402fc2820d7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 6 Feb 2017 15:20:18 +0100 Subject: debian/nxagent.*: Drop conffile /etc/nxagent/rgb utilizing dpkg-maintscript-helper. --- debian/nxagent.install | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian/nxagent.install') diff --git a/debian/nxagent.install b/debian/nxagent.install index 5f6a9de35..34f5c3a76 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,6 +1,4 @@ etc/nxagent/keystrokes.cfg -etc/nxagent/rgb -usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/*/nx/bin/nxagent -- cgit v1.2.3 From ca43087812afa2817ddc086591b60d593aacc954 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 21 Nov 2017 13:28:17 +0100 Subject: Drop bin wrappers for nxagent and nxproxy, directly install nxproxy and nxagent to BINDIR. Fixes ArcticaProject/nx-libs#546. --- debian/nxagent.install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/nxagent.install') diff --git a/debian/nxagent.install b/debian/nxagent.install index 34f5c3a76..87ba3583f 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,8 +1,9 @@ etc/nxagent/keystrokes.cfg usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* -usr/lib/*/nx/bin/nxagent usr/lib/*/nx/X11/ usr/bin/nxagent usr/share/pixmaps/nxagent.xpm etc/nxagent/nxagent.keyboard +# FIXME: compatibility symlink, drop for 3.6.0 release +usr/lib/*/nx/bin/nxagent -- cgit v1.2.3 From 7610c0f19e01f2815966b1e333d65c8ab748bd1f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 13 Dec 2017 23:43:41 +0100 Subject: debian/*: Adopt from official Debian package where appropriate. --- debian/nxagent.install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian/nxagent.install') diff --git a/debian/nxagent.install b/debian/nxagent.install index 87ba3583f..3f9525906 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,9 +1,9 @@ etc/nxagent/keystrokes.cfg -usr/share/nx/VERSION.nxagent -usr/share/man/man1/nxagent.1* -usr/lib/*/nx/X11/ +etc/nxagent/nxagent.keyboard usr/bin/nxagent +usr/lib/*/nx/X11/ +usr/share/man/man1/nxagent.1* +usr/share/nx/VERSION.nxagent usr/share/pixmaps/nxagent.xpm -etc/nxagent/nxagent.keyboard # FIXME: compatibility symlink, drop for 3.6.0 release usr/lib/*/nx/bin/nxagent -- cgit v1.2.3