[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-106-g9cc8393

X2Go dev team git-admin at x2go.org
Fri Dec 14 17:11:00 CET 2012


The branch, master has been updated
       via  9cc83938d56d8fb177111674d8ac21fdfb4b8421 (commit)
      from  381bbae19c69112d37ed7fbef28f32c87ea1f17b (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 9cc83938d56d8fb177111674d8ac21fdfb4b8421
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Dec 14 17:10:45 2012 +0100

    Use new script x2gopath in Perl::API. (Closes: #86).

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

Summary of changes:
 X2Go/Server/DB.pm            |    2 +-
 X2Go/Server/DB/PostgreSQL.pm |    2 +-
 debian/changelog             |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm
index 45f1ec9..c9a83a1 100644
--- a/X2Go/Server/DB.pm
+++ b/X2Go/Server/DB.pm
@@ -44,7 +44,7 @@ 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`;
+my $x2go_lib_path=`x2gopath libexec`;
 
 $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/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm
index 2400f60..72ba833 100644
--- a/X2Go/Server/DB/PostgreSQL.pm
+++ b/X2Go/Server/DB/PostgreSQL.pm
@@ -61,7 +61,7 @@ sub init_db
 	if ( ! ( $dbuser and $dbpass ) )
 	{
 		my $Config = new Config::Simple(syntax=>'ini');
-		my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
+		my $x2go_lib_path=`x2gopath libexec`;
 
 		$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 07c485f..51e295c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,10 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
   * Move code in pre/post+inst/rm scripts around (from x2goserver package
     to libx2go-server-db-perl and x2goserver-common).
 
+  [ Orion Poplawski ]
+  * New upstream version (3.2.0.0):
+    - Use new script x2gopath in Perl::API. (Closes: #86).
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 03 Jul 2012 10:03:28 +0200
 
 x2goserver (3.1.1.10-0~x2go1) UNRELEASED; 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).




More information about the x2go-commits mailing list