The branch, master has been updated via 37e3cdf2cf596f7956a0da19979c29c086d3753e (commit) via f951027eb109ef40124555e0ed70053d863945e7 (commit) from 4eca45ff7d4625b038405a5bad7e4d09ff9fe272 (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 37e3cdf2cf596f7956a0da19979c29c086d3753e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 24 13:43:58 2012 +0100 Let x2gothinclient break and replace x2gothinshutdown. commit f951027eb109ef40124555e0ed70053d863945e7 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 24 13:42:38 2012 +0100 Revert "Break and replace x2gothinshutdown via /debian/control file." This reverts commit 4eca45ff7d4625b038405a5bad7e4d09ff9fe272. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 25b8b74..a970260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low - Add background image support. - Add new boot splash background image. - New look'n'feel for boot splash menu. - * Break and replace x2gothinshutdown via /debian/control file. + * Let x2gothinclient break and replace x2gothinshutdown. [ Oleksandr Shneyder ] * New upstream version (1.0.1.6): diff --git a/debian/control b/debian/control index b758394..e1336c4 100644 --- a/debian/control +++ b/debian/control @@ -25,10 +25,6 @@ Recommends: nfs-kernel-server Suggests: dhcp3-server | dnsmasq | isc-dhcp-server -Breaks: - x2gothinshutdown -Replaces: - x2gothinshutdown Description: Management tools for X2Go thin client chroot server X2Go is a server based computing environment with - session resuming @@ -66,6 +62,10 @@ Recommends: mc, acpid, memtest86+ +Breaks: + x2gothinshutdown +Replaces: + x2gothinshutdown Description: login daemon starting x2goclient in displaymanager mode X2Go is a server based computing environment with - session resuming 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).