[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-24-g7936b64

X2Go dev team git-admin at x2go.org
Fri Jan 3 20:51:29 CET 2014


The branch, build-baikal has been updated
       via  7936b6458605f3b7ea1bbadedd45fa1179f30ee4 (commit)
      from  ca8d497eb86c55b26e5fc1711aa57047217487b8 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../lib/x2godbwrapper.pm => X2Go/Server/DB.pm      |   16 +++++++++++++---
 debian/changelog                                   |    2 ++
 debian/control                                     |   19 ++++++++++++++++++-
 debian/libx2go-log-perl.install                    |    4 ++--
 debian/libx2go-server-db-perl.install              |    2 ++
 x2goserver-printing/bin/x2goprint                  |    3 +--
 x2goserver/Makefile                                |    1 -
 x2goserver/bin/x2gogetapps                         |    1 -
 x2goserver/bin/x2gogetservers                      |    3 +--
 x2goserver/bin/x2golistdesktops                    |    1 -
 x2goserver/bin/x2golistmounts                      |    3 +--
 x2goserver/bin/x2golistsessions                    |    3 +--
 x2goserver/bin/x2gomountdirs                       |    3 +--
 x2goserver/bin/x2gosessionlimit                    |    1 -
 x2goserver/bin/x2goshowblocks                      |    3 +--
 x2goserver/bin/x2goumount-session                  |    3 +--
 x2goserver/lib/x2gochangestatus                    |    3 +--
 x2goserver/lib/x2gocreatesession                   |    3 +--
 x2goserver/lib/x2gogetagent                        |    3 +--
 x2goserver/lib/x2gogetdisplays                     |    3 +--
 x2goserver/lib/x2gogetports                        |    3 +--
 x2goserver/lib/x2gogetstatus                       |    3 +--
 x2goserver/lib/x2goinsertport                      |    3 +--
 x2goserver/lib/x2goinsertsession                   |    3 +--
 x2goserver/lib/x2golistsessions_sql                |    3 +--
 x2goserver/lib/x2goresume                          |    3 +--
 x2goserver/lib/x2gormport                          |    3 +--
 x2goserver/lib/x2gosuspend-agent                   |    1 -
 x2goserver/lib/x2gosyslog                          |    1 -
 x2goserver/sbin/x2gocleansessions                  |    1 -
 30 files changed, 55 insertions(+), 49 deletions(-)
 rename x2goserver/lib/x2godbwrapper.pm => X2Go/Server/DB.pm (99%)
 create mode 100644 debian/libx2go-server-db-perl.install

The diff of changes is:
diff --git a/x2goserver/lib/x2godbwrapper.pm b/X2Go/Server/DB.pm
similarity index 99%
rename from x2goserver/lib/x2godbwrapper.pm
rename to X2Go/Server/DB.pm
index c3f56dd..6a27db0 100644
--- a/x2goserver/lib/x2godbwrapper.pm
+++ b/X2Go/Server/DB.pm
@@ -18,7 +18,17 @@
 # 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>
 
-package x2godbwrapper;
+package X2Go::DB;
+
+=head1 NAME
+
+X2Go::DB - X2Go Session Database modules for Perl
+
+=head1 DESCRIPTION
+
+X2Go Session Database modules for X2Go Server.
+
+=cut
 
 use strict;
 use Config::Simple;
@@ -26,8 +36,6 @@ use DBI;
 use POSIX;
 use Sys::Syslog qw( :standard :macros );
 
-my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use X2Go::Log qw(loglevel);
 
 setlogmask( LOG_UPTO(loglevel()) );
@@ -35,6 +43,8 @@ setlogmask( LOG_UPTO(loglevel()) );
 my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid());
 
 my $Config = new Config::Simple(syntax=>'ini');
+my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
+
 $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql";
 my $backend=$Config->param("backend");
 
