The branch, master has been updated via 6a7c597b3fa5004c1d24640c48dbca4bf718c180 (commit) from ea845a5c5a6c5ff3dfabfe7a77e4a0d120d8f57a (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 6a7c597b3fa5004c1d24640c48dbca4bf718c180 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Feb 18 01:53:12 2012 +0100 Use proper project name where appropriate and possible (,,X2Go''). ----------------------------------------------------------------------- Summary of changes: CUPS-X2GO.ppd | 8 ++++---- cups-x2go | 16 ++++++++-------- cups-x2go.conf | 6 +++--- debian/changelog | 1 + debian/control | 6 +++--- 5 files changed, 19 insertions(+), 18 deletions(-) The diff of changes is: diff --git a/CUPS-X2GO.ppd b/CUPS-X2GO.ppd index 7ecd5e6..d3d5207 100644 --- a/CUPS-X2GO.ppd +++ b/CUPS-X2GO.ppd @@ -28,10 +28,10 @@ *PCFileName: "CUPS-X2GO.PPD" *Manufacturer: "Generic" *Product: "(CUPS v1.1)" -*ModelName: "Generic CUPS-X2GO Printer" -*ShortNickName: "Generic CUPS-X2GO Printer" -*NickName: "Generic CUPS-X2GO Printer" -*1284DeviceID: "MFG:Generic;MDL:CUPS-X2GO Printer;DES:Generic CUPS-X2GO Printer;CLS:PRINTER;CMD:POSTSCRIPT;" +*ModelName: "Generic CUPS-X2Go Printer" +*ShortNickName: "Generic CUPS-X2Go Printer" +*NickName: "Generic CUPS-X2Go Printer" +*1284DeviceID: "MFG:Generic;MDL:CUPS-X2Go Printer;DES:Generic CUPS-X2Go Printer;CLS:PRINTER;CMD:POSTSCRIPT;" *% cupsFilter: "application/vnd.cups-postscript 0 pstitleiconv" *PSVersion: "(2017.000) 0" *LanguageLevel: "2" diff --git a/cups-x2go b/cups-x2go index bc451f2..314eca6 100755 --- a/cups-x2go +++ b/cups-x2go @@ -1,6 +1,6 @@ #!/usr/bin/perl -# X2go CUPS backend +# X2Go CUPS backend # Copyright 2009-2011 Obviously Nice # # This program is free software; you can redistribute it and/or modify it @@ -26,13 +26,13 @@ use strict; openlog($0,'cons,pid','user'); -## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise -## name the hostname of your master X2go server within in your X2go cluster. This +## if the CUPS server is X2Go server at the same time, use ,,local'' here, otherwise +## name the hostname of your master X2Go server within in your X2Go cluster. This ## host then is used for querying session information. my $x2goserver = "local"; ## DSA key for user x2goprint (new path and filename, default in cups-x2go backend) -## this private key has to be valid for all X2go servers that print via the CUPS +## this private key has to be valid for all X2Go servers that print via the CUPS ## server that cups-x2go is installed on. The corresponding public key has to ## be installed in <remote-x2goserverX>:~x2goprint/.ssh/authorized_keys my $printdsa = "/root/.ssh/id_dsa-x2goprint"; @@ -118,7 +118,7 @@ sub getsessions { syslog("debug", "Querying remote X2Go server $x2goserver for a session list..."); # Calling x2goprint with a single parameter <username> will result in an - # x2golistsessions --all-servers command on the remote X2go server. + # x2golistsessions --all-servers command on the remote X2Go server. $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver "sudo x2goprint $userName"`; } syslog("debug", $sesslist); @@ -146,7 +146,7 @@ sub printfile } else { - # push spool job to remote X2go server... and launch x2goprint there (with sudo!!!) + # push spool job to remote X2Go server... and launch x2goprint there (with sudo!!!) # PDF file syslog('debug', "scp -i $printdsa $pfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname"); @@ -154,7 +154,7 @@ sub printfile # title file syslog('debug', "scp -i $printdsa $tfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname.title"); system ("scp -i $printdsa $tfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname.title"); - # run x2goprint on remote X2go server + # run x2goprint on remote X2Go server syslog('debug', "ssh -i $printdsa x2goprint\@$x2gosession_host \"sudo x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title\"" ); system( "ssh -i $printdsa x2goprint\@$x2gosession_host \"sudo x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title\"" ); @@ -166,7 +166,7 @@ sub printfile if (!$ARGV[0]) { - print "file cups-x2go:/ \"Virtual X2GO Printer\" \"CUPS-X2GO\" \"MFG:Generic;MDL:CUPS-X2GO Printer;DES:Generic CUPS-X2GO Printer;CLS:PRINTER;CMD:POSTSCRIPT;\"\n"; + print "file cups-x2go:/ \"Virtual X2Go Printer\" \"CUPS-X2Go\" \"MFG:Generic;MDL:CUPS-X2Go Printer;DES:Generic CUPS-X2Go Printer;CLS:PRINTER;CMD:POSTSCRIPT;\"\n"; exit 0; } diff --git a/cups-x2go.conf b/cups-x2go.conf index e44f6dc..0e67c77 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -2,13 +2,13 @@ ### cups-x2go.conf -- CUPS Backend Configuration ### -## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise -## name the hostname of your master X2go server within in your X2go cluster. This +## if the CUPS server is X2Go server at the same time, use ,,local'' here, otherwise +## name the hostname of your master X2Go server within in your X2Go cluster. This ## host then is used for querying session information. #x2goserver = local ## DSA key for user x2goprint (new path and filename, default in cups-x2go backend) -## this private key has to be valid for all X2go servers that print via the CUPS +## this private key has to be valid for all X2Go servers that print via the CUPS ## server that cups-x2go is installed on. The corresponding public key has to ## be installed in <remote-x2goserverX>:~x2goprint/.ssh/authorized_keys #printdsa = /root/.ssh/id_dsa-x2goprint diff --git a/debian/changelog b/debian/changelog index 3671c81..0434232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ cups-x2go (3.0.0.4-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.0.0.4): - Add more debug messages. + - Use proper project name where appropriate and possible (,,X2Go''). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 13 Oct 2011 02:07:16 +0200 diff --git a/debian/control b/debian/control index efc9df0..c89383c 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Depends: ghostscript, cups-client, cups -Description: X2GO printer for CUPS - X2go is a server based computing environment with +Description: Virtual X2Go printer for CUPS + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -26,4 +26,4 @@ Description: X2GO printer for CUPS - audio support - authentication by smartcard and USB stick . - CUPS-X2GO provides an X2go backend to CUPS. + CUPS-X2Go provides a CUPS-backend for X2Go printing. hooks/post-receive -- cups-x2go.git (CUPS Backend for X2Go Printing) 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 "cups-x2go.git" (CUPS Backend for X2Go Printing).