[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-115-g561847d

[X2Go dev team]

The branch, master 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 -----------------------------------------------------------------
commit 561847d996f48a482bb85d98b28f1f282bf56edc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jun 22 12:06:29 2013 +0200

    Remove TCE tools (vim, mc, ...) from Recommends: field, install those via x2gothinclient_create. Add pulseaudio, dbus-x11, policykit-1 to Depends: field.

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

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