[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.2-6-gc13d693

[X2Go dev team]

The branch, master has been updated
       via  c13d693dfd13f19bac13ad430b2165b2e6322f2a (commit)
       via  33fc7739485510ff8fbc28e16aa038c99eac93b2 (commit)
      from  e305a0a9cc943453a2e3508926967dc6b38bd525 (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 c13d693dfd13f19bac13ad430b2165b2e6322f2a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 3 09:50:28 2012 +0200

    Fix broken X2Go client-side printing. Adapt x2goprint to new spool job directory.

commit 33fc7739485510ff8fbc28e16aa038c99eac93b2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 3 09:47:13 2012 +0200

    /debian/x2goserver.init: Orthography fix: X2Go instead of x2go.

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

Summary of changes:
 debian/changelog                  |    7 +++++++
 debian/x2goserver.init            |    4 ++--
 x2goserver-printing/bin/x2goprint |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b18f45e..d7f39ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,13 @@ x2goserver (3.1.1.3-0~x2go1) UNRELEASED; urgency=low
     - Avoid using archaic tools during free port detection.
     - Avoid using ls in Makefiles.
 
+  [ Mike Gabriel ]
+  * New upstream version (3.1.1.3):
+    - Fix broken X2Go client-side printing. Adapt x2goprint to new spool job
+      directory.
+  * /debian/x2goserver.init:
+    + Orthography fix: X2Go instead of x2go.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 29 Jun 2012 17:49:04 +0200
 
 x2goserver (3.1.1.2-0~x2go1) unstable; urgency=low
diff --git a/debian/x2goserver.init b/debian/x2goserver.init
index be3631c..b56a4cb 100644
--- a/debian/x2goserver.init
+++ b/debian/x2goserver.init
@@ -12,7 +12,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 case "$1" in
 	start)
-		echo "Cleaning up stale x2go sessions."
+		echo "Cleaning up stale X2Go sessions."
 		/usr/sbin/x2gocleansessions
 	;;
 	stop)
@@ -22,7 +22,7 @@ case "$1" in
 	reload|force-reload|restart)
 		# kill x2gocleansessions, ignore on failure
 		killall x2gocleansessions || true
-		echo "Cleaning up stale x2go sessions."
+		echo "Cleaning up stale X2Go sessions."
 		/usr/sbin/x2gocleansessions
 	;;
 	*)
diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint
index 113e5f6..f6bc1c4 100755
--- a/x2goserver-printing/bin/x2goprint
+++ b/x2goserver-printing/bin/x2goprint
@@ -92,7 +92,7 @@ syslog('notice', "x2goprint is processing $printdir/$pdfFile with print job titl
 # with user privileges
 ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$homedir)=getpwnam($user);
 
-my $spoolbase="/tmp/spool_$user";
+my $spoolbase="/tmp/.x2go-$user/spool";
 my $spooldir="$spoolbase/$session";
 my $spooltmp="$spoolbase/tmp";
 mkpath($spooltmp);


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