This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 81f979dc5aa1f1cb6219ef04404f03b962c27d47 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 24 10:43:18 2014 +0100 Provide symlink x2gobroker-daemon. --- Makefile | 2 ++ bin/x2gobroker-daemon | 1 + debian/changelog | 1 + debian/x2gobroker-daemon.install | 2 +- debian/x2gobroker-daemon.links | 1 + init/x2gobroker-daemon.init | 2 +- rpm/x2gobroker-daemon.init | 2 +- sbin/x2gobroker-daemon-debug | 2 +- x2gobroker.spec | 1 + 9 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b37f44b..0d90bf3 100755 --- a/Makefile +++ b/Makefile @@ -119,6 +119,8 @@ install: "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} man/man8/x2gobroker-daemon-debug.8* \ "${DESTDIR}${MANDIR}/man8" + ${INSTALL_PROGRAM} bin/x2gobroker-daemon \ + "${DESTDIR}${BINDIR}/" ${INSTALL_PROGRAM} sbin/x2gobroker-daemon-debug \ "${DESTDIR}${SBINDIR}/" diff --git a/bin/x2gobroker-daemon b/bin/x2gobroker-daemon new file mode 120000 index 0000000..cd340c3 --- /dev/null +++ b/bin/x2gobroker-daemon @@ -0,0 +1 @@ +x2gobroker \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 97cd1b2..0d77ec2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Provide configuration alternative to having /etc/defaults/* scripts parsed in by init scripts. Make X2Go Session Broker ready for being run via systemd. + - Provide symlink x2gobroker-daemon. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/debian/x2gobroker-daemon.install b/debian/x2gobroker-daemon.install index 63b3e6f..ae2a660 100644 --- a/debian/x2gobroker-daemon.install +++ b/debian/x2gobroker-daemon.install @@ -1,2 +1,2 @@ logrotate/x2gobroker-daemon etc/logrotate.d/ -sbin/x2gobroker-daemon-debug usr/sbin/ \ No newline at end of file +sbin/x2gobroker-daemon-debug usr/sbin/ diff --git a/debian/x2gobroker-daemon.links b/debian/x2gobroker-daemon.links new file mode 100644 index 0000000..feb753c --- /dev/null +++ b/debian/x2gobroker-daemon.links @@ -0,0 +1 @@ +usr/bin/x2gobroker usr/bin/x2gobroker-daemon diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index e895793..b00c638 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -18,7 +18,7 @@ set -eu -DAEMON=/usr/bin/x2gobroker +DAEMON=/usr/bin/x2gobroker-daemon test -d /run && RUNDIR=/run || RUNDIR=/var/run PIDFILE_BROKER=$RUNDIR/x2gobroker/x2gobroker-daemon.pid DEFAULTCONFIG_COMMON=/etc/default/python-x2gobroker diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init index 3c2f33e..39c75e0 100755 --- a/rpm/x2gobroker-daemon.init +++ b/rpm/x2gobroker-daemon.init @@ -20,7 +20,7 @@ set -e -DAEMON=/usr/bin/x2gobroker +DAEMON=/usr/bin/x2gobroker-daemon test -d /run && RUNDIR=/run || RUNDIR=/var/run PIDFILE_BROKER=$RUNDIR/x2gobroker/x2gobroker-daemon.pid DEFAULTCONFIG_COMMON=/etc/default/python-x2gobroker diff --git a/sbin/x2gobroker-daemon-debug b/sbin/x2gobroker-daemon-debug index 88d19d2..af117ad 100755 --- a/sbin/x2gobroker-daemon-debug +++ b/sbin/x2gobroker-daemon-debug @@ -36,4 +36,4 @@ fi export X2GOBROKER_DEBUG=true -su - x2gobroker -c "x2gobroker -M http -i $@" +su - x2gobroker -c "x2gobroker-daemon -M http -i $@" diff --git a/x2gobroker.spec b/x2gobroker.spec index 2a032ad..c1e2ec8 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -381,6 +381,7 @@ fi; %files daemon %defattr(-,root,root) +%_bindir/x2gobroker-daemon %_initddir/x2gobroker-daemon %config %_sysconfdir/default/x2gobroker-daemon %_sbindir/x2gobroker-daemon-debug -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git