This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit ccb2e67b026add35cc71a211c0c066b63bb35b7e Author: X2Go Release Manager <git-admin@x2go.org> Date: Wed Nov 15 22:04:17 2017 +0100 Continue development --- VERSION.x2godesktopsharing | 2 +- debian/changelog | 6 ++++++ man/man1/x2godesktopsharing.1 | 2 +- man/man8/x2goresume-desktopsharing.8 | 2 +- man/man8/x2gosuspend-desktopsharing.8 | 2 +- man/man8/x2goterminate-desktopsharing.8 | 2 +- sharetray.cpp | 2 +- x2godesktopsharing.spec | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing index 8e9972b..82e63a5 100644 --- a/VERSION.x2godesktopsharing +++ b/VERSION.x2godesktopsharing @@ -1 +1 @@ -3.1.1.4 +3.1.1.5 diff --git a/debian/changelog b/debian/changelog index b43b24b..9e07e77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium + + * Continue development + + -- X2Go Release Manager <git-admin@x2go.org> Wed, 15 Nov 2017 22:00:53 +0100 + x2godesktopsharing (3.1.1.4-0x2go1) unstable; urgency=medium [ Mihai Moldovan ] diff --git a/man/man1/x2godesktopsharing.1 b/man/man1/x2godesktopsharing.1 index a81cc6e..4309387 100644 --- a/man/man1/x2godesktopsharing.1 +++ b/man/man1/x2godesktopsharing.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godesktopsharing 1 "Jun 2016" "Version 3.1.1.4" "X2Go Application" +.TH x2godesktopsharing 1 "Nov 2017" "Version 3.1.1.5" "X2Go Application" .SH NAME x2godesktopsharing \- Share an X2Go desktop with other clients and users. .SH SYNOPSIS diff --git a/man/man8/x2goresume-desktopsharing.8 b/man/man8/x2goresume-desktopsharing.8 index c4a6088..328b463 100644 --- a/man/man8/x2goresume-desktopsharing.8 +++ b/man/man8/x2goresume-desktopsharing.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goresume\-desktopsharing 8 "Jun 2016" "Version 3.1.1.4" "X2Go Server Script" +.TH x2goresume\-desktopsharing 8 "Nov 2017" "Version 3.1.1.5" "X2Go Server Script" .SH NAME x2goresume\-desktopsharing \- Resume Desktop Sharing Applet for a given X2Go Session .SH SYNOPSIS diff --git a/man/man8/x2gosuspend-desktopsharing.8 b/man/man8/x2gosuspend-desktopsharing.8 index 937282c..446f26b 100644 --- a/man/man8/x2gosuspend-desktopsharing.8 +++ b/man/man8/x2gosuspend-desktopsharing.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-desktopsharing 8 "Jun 2016" "Version 3.1.1.4" "X2Go Server Script" +.TH x2gosuspend-desktopsharing 8 "Nov 2017" "Version 3.1.1.5" "X2Go Server Script" .SH NAME x2gosuspend-desktopsharing \- Suspend Desktop Sharing for a given X2Go Session .SH SYNOPSIS diff --git a/man/man8/x2goterminate-desktopsharing.8 b/man/man8/x2goterminate-desktopsharing.8 index 01a4a00..5475884 100644 --- a/man/man8/x2goterminate-desktopsharing.8 +++ b/man/man8/x2goterminate-desktopsharing.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate\-desktopsharing 8 "Jun 2016" "Version 3.1.1.4" "X2Go Server Tool" +.TH x2goterminate\-desktopsharing 8 "Nov 2017" "Version 3.1.1.5" "X2Go Server Tool" .SH NAME x2goterminate\-desktopsharing \- Cleanly Terminate Desktop Sharing for a given X2Go Session .SH SYNOPSIS diff --git a/sharetray.cpp b/sharetray.cpp index eae678a..722d306 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -37,7 +37,7 @@ #include <stdint.h> #define STAT_ACT_COUNT 10 -#define VERSION "3.1.1.4" +#define VERSION "3.1.1.5" //needed to not get an undefined reference to static members int ShareTray::sigkeybintFd[2]; diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 51b0ed8..b6a0149 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,5 +1,5 @@ Name: x2godesktopsharing -Version: 3.1.1.4 +Version: 3.1.1.5 Release: 0.0x2go1%{?dist} Summary: Share X11 desktops with other users via X2Go -- Alioth's /srv/git/code.x2go.org/x2godesktopsharing.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git