The branch, master has been updated via 8438c1ec5b2b021ad535ac1d493279d9e5a983e8 (commit) from 2a2d081e6f4e7c1acb6258e59cb01b2fd20b2607 (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 8438c1ec5b2b021ad535ac1d493279d9e5a983e8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Dec 16 12:39:59 2013 +0100 changelog update Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c0d5f2d..6bdb2ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -91,15 +91,13 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low - Clean up Makefiles, remove commented out line. - Use xkb ruleset 'base' rather than xfree86 as on RHEL systems the xfree86 symlink to base rulset does not exist. - * Grab systemd service file from Fedora and ship it upstream. - * Add init script for RPM based distro. Taken from the Fedora - package. + - Grab systemd service file from Fedora and ship it upstream. * x2goserver.spec: + Ship x2goserver.spec (RPM package definitions) in upstream project. - (Thanks to the Fedora package maintainers). File differs from the - Fedora file already. + (Thanks to the Fedora package maintainers). + + Add init script for RPM based distro. Taken from the Fedora + package. + Clear (Fedora package) changelog. - + Use same init script name as on Debian (x2goserver.init, x2goserver.service). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 28 Nov 2013 16:16:22 +0100 hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).