[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-84-g9abab8a

[X2Go dev team]

The branch, master has been updated
       via  9abab8a1f01f2b0e80faf65f2d26d60706b77c48 (commit)
       via  69a9e309c0311b4e3c3ae5ef9f0ec682eea193b9 (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 9abab8a1f01f2b0e80faf65f2d26d60706b77c48
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 7 16:37:33 2012 +0100

    release 3.1.1.5
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

commit 69a9e309c0311b4e3c3ae5ef9f0ec682eea193b9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 7 16:36:23 2012 +0100

    rebase

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

Summary of changes:
 X2Go/Server.pm   |    1 -
 X2Go/Session.pm  |  123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog |   12 +++---
 3 files changed, 129 insertions(+), 7 deletions(-)
 create mode 100644 X2Go/Session.pm

The diff of changes is:
diff --git a/X2Go/Server.pm b/X2Go/Server.pm
index e63df56..17a07cc 100644
--- a/X2Go/Server.pm
+++ b/X2Go/Server.pm
@@ -35,5 +35,4 @@ X2Go::Server Perl package.
 use strict;
 use base 'Exporter';
 
-
 1;
diff --git a/X2Go/Session.pm b/X2Go/Session.pm
new file mode 100644
index 0000000..d411e19
--- /dev/null
+++ b/X2Go/Session.pm
@@ -0,0 +1,123 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Copyright (C) 2007-2012  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+# Copyright (C) 2007-2012  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+# Copyright (C) 2010-2012  Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+
+package X2Go::Session;
+
+=head1 NAME
+
+X2Go::Session - X2Go Sesssion class for Perl
+
+=head1 DESCRIPTION
+
+X2Go::Session class.
+
+=cut
+
+use strict;
+
+sub new
+{
+	my $class = shift;
+	my $self = {
+		_session_id => shift,
+		_session_cookie => shift,
+		_agent_pid => shift,
+		_client_address => shift,
+		_graphics_port => shift,
+		_sound_port => shift,
+		_sshfs_port => shift,
+	};
+	# TODO: fill session params from database...
+	#if ( X2Go::DB::db_sid_exists() )
+	#{
+	#	<file object properties from DB>
+	#}
+	bless $self, $class;
+	return $self;
+}
+
+sub getSessionId
+{
+	my( $self ) = @_;
+	return $self->{_session_id};
+}
+
+sub getSessionCookie
+{
+	my( $self ) = @_;
+	return $self->{_session_cookie};
+}
+
+sub getAgentPid
+{
+	my( $self ) = @_;
+	return $self->{_agent_pid};
+}
+
+sub getClientAddress
+{
+	my( $self ) = @_;
+	return $self->{_client_address};
+}
+
+sub setGraphicsPort
+{
+	my ( $self, $port ) = @_;
+	$self->{_graphics_port} = $port if defined($port);
+	return $self->{_graphics_port};
+}
+
+sub getGraphicsPort
+{
+	my( $self ) = @_;
+	return $self->{_graphics_port};
+}
+
+sub getSoundPort
+{
+	my( $self ) = @_;
+	return $self->{_sound_port};
+}
+
+sub setSoundPort
+{
+	my ( $self, $port ) = @_;
+	$self->{_sound_port} = $port if defined($port);
+	return $self->{_sound_port};
+}
+
+sub getSSHFSPort
+{
+	my( $self ) = @_;
+	return $self->{_sshfs_port};
+}
+
+sub setSSHFSPort
+{
+	my ( $self, $port ) = @_;
+	$self->{_sshfsport} = $port if defined($port);
+	return $self->{_sshfs_port};
+}
+
+1;
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 at 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 at das-netzwerkteam.de>  Tue, 25 Sep 2012 15:03:32 +0200
+ -- Mike Gabriel <mike.gabriel at 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).