[X2Go-Commits] [x2goclient] 13/38: Move --dpi cmdline option from X2Go options to NX options.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit c04045170fea7330547fb3849c2940b7f54ec1b4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 31 15:55:25 2021 +0200

    Move --dpi cmdline option from X2Go options to NX options.
---
 debian/changelog | 1 +
 pyhoca-cli       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 11db4bdc..4b702e7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ pyhoca-cli (0.6.1.3-0x2go1) UNRELEASED; urgency=medium
       Only demand an integer, if args.dpi is set to something else than None.
     - pyhoca-cli: Add --kdrive cmdline option.
     - pyhoca-cli.1 man page: Drop -d from --quiet documentation line.
+    - Move --dpi cmdline option from X2Go options to NX options.
 
   [ Daniel Teichmann ]
   * New upstream release (0.6.1.3):
diff --git a/pyhoca-cli b/pyhoca-cli
index 4ecdf68c..f432b906 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -159,7 +159,6 @@ x2go_options =    [
                     {'args':['-l', '-u','--username'], 'default': None, 'help': 'username for the session (default: current user)', },
                     {'args':['--password'], 'default': None, 'help': 'user password for session authentication', },
                     {'args':['--force-password'], 'default': False, 'action': 'store_true', 'help': 'enforce username/password authentication', },
-                    {'args':['--dpi'], 'default': None, 'help': 'resolution (in dots per inch) to be used by the X2Go session\'s Xserver', },
                     {'args':['-p','--remote-ssh-port'], 'default': '22', 'help': 'remote SSH port (default: 22)', },
                     {'args':['-i', '-k','--ssh-privkey'], 'default': None, 'help': 'use file \'SSH_PRIVKEY\' as private key for the SSH connection (e.g. ~/.ssh/id_rsa)', },
                     {'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'add RSA host key fingerprint to ~/.ssh/known_hosts if authenticity of server can\'t be established (default: not set)', },
@@ -196,6 +195,7 @@ nx_options =      [
                     {'args':['--kbd-type'], 'default': 'auto', 'help': 'set Keyboard type (default: \'auto\', other allowed options: \'pc105/us\', \'pc105/de\', etc.)',},
                     {'args':['--kbd-layout'], 'default': 'null', 'help': 'use keyboard layout (default: \'null\', allowed options: \'de\', \'fr\', etc.)',},
                     {'args':['-C', '--clipboard-mode'], 'default': 'both', 'help': 'configure clipboard mode (default: \'both\' directions, other allowed values: \'none\' for no clipboard support, \'client\' to server copy+pasting only, \'server\' to client copy+pasting only)',},
+                    {'args':['--dpi'], 'default': None, 'help': 'resolution (in dots per inch) to be used by the X2Go session\'s Xserver', },
                   ]
 compat_options =  [
                     {'args':['--port'], 'default': None, 'help': 'compatibility option, synonymous to --remote-ssh-port PORT', },

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git