This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from 8f210ed debian/changelog: blimey, I modified the X2Go internal pkg version, so be it now... new da350c9 minidesktop/ltsp/: Make x2gothinclient-minidesktop work on top of latest LTSP (tested with 19.11). new 5bb7109 debian/changelog: fix too-long line new db35589 debian/*: White-space cleanups. new a3eadff debian/control: Add Rules-Requires-Root: field and set it to "no". new 9aeabd9 debian/control: Bump Standards-Version: to 4.4.1. No changes needed. new 2fd1132 debian/control: Don't use first person plural pronoun in LONG_DESCRIPTION. new 2d3cec5 debian/control: Add D (any bin:pkg reported by lintian): lsb-base. new dae7e28 debian/{control,x2gothinclient.<scripts>}: Drop all transitional packages. new f2b222d debian/x2gothinclient-minidesktop.init: Drop init script, never had functionality. new 0801a2c Provide systemd service files for x2gothinclient-cdmanager and x2gothinclient-displaymanager. new f5b2da2 init scripts: Use /run rather than /var/run for placing PID files. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: cdmanager/init/x2gothinclient-cdmanager.init | 8 +- cdmanager/init/x2gothinclient-cdmanager.service | 12 +++ debian/changelog | 31 +++++-- debian/control | 102 ++------------------- debian/x2gothinclient-cdmanager.service | 1 + debian/x2gothinclient-displaymanager.service | 1 + debian/x2gothinclient-minidesktop.init | 1 - debian/x2gothinclient-minidesktop.install | 1 + debian/x2gothinclient-minidesktop.preinst | 2 +- debian/x2gothinclient.postinst | 38 -------- debian/x2gothinclient.preinst | 48 ---------- .../init/x2gothinclient-displaymanager.init | 12 +-- .../init/x2gothinclient-displaymanager.service | 12 +++ minidesktop/init/x2gothinclient-minidesktop.init | 32 ------- ...ent-minidesktop_disable-ltsp-display-manager.sh | 15 ++- 15 files changed, 77 insertions(+), 239 deletions(-) create mode 100644 cdmanager/init/x2gothinclient-cdmanager.service create mode 120000 debian/x2gothinclient-cdmanager.service create mode 120000 debian/x2gothinclient-displaymanager.service delete mode 120000 debian/x2gothinclient-minidesktop.init delete mode 100755 debian/x2gothinclient.postinst delete mode 100755 debian/x2gothinclient.preinst create mode 100644 displaymanager/init/x2gothinclient-displaymanager.service delete mode 100644 minidesktop/init/x2gothinclient-minidesktop.init copy common/lib/x2gothinclient_init => minidesktop/ltsp/client/init/60-x2gothinclient-minidesktop_disable-ltsp-display-manager.sh (64%) mode change 100755 => 100644 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 5bb7109a50b87aff3eee47a32ae4e91d0dddfc8c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 08:21:51 2019 +0100 debian/changelog: fix too-long line --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 367e995..fac12fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,8 +31,8 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium - Provide empty/dummy FreeRDPv2 known_hosts2 file if not already there. - management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home: - Make X2Go Client desktop link executable, so that it becomes a real desktop - link. + Make X2Go Client desktop link executable, so that it becomes a real + desktop link. * debian/rules: + Convert to pure debhelper rules file. + Remove Qt5 build cruft from cdmanager/powerej/. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit db35589b4f67dbd6a3164564537da68d0025642a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 08:24:15 2019 +0100 debian/*: White-space cleanups. --- debian/changelog | 12 ++++++------ debian/x2gothinclient-minidesktop.preinst | 2 +- debian/x2gothinclient.preinst | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index fac12fb..90e2102 100644 --- a/debian/changelog +++ b/debian/changelog @@ -455,7 +455,7 @@ x2gothinclient (1.0.1.7-0~x2go1) unstable; urgency=low - Drop outdated README.howto and point to Wiki page with TCE documentation. - Replace red background with default blue background because - of rendering problems and recognizablitity + of rendering problems and recognizablitity -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 13 Jun 2012 22:24:15 +0200 @@ -511,7 +511,7 @@ x2gothinclient (1.0.1.3-0~x2go1) unstable; urgency=low * New upstream version (1.0.1.3): - Split up x2gocdmanager package into x2gocdmanager and x2gothinshutdown package - - Fix USB mounting, CD mounting, + - Fix USB mounting, CD mounting, - Improve code layout (tab stops, inline comments) - Add HTTP_PROXY and FTP_PROXY support to x2gothinclientmanagement (APT package download) @@ -519,7 +519,7 @@ x2gothinclient (1.0.1.3-0~x2go1) unstable; urgency=low - Add syslinux boot splash with X2Go flavour. - Install 486 and 686 kernels in TCE chroot. - Move PXE tftpboot examples to x2gothinclient/share/tftpboot. - - Improval of syslinux boot screen. + - Improval of syslinux boot screen. - Add x2gothinclient_preptftpboot script. - Add man page for x2gothinclient_preptftpboot. - Do not run management script if there is a problem with the X2Go TCE @@ -540,7 +540,7 @@ x2gothinclient (1.0.1.3-0~x2go1) unstable; urgency=low - Add tmpfs mount for /var/lib/dbus. - Reduce x2goclient CPU load from ~100% to ~0-1%. - Boot TCE kernel with nomodeset boot option to avoid gCard incompatibilities - (Fb vs. Xorg). + (Fb vs. Xorg). - Move kernel/initrd symlinks after install rather than copying. - Add detection of kernel upgrades to x2gothinclient_upgrade script. - Adapt chroot file created by x2gothinclient_upgrade, escaping $-signs. @@ -570,7 +570,7 @@ x2gothinclient (1.0.1.2-0~x2go1) unstable; urgency=low * restructured x2gothinclientmanagement package * x2gothinclientmanagement depends on debootstrap - * x2gothinclientmanagement recommends chroot server packages (NFSd, + * x2gothinclientmanagement recommends chroot server packages (NFSd, TFTPd, DHCPd) * moves x2gothinclient_settings to /etc/x2go * adds man pages @@ -595,7 +595,7 @@ x2gothinclient (1.0.1-2) unstable; urgency=low * changed: in /etc/init.d/ramdrive group users instead staff [Mike Gabriel] - * the name of this package has changed with 1.0.1.2 so this log entry's package name + * the name of this package has changed with 1.0.1.2 so this log entry's package name had to be manipulated... -- Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Mon, 08 Dec 2008 15:28:29 +0100 diff --git a/debian/x2gothinclient-minidesktop.preinst b/debian/x2gothinclient-minidesktop.preinst index 8b855eb..5bfb315 100755 --- a/debian/x2gothinclient-minidesktop.preinst +++ b/debian/x2gothinclient-minidesktop.preinst @@ -20,7 +20,7 @@ set -e case "$1" in install|upgrade) if ! dpkg-divert --list | grep x2goclient.desktop.disabled-by-x2gotce 1>/dev/null 2>/dev/null; then - dpkg-divert --add --rename --package x2gothinclient-minidesktop --divert /usr/share/applications/x2goclient.desktop.disabled-by-x2gotce /usr/share/applications/x2goclient.desktop + dpkg-divert --add --rename --package x2gothinclient-minidesktop --divert /usr/share/applications/x2goclient.desktop.disabled-by-x2gotce /usr/share/applications/x2goclient.desktop fi mkdir -p /usr/lib/x2go/ if ! dpkg-divert --list | grep usr/lib/x2go/x2goclient 1>/dev/null 2>/dev/null; then diff --git a/debian/x2gothinclient.preinst b/debian/x2gothinclient.preinst index b8ad870..83bdad5 100755 --- a/debian/x2gothinclient.preinst +++ b/debian/x2gothinclient.preinst @@ -20,12 +20,12 @@ set -e case "$1" in install|upgrade) - if getent passwd x2goclient >/dev/null; then + if getent passwd x2goclient >/dev/null; then echo "The manually created user account ,,x2goclient'' is no longer used by" echo "the X2Go thin client environment and can be removed from the thin client" echo "chroot." fi - if getent group x2goclient >/dev/null; then + if getent group x2goclient >/dev/null; then echo "The manually created group ,,x2goclient'' is no longer used by the X2Go thin" echo "client environment and can be removed from the thin client chroot." fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit a3eadfffd6c78aa32096d6bc8911341312af0e7c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 08:25:50 2019 +0100 debian/control: Add Rules-Requires-Root: field and set it to "no". --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 90e2102..a9d9e20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium * debian/control: + Prefer lightdm over nodm for the minidesktop variant. With lightdm the minidesktop is set-up out of the box. + + Add Rules-Requires-Root: field and set it to "no". -- X2Go Release Manager <git-admin@x2go.org> Sun, 02 Dec 2018 06:49:42 +0100 diff --git a/debian/control b/debian/control index a5b7239..f1be18d 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: qtbase5-dev, po-debconf, Standards-Version: 3.9.5 +Rules-Requires-Root: no Homepage: https://code.x2go.org/releases/source/x2gothinclient Vcs-Git: git://code.x2go.org/x2gothinclient.git Vcs-Browser: https://code.x2go.org/gitweb?p=x2gothinclient.git;a=summary -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit da350c91c5c2e2d9f60c6fb853386de052485c85 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 08:18:38 2019 +0100 minidesktop/ltsp/: Make x2gothinclient-minidesktop work on top of latest LTSP (tested with 19.11). --- debian/x2gothinclient-minidesktop.install | 1 + ...ent-minidesktop_disable-ltsp-display-manager.sh | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/debian/x2gothinclient-minidesktop.install b/debian/x2gothinclient-minidesktop.install index 59c253b..27b6033 100644 --- a/debian/x2gothinclient-minidesktop.install +++ b/debian/x2gothinclient-minidesktop.install @@ -6,3 +6,4 @@ minidesktop/etc/restart.lightdm etc/lightdm/ minidesktop/desktop/x2gothinclient-*.desktop usr/share/applications/ minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/ minidesktop/mate-panel-layout/* usr/share/mate-panel/layouts/ +minidesktop/ltsp/* usr/share/ltsp/ diff --git a/minidesktop/ltsp/client/init/60-x2gothinclient-minidesktop_disable-ltsp-display-manager.sh b/minidesktop/ltsp/client/init/60-x2gothinclient-minidesktop_disable-ltsp-display-manager.sh new file mode 100644 index 0000000..df1c8b9 --- /dev/null +++ b/minidesktop/ltsp/client/init/60-x2gothinclient-minidesktop_disable-ltsp-display-manager.sh @@ -0,0 +1,31 @@ +# Copyright (C) 2007-2018 X2Go Project - https://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +# This file is not part of LTSP, https://ltsp.github.io, but extends it + +# On X2Go Mini Desktop Thin Clients, the display manager (LightDM) gets +# configured via the x2gothinclient-minidesktop package and does not require +# tweaking by LTSP. +# In fact, the LTSP display manager tweaks break the way the X2Go TCE adapts +# the LightDM configuration. So let's disable the display_manager_main() +# function of LTSP, entirely. + +display_manager_main() { + return 0 +} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 2fd113262f9a6c72ef52e4fdfba40e480961b416 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 08:34:41 2019 +0100 debian/control: Don't use first person plural pronoun in LONG_DESCRIPTION. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9ea705f..d36da13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,7 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium the minidesktop is set-up out of the box. + Add Rules-Requires-Root: field and set it to "no". + Bump Standards-Version: to 4.4.1. No changes needed. + + Don't use first person plural pronoun in LONG_DESCRIPTION. -- X2Go Release Manager <git-admin@x2go.org> Sun, 02 Dec 2018 06:49:42 +0100 diff --git a/debian/control b/debian/control index dab1b03..8cab1dc 100644 --- a/debian/control +++ b/debian/control @@ -48,7 +48,7 @@ Description: Management tools for X2Go Thin Client chroot server IMPORTANT: Install this package on the chroot server that provides X2Go Thin Client images over PXE/Etherboot. . - For chroot servers we recommend a very separate machine (not + For chroot servers it is recommended to use a very separate machine (not your main server on your network) that only serves this purpose. Package: x2gothinclientmanagement -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 0801a2ced3c5356aeb1ec9eb9b508640a11e9871 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 09:01:38 2019 +0100 Provide systemd service files for x2gothinclient-cdmanager and x2gothinclient-displaymanager. --- cdmanager/init/x2gothinclient-cdmanager.service | 12 ++++++++++++ debian/changelog | 4 ++++ debian/x2gothinclient-cdmanager.service | 1 + debian/x2gothinclient-displaymanager.service | 1 + displaymanager/init/x2gothinclient-displaymanager.service | 12 ++++++++++++ 5 files changed, 30 insertions(+) diff --git a/cdmanager/init/x2gothinclient-cdmanager.service b/cdmanager/init/x2gothinclient-cdmanager.service new file mode 100644 index 0000000..f702dc1 --- /dev/null +++ b/cdmanager/init/x2gothinclient-cdmanager.service @@ -0,0 +1,12 @@ +[Unit] +Description=X2Go TCE CD/DVD Manager Daemon +Documentation=man:x2gocdmanager(8) + +[Service] +Type=forking +ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/x2gothinclientd" ]' +ExecStart=/usr/sbin/x2gocdmanager +PIDFile=/run/x2gothinclient-cdmanager.pid + +[Install] +WantedBy=multi-user.target diff --git a/debian/changelog b/debian/changelog index f6e407b..d35c0b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium desktop link. - minidesktop/init/: Drop init script for mini desktop variant. Always been a no-op script. + - Provide systemd service files for x2gothinclient-cdmanager and + x2gothinclient-displaymanager. * debian/rules: + Convert to pure debhelper rules file. + Remove Qt5 build cruft from cdmanager/powerej/. @@ -49,6 +51,8 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium + Drop all transitional packages. * debian/x2gothinclient-minidesktop.init: + Drop init script, never had functionality. + * debian/x2gothinclient-*.serivce: + + Symlink to upstream files. -- X2Go Release Manager <git-admin@x2go.org> Sun, 02 Dec 2018 06:49:42 +0100 diff --git a/debian/x2gothinclient-cdmanager.service b/debian/x2gothinclient-cdmanager.service new file mode 120000 index 0000000..1f21e09 --- /dev/null +++ b/debian/x2gothinclient-cdmanager.service @@ -0,0 +1 @@ +../cdmanager/init/x2gothinclient-cdmanager.service \ No newline at end of file diff --git a/debian/x2gothinclient-displaymanager.service b/debian/x2gothinclient-displaymanager.service new file mode 120000 index 0000000..bc1be59 --- /dev/null +++ b/debian/x2gothinclient-displaymanager.service @@ -0,0 +1 @@ +../displaymanager/init/x2gothinclient-displaymanager.service \ No newline at end of file diff --git a/displaymanager/init/x2gothinclient-displaymanager.service b/displaymanager/init/x2gothinclient-displaymanager.service new file mode 100644 index 0000000..d428d0c --- /dev/null +++ b/displaymanager/init/x2gothinclient-displaymanager.service @@ -0,0 +1,12 @@ +[Unit] +Description=X2Go TCE Display Manager +Documentation=man:x2gothinclientd(8) + +[Service] +Type=forking +ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/x2gothinclientd" ]' +ExecStart=/usr/sbin/x2gothinclientd +PIDFile=/run/x2gothinclient.pid + +[Install] +WantedBy=multi-user.target -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit f5b2da2bb1789210bb084878d1eb53fe71b96773 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 09:05:28 2019 +0100 init scripts: Use /run rather than /var/run for placing PID files. --- cdmanager/init/x2gothinclient-cdmanager.init | 8 ++++---- debian/changelog | 1 + displaymanager/init/x2gothinclient-displaymanager.init | 12 ++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cdmanager/init/x2gothinclient-cdmanager.init b/cdmanager/init/x2gothinclient-cdmanager.init index 7ef81bf..e812f5e 100644 --- a/cdmanager/init/x2gothinclient-cdmanager.init +++ b/cdmanager/init/x2gothinclient-cdmanager.init @@ -52,22 +52,22 @@ case "$1" in # only start the X2Go CD Manager if x2gothinclientd is configured as the default display manager if [ -e /etc/X11/default-display-manager ] && [ "$(cat /etc/X11/default-display-manager)" = "/usr/sbin/x2gothinclientd" ]; then log_daemon_msg "Starting $DESC" "x2gocdmanager" - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS + start-stop-daemon --start --quiet --pidfile /run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS log_end_msg $? fi ;; stop) log_daemon_msg "Stopping $DESC" "x2gocdmanager" - start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid || true + start-stop-daemon --oknodo --stop --quiet --pidfile /run/$NAME.pid || true log_end_msg $? ;; status) log_daemon_msg "Status of $DESC" "x2gocdmanager" - start-stop-daemon --oknodo --status --quiet --pidfile /var/run/$NAME.pid || true + start-stop-daemon --oknodo --status --quiet --pidfile /run/$NAME.pid || true log_end_msg $? ;; force-reload) - start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0 + start-stop-daemon --stop --test --quiet --pidfile /run/$NAME.pid && $0 restart || exit 0 ;; restart) log_daemon_msg "Restarting $DESC" "x2gocdmanager" diff --git a/debian/changelog b/debian/changelog index d35c0b0..a9f05c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium a no-op script. - Provide systemd service files for x2gothinclient-cdmanager and x2gothinclient-displaymanager. + - init scripts: Use /run rather than /var/run for placing PID files. * debian/rules: + Convert to pure debhelper rules file. + Remove Qt5 build cruft from cdmanager/powerej/. diff --git a/displaymanager/init/x2gothinclient-displaymanager.init b/displaymanager/init/x2gothinclient-displaymanager.init index 822d6c9..0e3c54f 100644 --- a/displaymanager/init/x2gothinclient-displaymanager.init +++ b/displaymanager/init/x2gothinclient-displaymanager.init @@ -68,27 +68,27 @@ case "$1" in log_action_msg "Not starting X2Go Client in TCE mode; it is not configured as default display manager" else log_daemon_msg "Starting $DESC" "x2gothinclientd" - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS + start-stop-daemon --start --quiet --pidfile /run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS log_end_msg $? fi ;; status) - if [ -e /var/run/$NAME.pid ]; then + if [ -e /run/$NAME.pid ]; then log_daemon_msg "Status of $DESC" "x2gothinclientd" - start-stop-daemon --oknodo --status --quiet --pidfile /var/run/$NAME.pid + start-stop-daemon --oknodo --status --quiet --pidfile /run/$NAME.pid log_end_msg $? fi ;; stop) - if [ -e /var/run/$NAME.pid ]; then + if [ -e /run/$NAME.pid ]; then log_daemon_msg "Stopping $DESC" "x2gothinclientd" - start-stop-daemon --oknodo --stop --quiet --retry 10 --pidfile /var/run/$NAME.pid + start-stop-daemon --oknodo --stop --quiet --retry 10 --pidfile /run/$NAME.pid log_end_msg $? fi ;; force-reload) # check wether $DAEMON is running. If so, restart - start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0 + start-stop-daemon --stop --test --quiet --pidfile /run/$NAME.pid && $0 restart || exit 0 ;; restart) $0 stop -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit f2b222de6627936286df4ad70282460e4137140a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 08:50:25 2019 +0100 debian/x2gothinclient-minidesktop.init: Drop init script, never had functionality. --- debian/changelog | 4 +++ debian/control | 1 - debian/x2gothinclient-minidesktop.init | 1 - minidesktop/init/x2gothinclient-minidesktop.init | 32 ------------------------ 4 files changed, 4 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index 78da435..f6e407b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium - management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home: Make X2Go Client desktop link executable, so that it becomes a real desktop link. + - minidesktop/init/: Drop init script for mini desktop variant. Always been + a no-op script. * debian/rules: + Convert to pure debhelper rules file. + Remove Qt5 build cruft from cdmanager/powerej/. @@ -45,6 +47,8 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium + Add D (any bin:pkg reported by lintian): lsb-base. * debian/{control,x2gothinclient.<scripts>}: + Drop all transitional packages. + * debian/x2gothinclient-minidesktop.init: + + Drop init script, never had functionality. -- X2Go Release Manager <git-admin@x2go.org> Sun, 02 Dec 2018 06:49:42 +0100 diff --git a/debian/control b/debian/control index 36bb66a..3ee2402 100644 --- a/debian/control +++ b/debian/control @@ -110,7 +110,6 @@ Package: x2gothinclient-minidesktop Architecture: all Depends: ${misc:Depends}, - lsb-base, mate-desktop-environment-core, mate-icon-theme, mate-themes, diff --git a/debian/x2gothinclient-minidesktop.init b/debian/x2gothinclient-minidesktop.init deleted file mode 120000 index bccd54b..0000000 --- a/debian/x2gothinclient-minidesktop.init +++ /dev/null @@ -1 +0,0 @@ -../minidesktop/init/x2gothinclient-minidesktop.init \ No newline at end of file diff --git a/minidesktop/init/x2gothinclient-minidesktop.init b/minidesktop/init/x2gothinclient-minidesktop.init deleted file mode 100644 index a485775..0000000 --- a/minidesktop/init/x2gothinclient-minidesktop.init +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: x2gothinclient-minidesktop -# Required-Start: $local_fs -# Required-Stop: -# Default-Start: S -# Default-Stop: -# X-Start-Before: nfs-common alsa-utils -# Short-Description: -# Description: Prepare X2Go TCE MATE Desktop for usage -### END INIT INFO - -set -e - -. /lib/lsb/init-functions - -case "$1" in - start|"") - exit 0 - ;; - restart|reload|force-reload|status) - echo "Error: argument '$1' not supported" >&2 - exit 3 - ;; - stop) - # No-op - ;; - *) - echo "Usage: x2gothinclient-minidesktop start" >&2 - exit 3 - ;; -esac -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit dae7e28946841691d31a93b9a688fd83d7653a30 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 08:44:51 2019 +0100 debian/{control,x2gothinclient.<scripts>}: Drop all transitional packages. --- debian/changelog | 2 + debian/control | 94 ------------------------------------------ debian/x2gothinclient.postinst | 38 ----------------- debian/x2gothinclient.preinst | 48 --------------------- 4 files changed, 2 insertions(+), 180 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0d76de..78da435 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,8 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium + Bump Standards-Version: to 4.4.1. No changes needed. + Don't use first person plural pronoun in LONG_DESCRIPTION. + Add D (any bin:pkg reported by lintian): lsb-base. + * debian/{control,x2gothinclient.<scripts>}: + + Drop all transitional packages. -- X2Go Release Manager <git-admin@x2go.org> Sun, 02 Dec 2018 06:49:42 +0100 diff --git a/debian/control b/debian/control index 9e368cf..36bb66a 100644 --- a/debian/control +++ b/debian/control @@ -51,25 +51,6 @@ Description: Management tools for X2Go Thin Client chroot server For chroot servers it is recommended to use a very separate machine (not your main server on your network) that only serves this purpose. -Package: x2gothinclientmanagement -Architecture: all -Depends: - ${misc:Depends}, - x2gothinclient-management (>= ${source:Version}), -Description: temporary dependency package for migration to x2gothinclient-management - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - session broker support - - client-side mass storage mounting support - - client-side printing support - - audio support - - authentication by smartcard and USB stick - . - x2gothinclientmanagement: - --------------- - This package is a temporary migration package and will be deprecated soon. - Package: x2gothinclient-chroot Architecture: all Depends: @@ -240,25 +221,6 @@ Description: login daemon starting x2goclient in displaymanager mode . X2Go Client in thin-client-mode will behave like xdm, kdm or gdm. -Package: x2gothinclient -Architecture: all -Depends: - ${misc:Depends}, - x2gothinclient-displaymanager (>= ${source:Version}), -Description: temporary dependency package for migration to x2gothinclient-displaymanager - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - session broker support - - client-side mass storage mounting support - - client-side printing support - - audio support - - authentication by smartcard and USB stick - . - x2gothinclient: - --------------- - This package is a temporary migration package and will be deprecated soon. - Package: x2gothinclient-usbmount Architecture: all Depends: @@ -288,25 +250,6 @@ Description: clientside usb mass-storage device mounting This package adds client-side USB mass storage device mounting using UDEV rules to your X2Go Thin Client. -Package: x2gousbmount -Architecture: all -Depends: - ${misc:Depends}, - x2gothinclient-usbmount (>= ${source:Version}), -Description: temporary dependency package for migration to x2gothinclient-usbmount - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - session broker support - - client-side mass storage mounting support - - client-side printing support - - audio support - - authentication by smartcard and USB stick - . - x2gousbmount: - --------------- - This package is a temporary migration package and will be deprecated soon. - Package: x2gothinclient-cdmanager Architecture: any Depends: @@ -338,25 +281,6 @@ Description: clientside daemon enabling automatic CD-Rom mounting This package adds a client-side daemon to your X2Go Thin Client that enables automatic CD-ROM mounting within Thin Client X2Go sessions. -Package: x2gocdmanager -Architecture: all -Depends: - ${misc:Depends}, - x2gothinclient-cdmanager (>= ${source:Version}), -Description: temporary dependency package for migration to x2gothinclient-cdmanager - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - session broker support - - client-side mass storage mounting support - - client-side printing support - - audio support - - authentication by smartcard and USB stick - . - x2gocdmanager: - --------------- - This package is a temporary migration package and will be deprecated soon. - Package: x2gothinclient-smartcardrules Architecture: all Depends: @@ -384,21 +308,3 @@ Description: UDEV rules for smartcard readers This package provides UDEV rules for smartcard readers (devices that serve the purpose of ID-card based authentication). -Package: x2gosmartcardrules -Architecture: all -Depends: - ${misc:Depends}, - x2gothinclient-smartcardrules (>= ${source:Version}), -Description: temporary dependency package for migration to x2gothinclient-smartcardrules - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - session broker support - - client-side mass storage mounting support - - client-side printing support - - audio support - - authentication by smartcard and USB stick - . - x2gosmartcardrules: - --------------- - This package is a temporary migration package and will be deprecated soon. diff --git a/debian/x2gothinclient.postinst b/debian/x2gothinclient.postinst deleted file mode 100755 index f562a77..0000000 --- a/debian/x2gothinclient.postinst +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# prerm script for x2gothinclient -# -# see: dh_installdeb(1) - -set -e - -# source debconf's configuration module -. /usr/share/debconf/confmodule - -# summary of how this script can be called: -# * <prerm> `remove' -# * <old-prerm> `upgrade' <new-version> -# * <new-prerm> `failed-upgrade' <old-version> -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> -# * <deconfigured's-prerm> `deconfigure' `in-favour' -# <package-being-installed> <version> `removing' -# <conflicting-package> <version> -# for details, see https://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -THIS_PACKAGE=x2gothinclient -DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - -if [ "$1" = "configure" ]; then - - # disown this question - db_unregister shared/default-x-display-manager || true - -fi - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/x2gothinclient.preinst b/debian/x2gothinclient.preinst deleted file mode 100755 index 83bdad5..0000000 --- a/debian/x2gothinclient.preinst +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# preinst script for x2gothinclient-daemon -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <postinst> `abort-remove' -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see https://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - if getent passwd x2goclient >/dev/null; then - echo "The manually created user account ,,x2goclient'' is no longer used by" - echo "the X2Go thin client environment and can be removed from the thin client" - echo "chroot." - fi - if getent group x2goclient >/dev/null; then - echo "The manually created group ,,x2goclient'' is no longer used by the X2Go thin" - echo "client environment and can be removed from the thin client chroot." - fi - ;; - abort-upgrade) - ;; - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 9aeabd9c160bbdf41e8953de08b99a0b2375830f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 08:31:27 2019 +0100 debian/control: Bump Standards-Version: to 4.4.1. No changes needed. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a9d9e20..9ea705f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,7 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium + Prefer lightdm over nodm for the minidesktop variant. With lightdm the minidesktop is set-up out of the box. + Add Rules-Requires-Root: field and set it to "no". + + Bump Standards-Version: to 4.4.1. No changes needed. -- X2Go Release Manager <git-admin@x2go.org> Sun, 02 Dec 2018 06:49:42 +0100 diff --git a/debian/control b/debian/control index f1be18d..dab1b03 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9~), qtbase5-dev, po-debconf, -Standards-Version: 3.9.5 +Standards-Version: 4.4.1 Rules-Requires-Root: no Homepage: https://code.x2go.org/releases/source/x2gothinclient Vcs-Git: git://code.x2go.org/x2gothinclient.git -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 2d3cec5bdfce8772adbdb9be0521e2a7ab5c6d3c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 08:41:26 2019 +0100 debian/control: Add D (any bin:pkg reported by lintian): lsb-base. --- debian/changelog | 1 + debian/control | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index d36da13..d0d76de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,7 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium + Add Rules-Requires-Root: field and set it to "no". + Bump Standards-Version: to 4.4.1. No changes needed. + Don't use first person plural pronoun in LONG_DESCRIPTION. + + Add D (any bin:pkg reported by lintian): lsb-base. -- X2Go Release Manager <git-admin@x2go.org> Sun, 02 Dec 2018 06:49:42 +0100 diff --git a/debian/control b/debian/control index 8cab1dc..9e368cf 100644 --- a/debian/control +++ b/debian/control @@ -74,6 +74,7 @@ Package: x2gothinclient-chroot Architecture: all Depends: ${misc:Depends}, + lsb-base, nfs-common, patch, plymouth, @@ -128,6 +129,7 @@ Package: x2gothinclient-minidesktop Architecture: all Depends: ${misc:Depends}, + lsb-base, mate-desktop-environment-core, mate-icon-theme, mate-themes, @@ -196,6 +198,7 @@ Package: x2gothinclient-displaymanager Architecture: all Depends: ${misc:Depends}, + lsb-base, psmisc, pinentry-x2go, xauth, @@ -309,6 +312,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + lsb-base, lsscsi, eject, libfile-path-expand-perl, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org