This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 92b0566f6e458ab0933bcefcc4c807b58ac5fcf4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 23 22:03:17 2018 +0100 Allow co-installation of displaymanager and minidesktop bin:pkgs. They have no conflicting files and we should rather make the startup mode configurable through debconf. --- debian/changelog | 3 +++ debian/control | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2de0e8a..4eca880 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,6 +88,9 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low + Add R (x2gothinclient-chroot): ntp. + Move to Pre-D (x2gothinclient-minidesktop): x2goclient, lightdm. Make sure those packages are installed already avoiding dpkg-divert failures. + + Allow co-installation of displaymanager and minidesktop bin:pkgs. They + have no conflicting files and we should rather make the startup mode + configurable through debconf. * debian/copyright: + Use copyright-format 1.0. diff --git a/debian/control b/debian/control index 05d7f43..17bd41a 100644 --- a/debian/control +++ b/debian/control @@ -149,7 +149,6 @@ Breaks: Replaces: x2gothinclient-minidesktop-mate, Conflicts: - x2gothinclient-displaymanager, x2gothinclient, Description: Minimal desktop for X2Go Thin Client chroot (based on MATE) X2Go is a server based computing environment with @@ -213,8 +212,6 @@ Breaks: Replaces: x2gothinshutdown, x2gothinclient (<< 1.5.0.0), -Conflicts: - x2gothinclient-minidesktop, Description: login daemon starting x2goclient in displaymanager mode X2Go is a server based computing environment with - session resuming -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git