x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gognomebindings.git - master (branch) updated: 2.0.1.7-3-g4ff997f
by git-admin＠x2go.org 24 Jul '13

24 Jul '13

The branch, master has been updated via 4ff997f05faa33dea892f599763f84bef68d9235 (commit) from 114fd0ecaa06904e1adc5fc3d9ed68eac6aeffd3 (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 4ff997f05faa33dea892f599763f84bef68d9235 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 24 05:15:26 2013 +0200 Continue development (for GNOMEv2). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b2e31ad..6538aa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ x2gognomebindings (2.0.2.0-0~x2go2) UNRELEASED; urgency=low * New upstream version (2.0.2.0): - - Continue development (for GNOMEv2 and MATE). + - Continue development (for GNOMEv2). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 31 Dec 2012 13:40:45 +0100 diff --git a/debian/control b/debian/control index a0530f7..0e4355e 100644 --- a/debian/control +++ b/debian/control @@ -36,14 +36,15 @@ Depends: gnome-session (<< 3), Conflicts: gnome-session (>= 3) -Description: Description: x2gognomebindings (GNOME mimetypes for X2go) - X2go is a server based computing environment with +Description: Description: x2gognomebindings (GNOME mimetypes for X2Go) + X2Go is a server based computing environment with - session resuming - low bandwidth support - LDAP support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . - x2gognomebindings contains MIME type information for X2go if used with - GNOME v2 desktops. This package cannot be installed on GNOME-3 desktops. + x2gognomebindings contains MIME type information for X2Go if used with + GNOMEv2 desktops. This package cannot be installed on GNOME-3 desktops. hooks/post-receive -- x2gognomebindings.git (GNOME bindings 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 "x2gognomebindings.git" (GNOME bindings for X2Go).

1 0

x2goclient.git - master (branch) updated: 4.0.1.0-42-g468be3a
by git-admin＠x2go.org 23 Jul '13

23 Jul '13

The branch, master has been updated via 468be3aa8d457ec4bc429e76f4c26f4bbf27f0d0 (commit) from 76560c573b75e35a4ceb37e8b441d96747a688c1 (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 468be3aa8d457ec4bc429e76f4c26f4bbf27f0d0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 23 23:25:11 2013 +0200 Make X2Go Client aware of the MATE desktop environment. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + icons/16x16/mate.png | Bin 0 -> 774 bytes onmainwindow.cpp | 4 ++++ resources.rcc | 1 + sessionbutton.cpp | 16 ++++++++++++++++ sessionbutton.h | 2 +- sessionwidget.cpp | 1 + sessionwidget.h | 2 +- 8 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 icons/16x16/mate.png The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e23849e..475caf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low X2Go Session Broker after a session has been suspended or terminated. (Fixes: #179). - Enable full access desktop sharing across user accounts. (Fixes: #222). + - Make X2Go Client aware of the MATE desktop environment. [ Heinrich Schuchardt ] * New upstream version (4.0.1.1): diff --git a/icons/16x16/mate.png b/icons/16x16/mate.png new file mode 100644 index 0000000..0a34149 Binary files /dev/null and b/icons/16x16/mate.png differ diff --git a/onmainwindow.cpp b/onmainwindow.cpp index e1af9c6..8399b04 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -6031,6 +6031,10 @@ void ONMainWindow::runCommand() { command="xfce4-session"; } + else if ( command=="MATE" ) + { + command="mate-session"; + } else if ( command=="LXDE" ) { command="startlxde"; diff --git a/resources.rcc b/resources.rcc index 50782f8..cc74d72 100644 --- a/resources.rcc +++ b/resources.rcc @@ -56,6 +56,7 @@ <file>icons/16x16/gnome.png</file> <file>icons/16x16/unity.png</file> <file>icons/16x16/xfce.png</file> + <file>icons/16x16/mate.png</file> <file>icons/16x16/kde.png</file> <file>icons/16x16/new_file.png</file> <file>icons/16x16/resolution.png</file> diff --git a/sessionbutton.cpp b/sessionbutton.cpp index 65351bc..5204093 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -344,6 +344,7 @@ void SessionButton::redraw() cmdBox->addItem ( "GNOME" ); cmdBox->addItem ( "LXDE" ); cmdBox->addItem ( "XFCE" ); + cmdBox->addItem ( "MATE" ); cmdBox->addItem ( "UNITY" ); cmdBox->addItem ( tr ( "RDP connection" ) ); cmdBox->addItem ( tr ( "XDMCP" ) ); @@ -374,6 +375,11 @@ void SessionButton::redraw() cmdpix.load ( par->iconsPath ( "/16x16/xfce.png" ) ); cmdBox->setCurrentIndex ( XFCE ); } + else if ( command == "MATE" ) + { + cmdpix.load ( par->iconsPath ( "/16x16/mate.png" ) ); + cmdBox->setCurrentIndex ( MATE ); + } else if ( command =="LXDE" ) { cmdpix.load ( par->iconsPath ( "/16x16/lxde.png" ) ); @@ -682,6 +688,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) newRootless=false; pix.load ( par->iconsPath ( "/16x16/xfce.png" ) ); } + else if ( command == "MATE" ) + { + newRootless=false; + pix.load ( par->iconsPath ( "/16x16/mate.png" ) ); + } else if ( command ==tr ( "Connection to local desktop" ) ) { newRootless=false; @@ -730,6 +741,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) cmd="XFCE"; newRootless=false; } + if ( command=="mate-session" ) + { + cmd="MATE"; + newRootless=false; + } if (command== tr("Published applications")) { published=true; diff --git a/sessionbutton.h b/sessionbutton.h index bef550b..1cb5b14 100644 --- a/sessionbutton.h +++ b/sessionbutton.h @@ -32,7 +32,7 @@ class SessionButton : public SVGFrame { Q_OBJECT public: - enum {KDE,GNOME,LXDE,XFCE,UNITY,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; SessionButton ( ONMainWindow* mw, QWidget* parent,QString id ); ~SessionButton(); QString id() { diff --git a/sessionwidget.cpp b/sessionwidget.cpp index c78eb0c..62b7ea4 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -188,6 +188,7 @@ SessionWidget::SessionWidget ( QString id, ONMainWindow * mw, sessBox->addItem ( "GNOME" ); sessBox->addItem ( "LXDE" ); sessBox->addItem ( "XFCE" ); + sessBox->addItem ( "MATE" ); sessBox->addItem ( "UNITY" ); sessBox->addItem ( tr ( "Connect to Windows terminal server" ) ); sessBox->addItem ( tr ( "XDMCP" ) ); diff --git a/sessionwidget.h b/sessionwidget.h index fe2240a..b8e7b1f 100644 --- a/sessionwidget.h +++ b/sessionwidget.h @@ -57,7 +57,7 @@ public slots: #endif private: - enum {KDE,GNOME,LXDE,XFCE,UNITY,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; QLineEdit* sessName; QLineEdit* uname; QLineEdit* server; hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.4-4-ged0d934
by git-admin＠x2go.org 23 Jul '13

23 Jul '13

The branch, master has been updated via ed0d93497a82325affb05fcb3b31afabde1bdd44 (commit) from 08107b765e23fa977ae198bde67251d31facd7ab (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 ed0d93497a82325affb05fcb3b31afabde1bdd44 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 23 23:16:25 2013 +0200 Make PyHoca-GUI aware of the MATE desktop environment. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- pyhoca/wxgui/listdesktops.py | 2 +- pyhoca/wxgui/logon.py | 2 +- pyhoca/wxgui/profilemanager.py | 1 + pyhoca/wxgui/serverinfo.py | 2 +- pyhoca/wxgui/sessiontitle.py | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 08b78f4..5fe52c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pyhoca-gui (0.4.0.5-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.5): + - Make PyHoca-GUI aware of the MATE desktop environment. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 19 Jul 2013 22:34:41 +0200 diff --git a/pyhoca/wxgui/listdesktops.py b/pyhoca/wxgui/listdesktops.py index 6ea5bf0..f112b3e 100644 --- a/pyhoca/wxgui/listdesktops.py +++ b/pyhoca/wxgui/listdesktops.py @@ -143,7 +143,7 @@ class PyHocaGUI_DialogBoxListDesktops(wx.Dialog): else: move_y = self._PyHocaGUI.logon_window_position_y - elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): + elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'mate', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): # automatically place logon Window for GNOME, awesome move_x = maxX - (self.GetSize().GetWidth() + 20) diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index f50bc97..b3e8e7e 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -218,7 +218,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): else: move_y = self._PyHocaGUI.logon_window_position_y - elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): + elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'mate', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): # automatically place logon Window for GNOME, awesome move_x = maxX - (self.GetSize().GetWidth() + 20) diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index e0eb785..408e985 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -78,6 +78,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.sessionChoices = { 'CINNAMON': _(u'Cinnamon Desktop (CINNAMON)'), 'GNOME': _(u'GNOME Desktop (GNOME)'), + 'MATE': _(u'MATE Desktop (MATE)'), 'KDE': _(u'K Desktop Environment (KDE)'), 'LXDE': _(u'Lightweight X Desktop (LXDE)'), 'TRINITY': _(u'Trinity X Desktop (KDE3-like)'), diff --git a/pyhoca/wxgui/serverinfo.py b/pyhoca/wxgui/serverinfo.py index 7a3ffba..e3b03ee 100644 --- a/pyhoca/wxgui/serverinfo.py +++ b/pyhoca/wxgui/serverinfo.py @@ -120,7 +120,7 @@ class PyHocaGUI_DialogBoxServerInfo(wx.Dialog): else: move_y = self._PyHocaGUI.logon_window_position_y - elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): + elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'mate', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): # automatically place logon Window for GNOME, awesome move_x = maxX - (self.GetSize().GetWidth() + 20) diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index 75d4ea8..111fd46 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -119,7 +119,7 @@ class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog): else: move_y = self._PyHocaGUI.logon_window_position_y - elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): + elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'mate', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): # automatically place logon Window for GNOME, awesome move_x = maxX - (self.GetSize().GetWidth() + 20) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.4.0.5-4-g07a1fd1
by git-admin＠x2go.org 23 Jul '13

23 Jul '13

The branch, master has been updated via 07a1fd1954cd03dcf36b7fad83a730bb87cb4e8f (commit) from 6c7e1032757a6ab2e054f7d6a14ccb2d31ee2497 (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 07a1fd1954cd03dcf36b7fad83a730bb87cb4e8f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 23 23:10:04 2013 +0200 Make Python X2Go aware of the MATE desktop environment. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/defaults.py | 1 + 2 files changed, 2 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d52eb98..d5131cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-x2go (0.4.0.6-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.4.0.6): - Use XFCE as desktop environment in example scripts. + - Make Python X2Go aware of the MATE desktop environment. -- Mike Gabriel <mike.gabriel(a)das-netzwertkeam.de> Fri, 19 Jul 2013 17:45:24 +0200 diff --git a/x2go/defaults.py b/x2go/defaults.py index 234b63c..0817f63 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -378,6 +378,7 @@ X2GO_DESKTOPSESSIONS={ 'CINNAMON': 'cinnamon', 'KDE': 'startkde', 'GNOME': 'gnome-session', + 'MATE': 'mate-session', 'XFCE': 'xfce4-session', 'LXDE': 'startlxde', 'TRINITY': 'starttrinity', hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.4.0.5-3-g6c7e103
by git-admin＠x2go.org 23 Jul '13

23 Jul '13

The branch, master has been updated via 6c7e1032757a6ab2e054f7d6a14ccb2d31ee2497 (commit) from c735e6ab02c50b7029b700179a62373f7f406a29 (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 6c7e1032757a6ab2e054f7d6a14ccb2d31ee2497 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 23 23:09:20 2013 +0200 Use XFCE as desktop environment in example scripts. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- examples/x2go_start_session.py | 2 +- .../x2go_start_session_with_progress_status.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3f1efca..d52eb98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-x2go (0.4.0.6-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.6): + - Use XFCE as desktop environment in example scripts. -- Mike Gabriel <mike.gabriel(a)das-netzwertkeam.de> Fri, 19 Jul 2013 17:45:24 +0200 diff --git a/examples/x2go_start_session.py b/examples/x2go_start_session.py index fbea4c4..2f200ec 100644 --- a/examples/x2go_start_session.py +++ b/examples/x2go_start_session.py @@ -33,7 +33,7 @@ import getpass server = "server.mydomain.tld" port = 22 username = "foo" -command = "GNOME" +command = "XFCE" password = getpass.getpass() diff --git a/examples/x2go_start_session_with_progress_status.py b/examples/x2go_start_session_with_progress_status.py index 8a4ec5f..7bd503c 100644 --- a/examples/x2go_start_session_with_progress_status.py +++ b/examples/x2go_start_session_with_progress_status.py @@ -34,7 +34,7 @@ import threading server = "server.mydomain.tld" port = 22 username = "foo" -command = "GNOME" +command = "XFCE" def my_progress_bar(ps): hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.3-3-ge2c021f
by git-admin＠x2go.org 23 Jul '13

23 Jul '13

The branch, release/4.0.1.x has been updated via e2c021f21a17475cfc917c4e7bcab02011a0bb68 (commit) from 15860d2e1e69ae9e5b58e4957aa3efa925410d00 (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 e2c021f21a17475cfc917c4e7bcab02011a0bb68 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 23 23:05:57 2013 +0200 Make X2Go Server aware of the MATE desktop environment. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gomountdirs | 4 ++++ x2goserver/bin/x2goruncommand | 6 +++++- x2goserver/bin/x2goumount-session | 6 +++++- 4 files changed, 15 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 08d3a39..2952864 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goserver (4.0.1.4-0~x2go1) UNRELEASED; urgency=low * New upstream versino (4.0.1.4): - Multiply query USED_DISPLAYS and USED_PORTS in x2gostartagent to minimize race conditions in cases where many clients launch session simultaneously. + - Make X2Go Server aware of the MATE desktop environment. -- Mike Gabriel <mike.gabriel(a)das-netzwertkeam.de> Fri, 19 Jul 2013 17:53:11 +0200 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 4c6d6b4..10c40e2 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -306,6 +306,10 @@ for (my $i=0;$i<@dirs;$i++) { $current_desktop="-gnome"; } + elsif (($session =~ m/_stDMATE_dp/) && system("x2gofeature X2GO_MATEBINDINGS >/dev/null") == 0) + { + $current_desktop="-mate"; + } elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 2f95341..60b898f 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -71,7 +71,7 @@ if [ -e "/etc/lsb-release" ]; then source /etc/lsb-release fi -# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY) +# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY, MATE) # NOTES on GNOME startup behaviour in different distributions # =========================================================== @@ -120,6 +120,8 @@ elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then fi # on earlier Ubuntu versions or with non-Ubuntu Distros the ,,UNITY'' command in X2Go will launch the GNOME2 desktop shell +elif [ "$cmd" == "MATE" ]; then + cmd=="/usr/bin/mate-session" elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" elif [ "$cmd" == "XFCE4" ]; then @@ -172,6 +174,8 @@ if [ "$cmd" == "TERMINAL" ]; then cmd="/usr/bin/konsole" # KDE4 konsole behaves differently from other terminals IMEXIT="false" + elif [ -e "/usr/bin/mate-terminal" ]; then + cmd="/usr/bin/mate-terminal" elif [ -e "/usr/bin/gnome-terminal" ]; then cmd="/usr/bin/gnome-terminal" elif [ -e "/usr/bin/lxterminal" ]; then diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index a502090..3c3dc20 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -105,7 +105,7 @@ close(F); my $use_zenity=0; -if ($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +if (($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") || ($ENV{'MATE_DESKTOP_SESSION_ID'} ne "")) { $use_zenity=1; } @@ -203,6 +203,10 @@ break: { $current_desktop="-gnome"; } + elsif (($session =~ m/_stDMATE_dp/) && system("x2gofeature X2GO_MATEBINDINGS >/dev/null") == 0) + { + $current_desktop="-mate"; + } elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-193-gf437ecd
by git-admin＠x2go.org 23 Jul '13

23 Jul '13

The branch, master has been updated via f437ecd5be93ca4f03285c21ce1c01c229582af0 (commit) from 65169c9d65b117802e50631be0bbd719163d969e (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 f437ecd5be93ca4f03285c21ce1c01c229582af0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 23 23:05:57 2013 +0200 Make X2Go Server aware of the MATE desktop environment. Conflicts (resolved by Mike Gabriel): x2goserver/bin/x2goruncommand ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gomountdirs | 4 ++++ x2goserver/bin/x2goruncommand | 6 +++++- x2goserver/bin/x2goumount-session | 6 +++++- 4 files changed, 15 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0c5ede7..2dfb491 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ x2goserver (4.0.1.4-0~x2go1) UNRELEASED; urgency=low * New upstream versino (4.0.1.4): - Multiply query USED_DISPLAYS and USED_PORTS in x2gostartagent to minimize race conditions in cases where many clients launch session simultaneously. + - Make X2Go Server aware of the MATE desktop environment. -- Mike Gabriel <mike.gabriel(a)das-netzwertkeam.de> Fri, 19 Jul 2013 17:53:11 +0200 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index b86fe1a..3152fb2 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -285,6 +285,10 @@ for (my $i=0;$i<@dirs;$i++) { $current_desktop="-gnome"; } + elsif (($session =~ m/_stDMATE_dp/) && system("x2gofeature X2GO_MATEBINDINGS >/dev/null") == 0) + { + $current_desktop="-mate"; + } elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 2bcd8e0..e10a0ac 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -71,7 +71,7 @@ if [ -e "/etc/lsb-release" ]; then source /etc/lsb-release fi -# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY) +# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY, MATE) # NOTES on GNOME startup behaviour in different distributions # =========================================================== @@ -125,6 +125,8 @@ elif ([ "$cmd" == "CINNAMON" ] || [ "$cmd" == "cinnamon" ]); then export DESKTOP_SESSION="cinnamon2d" args=" --session=$DESKTOP_SESSION" +elif [ "$cmd" == "MATE" ]; then + cmd=="/usr/bin/mate-session" elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then @@ -177,6 +179,8 @@ if [ "$cmd" == "TERMINAL" ]; then cmd="/usr/bin/konsole" # KDE4 konsole behaves differently from other terminals IMEXIT="false" + elif [ -e "/usr/bin/mate-terminal" ]; then + cmd="/usr/bin/mate-terminal" elif [ -e "/usr/bin/gnome-terminal" ]; then cmd="/usr/bin/gnome-terminal" elif [ -e "/usr/bin/lxterminal" ]; then diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index da2ddb9..a77f856 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -81,7 +81,7 @@ close(F); my $use_zenity=0; -if ($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +if (($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") || ($ENV{'MATE_DESKTOP_SESSION_ID'} ne "")) { $use_zenity=1; } @@ -179,6 +179,10 @@ break: { $current_desktop="-gnome"; } + elsif (($session =~ m/_stDMATE_dp/) && system("x2gofeature X2GO_MATEBINDINGS >/dev/null") == 0) + { + $current_desktop="-mate"; + } elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; 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).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-109-g6cbe83c
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 6cbe83c867d60bae52823c9a784c515064337a6e (commit) from 97b104e02b2c1d3886740e0450da2a922bcb8519 (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: .../sbin/x2gothinclient_create | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 82b5584..b19a9ac 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -158,10 +158,10 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install syslinux locales -y [ \$? -eq 0 ] && dpkg-reconfigure locales [ \$? -eq 0 ] && apt-get install linux-image-486 -y -[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486.tmp -[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot@boot@') && ln -s \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp -[ \$? -eq 0 ] && mv /initrd.img /initrd.img.486.tmp -[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -s \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp +[ \$? -eq 0 ] && test -e /vmlinuz && mv /vmlinuz /vmlinuz.486.tmp || true +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp +[ \$? -eq 0 ] && test -e /vmlinuz && mv /initrd.img /initrd.img.486.tmp || true +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp [ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y [ \$? -eq 0 ] && apt-get install patch -y @@ -192,8 +192,8 @@ export X2GO_HANDLE_DAEMONS=false # tweak plymouth [ \$? -eq 0 ] && apt-get install plymouth plymouth-themes-all -y [ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release -[ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf -[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf +[ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf || true +[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf || true EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.1.0.0
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 37470492cb86f3dd411f468c4a333840795776f3 (commit) from b41ad6fdfa247c77d79cc5a6b4fa85675f8eb43d (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: VERSION | 2 +- debian/changelog | 8 ++++---- x2gocdmanager/man/x2gocdmanager.8 | 2 +- x2gocdmanager/man/x2goejectcd.1 | 2 +- x2gosmartcardrules/man/x2gognupgccid.8 | 2 +- x2gothinclient/man/x2gothinclientd.8 | 2 +- .../man/x2gothinclient_cleanup.8 | 2 +- .../man/x2gothinclient_create.8 | 2 +- .../man/x2gothinclient_preptftpboot.8 | 2 +- .../man/x2gothinclient_shell.8 | 2 +- .../man/x2gothinclient_update.8 | 2 +- .../man/x2gothinclient_upgrade.8 | 2 +- x2gousbmount/man/x2gousbmount.8 | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index 4d4f436..a6bbdb5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1.9 +1.1.0.0 diff --git a/debian/changelog b/debian/changelog index 1660819..5f97dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low +x2gothinclient (1.1.0.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] - * New upstream version (1.0.99.1): + * New upstream version (1.1.0.0): - When X2Go TCE has plymouth installed, make sure pressing the halt button does not change to the wrong tty. - Truncate echo output lines to less than 80 chars. @@ -105,11 +105,11 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low manager. [ Oleksandr Shneyder ] - * New upstream version (1.0.99.1): + * New upstream version (1.1.0.0): - Use expand_file from File::Path::Expand to detect full path of ~x2gothinclient/.halt. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 19 Jul 2013 23:31:10 +0200 x2gothinclient (1.0.1.8-0~x2go1) unstable; urgency=low diff --git a/x2gocdmanager/man/x2gocdmanager.8 b/x2gocdmanager/man/x2gocdmanager.8 index ccbcb8d..b3d0a15 100644 --- a/x2gocdmanager/man/x2gocdmanager.8 +++ b/x2gocdmanager/man/x2gocdmanager.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocdmanager 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gocdmanager 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gocdmanager \- CD/DVD Management Daemon running on X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gocdmanager/man/x2goejectcd.1 b/x2gocdmanager/man/x2goejectcd.1 index db534bf..71e10d4 100644 --- a/x2gocdmanager/man/x2goejectcd.1 +++ b/x2gocdmanager/man/x2goejectcd.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goejectcd 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2goejectcd 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2goejectcd \- CD/DVD bay eject tool for X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gosmartcardrules/man/x2gognupgccid.8 b/x2gosmartcardrules/man/x2gognupgccid.8 index 01e0f6b..6f419de 100644 --- a/x2gosmartcardrules/man/x2gognupgccid.8 +++ b/x2gosmartcardrules/man/x2gognupgccid.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gognupgccid 8 "16 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gognupgccid 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gognupgccid \- udev Script handling GnuPG smart card readers on X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gothinclient/man/x2gothinclientd.8 b/x2gothinclient/man/x2gothinclientd.8 index 2fc2317..3daebca 100644 --- a/x2gothinclient/man/x2gothinclientd.8 +++ b/x2gothinclient/man/x2gothinclientd.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclientd 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclientd 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gothinclientd \- Session Control Daemon running on X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 index fdec84e..7c998eb 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_cleanup 8 "15 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_cleanup 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gothinclient_cleanup \- Removes the X2Go Thin Client environment from the X2Go PXE server. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_create.8 b/x2gothinclientmanagement/man/x2gothinclient_create.8 index b046fcd..77b3eec 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_create.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_create.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_create 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_create 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gothinclient_create \- Creates X2Go Thin Client chroot Environment. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 index 255803e..a50050c 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_preptftpboot 8 "14 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_preptftpboot 8 "July 2013" "Version 1.1.0.x" "X2go Thin Client Environment" .SH NAME x2gothinclient_preptftpboot \- Prepare PXE/Syslinux Boot Environment (delivered via tftpd) on X2Go PXE Server. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_shell.8 b/x2gothinclientmanagement/man/x2gothinclient_shell.8 index f98fefe..8eaba6b 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_shell.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_shell.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_shell 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_shell 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gothinclient_shell \- Opens a shell within the X2Go Thin Client chroot Environment. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_update.8 b/x2gothinclientmanagement/man/x2gothinclient_update.8 index 6328e65..38a5859 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_update.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_update.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_update 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_update 8 "July 2013" "Version 1.1.0.x" "X2go Thin Client Environment" .SH NAME x2gothinclient_update \- Updates the X2Go Thin Client configuration. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 b/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 index 2caf9a2..aa14cf3 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_upgrade 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_upgrade 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gothinclient_upgrade \- Upgrade the X2Go Thin Client's software. .SH SYNOPSIS diff --git a/x2gousbmount/man/x2gousbmount.8 b/x2gousbmount/man/x2gousbmount.8 index ede1cfe..f053f00 100644 --- a/x2gousbmount/man/x2gousbmount.8 +++ b/x2gousbmount/man/x2gousbmount.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gousbmount 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gousbmount 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gousbmount \- udev Script handling USB Flash Drives on X2Go Thin Clients. .SH SYNOPSIS hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-115-g561847d
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 561847d996f48a482bb85d98b28f1f282bf56edc (commit) from 021379933907c49a8d49436b735c5459ad5d444a (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: debian/changelog | 3 +++ debian/control | 7 +++---- x2gothinclient/sbin/x2gothinclientd | 1 - .../sbin/x2gothinclient_create | 3 +++ 4 files changed, 9 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 74de118..2494e04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -75,6 +75,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low support). + Add dependency (x2gousbmount, x2gocdmanager): libfile-path-expand-perl. + Bump Standards to 3.9.3 (no changes needed). + + Remove TCE tools (vim, mc, ...) from Recommends: field, install those via + x2gothinclient_create. Add pulseaudio, dbus-x11, policykit-1 to Depends: + field. * /debian/rules: + Fix lintian issue: debian-rules-missing-recommended-target build-arch + Fix lintian issue: debian-rules-missing-recommended-target build-indep diff --git a/debian/control b/debian/control index e7942e8..968d59b 100644 --- a/debian/control +++ b/debian/control @@ -55,6 +55,9 @@ Depends: xauth, xinit, locales, + pulseaudio-x11 | pulseaudio, + dbus-x11, + policykit-1, Recommends: x2gocdmanager, x2gousbmount, @@ -62,10 +65,6 @@ Recommends: gnupg-agent, pinentry-x2go, gpgsm, - vim, - mc, - acpid, - memtest86+, x11-xserver-utils, Suggests: plymouth, diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 9d5afc6..0fac6b4 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -130,7 +130,6 @@ elsif ($pid == 0 ) { system("su - x2gothinclient -c \"DISPLAY=:0 pulseaudio -D -n \\ -L 'module-native-protocol-tcp port=4713' \\ - -L 'module-esound-protocol-tcp port=16001' \\ -L 'module-udev-detect' --exit-idle-time=65535\""); } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 871778d..0e6037c 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -168,6 +168,9 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y +# some extra tools that are useful on the TCE +[ \$? -eq 0 ] && apt-get install vim mc acpid memtest86+ -y + # blacklist kernel modules [ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf [ \$? -eq 0 ] && for mod in $TC_MODULE_BLACKLIST; do echo "blacklist \$mod" >> /etc/modprobe.d/blacklist.conf; done hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits