This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 111b349 be more precise with error message for unset X2GO_CLIENT env var new 120320c Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2). The 1 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: debian/changelog | 1 + debian/control | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 120320cab180350d442196c8b80f2b8fe2268399 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Nov 18 08:08:53 2014 +0100 Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2). Conflicts (resolved by Mike Gabriel): debian/control --- debian/changelog | 1 + debian/control | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f5e4f19..2b76639 100644 --- a/debian/changelog +++ b/debian/changelog @@ -192,6 +192,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium server-side log output. * debian/control: + Add D (x2goserver): libfile-which-perl. + + Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2). * debian/x2goserver.docs: + Install README.i18n file into bin:package x2goserver. * x2goserver.spec: diff --git a/debian/control b/debian/control index 09f1b9d..42d6853 100644 --- a/debian/control +++ b/debian/control @@ -62,7 +62,9 @@ Replaces: x2goserver-home, x2goserver-compat, x2goserver-pyhoca, -Description: X2Go server +Conflicts: + x2godesktopsharing (<< 3.1.1.2), +Description: X2Go server daemon scripts X2Go is a server based computing environment with - session resuming - low bandwidth support -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git