The branch, master has been updated via b55a5018ff3a0ac0e1d4877ccecb3c16955bc019 (commit) from 1ba01e9334189f80f706d9e1eb058d5bdd394ecf (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 b55a5018ff3a0ac0e1d4877ccecb3c16955bc019 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 7 16:37:33 2012 +0100 release 3.1.1.5 Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 51bf05a..cc73b20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,18 +30,18 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200 -x2goserver (3.1.1.5-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.1.5-0~x2go1) unstable; urgency=low [ Stéphane Graber ] * New upstream version (3.1.1.5): - Add a very basic SIGCHLD handler to x2gocleansessions. on SIGCHLD - let the script wait for cleaning up after its children. Closes - upstream issue #38. + let the script wait for cleaning up after its children. (Closes + upstream issue #38). [ Mike Gabriel ] * New upstream version (3.1.1.5): - - Fix x2gogetapps when rendering multi-section .desktop files. Closes - upstream issue #43. + - Fix x2gogetapps when rendering multi-section .desktop files. (Closes + upstream issue #43). - Remove redundant setting of loglevel in x2gogetapps. - Fix ,,Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME.'' from last release. @@ -51,7 +51,7 @@ x2goserver (3.1.1.5-0~x2go1) UNRELEASED; urgency=low * /debian/control: + Depend on libfile-basedir-perl. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 25 Sep 2012 15:03:32 +0200 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 Nov 2012 16:36:36 +0100 x2goserver (3.1.1.4-0~x2go1) unstable; urgency=low 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).