diff --git a/debian/changelog b/debian/changelog
index 260db0a..26f284f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,12 +18,14 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
     - Make sure when launching desktop session through the Xsession mechanism
       that the LD_LIBRARY_PATH variable stays intact. Closes #29.
     - Transform x2gologlevel.pm into proper Perl module X2Go::Log
+    - Transform x2godbwrapper.pm into proper Perl module X2Go::Server::DB.
   * /debian/control:
     + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
     + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder.
     + Add rdesktop and pulseaudio-utils to Suggests.
     + Priority: optional.
     + Package X2Go::Log in separate package: libx2go-log-perl.
+    + Package X2Go::Server::DB in separate package: libx2go-server-db-perl.
 
   [ Oleksandr Shneyder ]
   * New upstream version (3.2.0.0):
diff --git a/debian/control b/debian/control
index ad9b159..03ece03 100644
--- a/debian/control
+++ b/debian/control
@@ -13,13 +13,30 @@ Homepage: http://code.x2go.org/releases/source/x2goserver
 Vcs-Git: git://code.x2go.org/x2goserver.git
 Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary
 
+Package: libx2go-server-db-perl
+Architecture: any
+Section: perl
+Depends:
+ ${perl:Depends},
+ ${misc:Depends},
+Description: Perl X2Go::Server:DB modules
+ X2Go is a server based computing environment with
+    - session resuming
+    - low bandwidth support
+    - LDAP support
+    - client side mass storage mounting support
+    - audio support
+    - authentication by smartcard and USB stick
+ .
+ This package contains the X2Go::Server::DB Perl modules.
+
 Package: libx2go-log-perl
 Architecture: any
 Section: perl
 Depends:
  ${perl:Depends},
  ${misc:Depends},
-Description: X2Go server daemon scripts
+Description: Perl X2Go::Log modules
  X2Go is a server based computing environment with
     - session resuming
     - low bandwidth support
