[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-286-g17a9b39

X2go dev team git-admin at x2go.org
Sat Sep 24 21:43:34 CEST 2011


The branch, master has been updated
       via  17a9b394a9b61d85b81d80136d4fedfc91ec5ee1 (commit)
      from  c50c4ba010d5d64543e284e44cc9ff6991250ccf (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 17a9b394a9b61d85b81d80136d4fedfc91ec5ee1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 24 21:38:26 2011 +0200

    Identified x2goumount script (x2goserver-compat) as a necessary component of x2gognomebindings and moved it there (with new name: x2goumount-session-gnome).

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

Summary of changes:
 debian/changelog                        |    2 +
 x2goserver-compat/bin/x2goumount        |   62 -------------------------------
 x2goserver-compat/man/man8/x2goumount.8 |   23 -----------
 3 files changed, 2 insertions(+), 85 deletions(-)
 delete mode 100755 x2goserver-compat/bin/x2goumount
 delete mode 100644 x2goserver-compat/man/man8/x2goumount.8

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5eb5078..cdd1782 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Split up x2goprint script + man page + adduser x2goprint as separate
     package x2goserver-printing.
   * Add man page for x2gobasepath and man page draft for x2gosessionlimit.
+  * Identified x2goumount script (x2goserver-compat) as a necessary component of
+    x2gognomebindings and moved it there (with new name: x2goumount-session-gnome).
 
   [ Ivan Kabaivanov ]
   * Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver-compat/bin/x2goumount b/x2goserver-compat/bin/x2goumount
deleted file mode 100755
index 7d160f2..0000000
--- a/x2goserver-compat/bin/x2goumount
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007-2011 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-2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-
-use strict;
-
-use lib "/usr/lib/x2go";
-use x2godbwrapper; 
-
-my $fname=shift;
-open(F,"<$fname") or die "can't open $fname";
-my $dir=<F>;
-my $session=<F>;
-close(F);
-
-$session=~s/\n//;
-
-chomp($dir);
-my $uname=$ENV{'USER'};
-
-my $use_zenity=0;
-
-if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "")
-{
-     $use_zenity=1;
-}
-
-if(system( "fusermount -u $dir" ) == 0)
-{
-     unlink($fname);
-     db_deletemount( $session, $dir);
-     rmdir ($dir);
-}
-else
-{
-    if($use_zenity == 0)
-    {
-         system("kdialog --error \"Can't umount:\n $dir\"&");
-    }
-    else
-    {
-         system("zenity --error --text \"Can't umount:\n $dir\"&");
-    }
-}
diff --git a/x2goserver-compat/man/man8/x2goumount.8 b/x2goserver-compat/man/man8/x2goumount.8
deleted file mode 100644
index 628b616..0000000
--- a/x2goserver-compat/man/man8/x2goumount.8
+++ /dev/null
@@ -1,23 +0,0 @@
-'\" -*- coding: utf-8 -*-
-.if \n(.g .ds T< \\FC
-.if \n(.g .ds T> \\F[\n[.fam]]
-.de URL
-\\$2 \(la\\$1\(ra\\$3
-..
-.if \n(.g .mso www.tmac
-.TH x2goumount 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
-.SH NAME
-x2goumount \- X2go Server Script (deprecated, shipped for compatibility with old clients)
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-x2goumount <arg1> <arg2> ...
-
-.SH DESCRIPTION
-\fBx2goumount\fR is a deprecated script belonging to X2go Server. The availability of this script
-is required to allow old local folder sharing to old \fBx2goclient\fR versions.
-.PP
-.SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
-(http://www.x2go.org).


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