[X2go-Commits] x2godesktopsharing.git - build-main (branch) updated: 3.0.1.4-6-g1b6012e

[X2Go dev team]

The branch, build-main has been updated
       via  1b6012ebd2fb6c6ff4808e2f19a218fc03e94a1c (commit)
       via  ee6f52d447370f2be46e41bb537bfd489e1eb7fb (commit)
       via  b666728f35fd8d037554d64b4460889ff67abebb (commit)
       via  bbc169f3dda395fd3f8f18a00c2d543fcdebccf3 (commit)
       via  6ffe45d50b3dacb1725e90a985e1876a6ed44c16 (commit)
       via  3faf29061e1775e6a0fb5d68fa66e5d804d4e393 (commit)
      from  658b666654a419cf18bd68a3d8b3df54400287c4 (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 1b6012ebd2fb6c6ff4808e2f19a218fc03e94a1c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 5 13:07:34 2012 +0100

    release 3.0.1.5

-----------------------------------------------------------------------

Summary of changes:
 VERSION.x2godesktopsharing |    2 +-
 debian/changelog           |   13 +++++++++++++
 debian/control             |   10 ++++++----
 sharetray.cpp              |    3 ++-
 sharetray.h                |    1 -
 5 files changed, 22 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing
index 9bbc0c1..4913c2b 100644
--- a/VERSION.x2godesktopsharing
+++ b/VERSION.x2godesktopsharing
@@ -1 +1 @@
-3.0.1.4
+3.0.1.5
diff --git a/debian/changelog b/debian/changelog
index 2126ba0..5d5a82e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+x2godesktopsharing (3.0.1.5-0~x2go1) unstable; urgency=low
+
+  [ Milan Knížek ]
+  * New upstream version (3.0.1.5):
+    - Include <sys/unistd.h> in sharetray.cpp, fixes build on Ubuntu 12.10.
+
+  [ Mike Gabriel ]
+  * /debian/control:
+    + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
+    + Priority: optional.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 05 Nov 2012 13:07:17 +0100
+
 x2godesktopsharing (3.0.1.4-0~x2go1) unstable; urgency=low
 
   * New upstream version (3.0.1.4):
diff --git a/debian/control b/debian/control
index e9908a3..0f8fc51 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,10 @@
 Source: x2godesktopsharing
 Section: x11
-Priority: extra
-Maintainer: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-Uploaders: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Priority: optional
+Maintainer: X2Go Developers <x2go-dev at lists.berlios.de>
+Uploaders:
+ Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>,
+ Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
 Build-Depends:
  debhelper (>= 7),
  libqt4-dev
@@ -22,7 +24,7 @@ Recommends:
 Description: share X2go desktops with other users (via shadow sessions)
  X2go is a server based computing environment with
     - session resuming
-    - low bandwith support
+    - low bandwidth support
     - LDAP support
     - client side mass storage mounting support
     - audio support
diff --git a/sharetray.cpp b/sharetray.cpp
index 586a5b5..926a5ed 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -19,6 +19,7 @@
 #include <QMessageBox>
 #include <QSocketNotifier>
 #include <sys/socket.h>
+#include <sys/unistd.h>
 #include "simplelocalsocket.h"
 #include "accessaction.h"
 #include <sys/types.h>
@@ -35,7 +36,7 @@
 #include <QProcess>
 #define STAT_ACT_COUNT 10
 
-#define VERSION "3.0.1.4"
+#define VERSION "3.0.1.5"
 
 //needed to not get an undefined reference to static members
 int ShareTray::sigkeybintFd[2];
diff --git a/sharetray.h b/sharetray.h
index 71c792a..bc4ec19 100644
--- a/sharetray.h
+++ b/sharetray.h
@@ -14,7 +14,6 @@
 #include <QMainWindow>
 #include "ui_dlg.h"
 
-
 class QMenu;
 class QLocalServer;
 class SimpleLocalSocket;


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2Go)

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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).