diff --git a/debian/libx2go-log-perl.install b/debian/libx2go-log-perl.install
index c019a96..ce1fadc 100644
--- a/debian/libx2go-log-perl.install
+++ b/debian/libx2go-log-perl.install
@@ -1,2 +1,2 @@
-usr/share/perl5/X2Go
-usr/share/man/man3
\ No newline at end of file
+usr/share/perl5/X2Go/Log.pm
+usr/share/man/man3/X2Go::Log*
\ No newline at end of file
diff --git a/debian/libx2go-server-db-perl.install b/debian/libx2go-server-db-perl.install
new file mode 100644
index 0000000..dd30db9
--- /dev/null
+++ b/debian/libx2go-server-db-perl.install
@@ -0,0 +1,2 @@
+usr/share/perl5/X2Go/Server/DB*
+usr/share/man/man3/X2Go::Server::DB*
\ No newline at end of file
diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint
index f1c0d20..3256f40 100755
--- a/x2goserver-printing/bin/x2goprint
+++ b/x2goserver-printing/bin/x2goprint
@@ -26,8 +26,7 @@ use File::Copy;
 use File::Path;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper;
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 59f2a0a..9065d7f 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -66,7 +66,6 @@ install_scripts:
 	$(INSTALL_PROGRAM) x2gosqlitewrapper       $(DESTDIR)$(LIBDIR)/
 	$(INSTALL_PROGRAM) lib/*                   $(DESTDIR)$(LIBDIR)/
 	$(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
-	chmod a-x $(DESTDIR)$(LIBDIR)/*.pm
 	getent group x2gouser &>/dev/null && chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper || true
 	chmod 2755 $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper
 
diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps
index de9c2ec..eee2d1e 100755
--- a/x2goserver/bin/x2gogetapps
+++ b/x2goserver/bin/x2gogetapps
@@ -24,7 +24,6 @@ use strict;
 use Sys::Syslog qw( :standard :macros );
 use MIME::Base64 qw(encode_base64);
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers
index cd49bfb..a15fada 100755
--- a/x2goserver/bin/x2gogetservers
+++ b/x2goserver/bin/x2gogetservers
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops
index 3a1b7f1..4a97622 100755
--- a/x2goserver/bin/x2golistdesktops
+++ b/x2goserver/bin/x2golistdesktops
@@ -24,7 +24,6 @@ use strict;
 use Sys::Hostname;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts
index a143e04..91e971a 100755
--- a/x2goserver/bin/x2golistmounts
+++ b/x2goserver/bin/x2golistmounts
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions
index aa1b02a..4be77cb 100755
--- a/x2goserver/bin/x2golistsessions
+++ b/x2goserver/bin/x2golistsessions
@@ -24,8 +24,7 @@ use strict;
 use Sys::Hostname;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index b04e89e..fb9febd 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper;
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index d2bd978..d4d1b7d 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -24,7 +24,6 @@ use strict;
 use Config::Simple;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks
index 457874e..0c3e832 100755
--- a/x2goserver/bin/x2goshowblocks
+++ b/x2goserver/bin/x2goshowblocks
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index c1cd044..99524be 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -24,8 +24,7 @@ use strict;
 use Sys::Hostname;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper;
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus
index 17226a9..640e58d 100755
--- a/x2goserver/lib/x2gochangestatus
+++ b/x2goserver/lib/x2gochangestatus
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession
index ecd9db4..6987b42 100755
--- a/x2goserver/lib/x2gocreatesession
+++ b/x2goserver/lib/x2gocreatesession
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent
index 02e0144..68e3bd2 100755
--- a/x2goserver/lib/x2gogetagent
+++ b/x2goserver/lib/x2gogetagent
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays
index 7dd84f2..3893b7a 100755
--- a/x2goserver/lib/x2gogetdisplays
+++ b/x2goserver/lib/x2gogetdisplays
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports
index 4fe8c5e..fa7c2a0 100755
--- a/x2goserver/lib/x2gogetports
+++ b/x2goserver/lib/x2gogetports
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2gogetstatus b/x2goserver/lib/x2gogetstatus
index 3dfb084..b56d306 100755
--- a/x2goserver/lib/x2gogetstatus
+++ b/x2goserver/lib/x2gogetstatus
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport
index 920b79c..908fe55 100755
--- a/x2goserver/lib/x2goinsertport
+++ b/x2goserver/lib/x2goinsertport
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession
index da4f3da..d0c74cc 100755
--- a/x2goserver/lib/x2goinsertsession
+++ b/x2goserver/lib/x2goinsertsession
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql
index 27f1a5d..bfedba6 100755
--- a/x2goserver/lib/x2golistsessions_sql
+++ b/x2goserver/lib/x2golistsessions_sql
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume
index 501a599..d0c6324 100755
--- a/x2goserver/lib/x2goresume
+++ b/x2goserver/lib/x2goresume
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2gormport b/x2goserver/lib/x2gormport
index 3d8f5a9..a0c5907 100755
--- a/x2goserver/lib/x2gormport
+++ b/x2goserver/lib/x2gormport
@@ -23,8 +23,7 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+use X2Go::Server::DB;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent
index 6c50e13..103dcb7 100755
--- a/x2goserver/lib/x2gosuspend-agent
+++ b/x2goserver/lib/x2gosuspend-agent
@@ -23,7 +23,6 @@
 strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');
diff --git a/x2goserver/lib/x2gosyslog b/x2goserver/lib/x2gosyslog
index 7c47ee1..89b74b4 100755
--- a/x2goserver/lib/x2gosyslog
+++ b/x2goserver/lib/x2gosyslog
@@ -23,7 +23,6 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use X2Go::Log qw(loglevel);
 
 setlogmask( LOG_UPTO(loglevel()) );
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index b3e99f9..1019314 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -25,7 +25,6 @@ use Sys::Hostname;
 use Sys::Syslog qw( :standard :macros );
 
 my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use X2Go::Log qw(loglevel);
 
 openlog($0,'cons,pid','user');


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).




More information about the x2go-commits mailing list