The branch, build-main has been updated via 25c010ff996d90a904bed9ce225be76e7393911c (commit) via 90bc39eb514ea22e3848144c3690e33094fd26ee (commit) via d1b85e1ea683f5efecde43b34cefd339b63398b7 (commit) via 7be426bcf5b604d2229dd8321a6d21f570a89483 (commit) via 86e725ac8e514d40abcef9db2367be05736d0604 (commit) via 6a7c597b3fa5004c1d24640c48dbca4bf718c180 (commit) via ea845a5c5a6c5ff3dfabfe7a77e4a0d120d8f57a (commit) via 57cfdc83af8b5fd2a7e330c6c1af2fe93767190c (commit) from eeb0842b295fb02d1a58611cecab640a65bb1300 (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: CUPS-X2GO.ppd | 8 ++++---- VERSION.cups-x2go | 2 +- cups-x2go | 31 +++++++++++++++++++------------ cups-x2go.conf | 8 ++++---- debian/changelog | 14 ++++++++++++++ debian/control | 16 +++++++++------- 6 files changed, 51 insertions(+), 28 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/VERSION.cups-x2go b/VERSION.cups-x2go index ea258a6..6f3d48d 100644 --- a/VERSION.cups-x2go +++ b/VERSION.cups-x2go @@ -1 +1 @@ -3.0.0.3 +3.0.0.4 diff --git a/cups-x2go b/cups-x2go index 2275525..967c9ee 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,20 +26,20 @@ 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"; # PS2PDF command -my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\""; -#my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\""; +my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -dDoNumCopies -c .setpdfwrite -f \"%s\""; +#my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -dDoNumCopies -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\""; ## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warning, notice, info, debug my $strloglevel = "notice"; @@ -70,6 +70,7 @@ sub readconfig { $x2goserver=$value; $x2goserver=~s/ //g; + $x2goserver=~s/\"//g; } if($option eq "printdsa") { @@ -108,15 +109,19 @@ sub getsessions my $sesslist; if ( $x2goserver eq "local" ) { + syslog("debug", "Querying local X2Go server for a session list..."); + # run x2golistsessions locally $sesslist=`su $userName -c "x2golistsessions --all-servers"`; } else { - # Calling x2goprint with a single parameter <username> will result in an x2golistsessions --all-servers command on the - # remote X2go server. + 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. $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver "sudo x2goprint $userName"`; } + syslog("debug", $sesslist); @sessions=split("\n",$sesslist); } @@ -136,12 +141,12 @@ sub printfile # log that we are about to process a print job syslog('debug', "x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title"); - # process print job + # process print job system( "x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title" ); } 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"); @@ -149,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\"" ); @@ -161,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; } @@ -221,6 +226,8 @@ print TITLE $jobTitle; close (TITLE); getsessions(); +syslog('debug', "Retrieved session list: @sessions\n"); + for(my $i=0; $i<scalar(@sessions);$i++ ) { my @sinfo=split("\\|",@sessions[$i]); diff --git a/cups-x2go.conf b/cups-x2go.conf index e44f6dc..89ed3ce 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -2,19 +2,19 @@ ### 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 ## command to generate PDF file -#ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\" +#ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -dDoNumCopies -c .setpdfwrite -f \"%s\" ## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warning, notice, info, debug #loglevel = notice diff --git a/debian/changelog b/debian/changelog index 1847fe7..5fc5b5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +cups-x2go (3.0.0.4-0~x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * New upstream version (3.0.0.4): + - Add more debug messages. + - Use proper project name where appropriate and possible (,,X2Go''). + * Maintainer change in package: X2Go Developers <x2go-dev@lists.berlios.de>. + + [ Helmer Teles ] + * New upstream version (3.0.0.4): + - Fix ignoring number of copies to be printed for single pages. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 25 Sep 2012 15:59:04 +0200 + cups-x2go (3.0.0.3-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/control b/debian/control index efc9df0..aa4948f 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,10 @@ Source: cups-x2go Section: x11 -Priority: extra -Maintainer: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -Uploaders: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Priority: optional +Maintainer: X2Go Developers <x2go-dev@lists.berlios.de> +Uploaders: + Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, + Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, Build-Depends: debhelper (>= 7) Standards-Version: 3.9.1 @@ -17,13 +19,13 @@ 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 + - low bandwidth support - LDAP support - client side mass storage mounting support - 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).