The branch, master has been updated via c36057b91449a2d743b7dd1730eb145cae3a8aec (commit) from a3a5076d545cd7144af4417accc1fa2f4b97d849 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c36057b91449a2d743b7dd1730eb145cae3a8aec Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 28 12:11:34 2013 +0100 Move init scripts from debian/ folder into upstream folders. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gocdmanager.init | 82 +--------------- debian/x2gothinclient.init | 102 +------------------- {debian => x2gocdmanager/init}/x2gocdmanager.init | 0 .../init}/x2gothinclient.init | 0 5 files changed, 3 insertions(+), 182 deletions(-) mode change 100644 => 120000 debian/x2gocdmanager.init mode change 100644 => 120000 debian/x2gothinclient.init copy {debian => x2gocdmanager/init}/x2gocdmanager.init (100%) copy {debian => x2gothinclient/init}/x2gothinclient.init (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4120407..25a8595 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low TCE chroot. - Deactivate serial line terminals on X2Go thinclients. - Install TCE dependencies via meta-package x2gothinclient-chroot. + - Move init scripts from debian/ folder into upstream folders. * debian/control: + New bin:package x2gothinclient-chroot. diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init deleted file mode 100644 index 57bcce2..0000000 --- a/debian/x2gocdmanager.init +++ /dev/null @@ -1,81 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org -# Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> -# Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - -# X2Go 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. -# -# X2Go 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. - -### BEGIN INIT INFO -# Provides: x2gocdmanager -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start and stop the x2go CD/DVD manager daemon -### END INIT INFO - -set -e - -# use system's locale settings for the X2Go Client in TCE mode -if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE -fi - -. /lib/lsb/init-functions - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -export HOSTNAME -DAEMON=/usr/sbin/x2gocdmanager -NAME=x2gocdmanager -DESC=x2gocdmanager - -test -x $DAEMON || exit 0 - -case "$1" in - start) - # 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 - log_end_msg $? - fi - ;; - stop) - log_daemon_msg "Stopping $DESC" "x2gocdmanager" - start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid || true - log_end_msg $? - ;; - force-reload) - start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0 - ;; - restart) - log_daemon_msg "Restarting $DESC" "x2gocdmanager" - $0 stop - sleep 1 - $0 start - log_end_msg $? - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init new file mode 120000 index 0000000..2728572 --- /dev/null +++ b/debian/x2gocdmanager.init @@ -0,0 +1 @@ +../x2gocdmanager/init/x2gocdmanager.init \ No newline at end of file diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init deleted file mode 100644 index 7c2b2e9..0000000 --- a/debian/x2gothinclient.init +++ /dev/null @@ -1,101 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org -# Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> -# Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - -# X2Go 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. -# -# X2Go 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. - -### BEGIN INIT INFO -# Provides: x2gothinclient -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start and stop the x2go thinclient daemon -### END INIT INFO - -set -e - -# use system's locale settings for the X2Go Client in TCE mode -if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE -fi - -. /lib/lsb/init-functions - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -export HOSTNAME -DAEMON=/usr/sbin/x2gothinclientd -NAME=x2gothinclient -DESC="X2Go Thinclient Service" - -test -x $DAEMON || exit 0 -if [ ! -x /etc/x2go/x2gothinclient_init ] || [ ! -x /etc/x2go/x2gothinclient_start ]; then - echo "X2Go Thin Client system will not start as it is not configured, yet." - echo "See http://wiki.x2go.org/doku.php/wiki:advanced:tce:install" - exit 0 -fi - -# pre-init X2Go Thin Client through init script... -test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init - -# To start x2gothinclient even if it is not the default display manager, change -# HEED_DEFAULT_DISPLAY_MANAGER to "false." -HEED_DEFAULT_DISPLAY_MANAGER=${HEED_DEFAULT_DISPLAY_MANAGER:-true} -DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - -case "$1" in - start) - CONFIGURED_DAEMON="$(basename $(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null))" - if grep -wqs text /proc/cmdline; then - log_warning_msg "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline." - elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \ - [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \ - [ "$CONFIGURED_DAEMON" != "x2gothinclientd" ] ; then - 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 - log_end_msg $? - fi - ;; - stop) - if [ -e /var/run/$NAME.pid ]; then - log_daemon_msg "Stopping $DESC" "x2gothinclientd" - start-stop-daemon --oknodo --stop --quiet --retry 10 --pidfile /var/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 - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init new file mode 120000 index 0000000..0161066 --- /dev/null +++ b/debian/x2gothinclient.init @@ -0,0 +1 @@ +../x2gothinclient/init/x2gothinclient.init \ No newline at end of file diff --git a/debian/x2gocdmanager.init b/x2gocdmanager/init/x2gocdmanager.init similarity index 100% copy from debian/x2gocdmanager.init copy to x2gocdmanager/init/x2gocdmanager.init diff --git a/debian/x2gothinclient.init b/x2gothinclient/init/x2gothinclient.init similarity index 100% copy from debian/x2gothinclient.init copy to x2gothinclient/init/x2gothinclient.init hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).