Author: jsmeix Date: Thu Apr 16 16:07:55 2009 New Revision: 56817 URL: http://svn.opensuse.org/viewcvs/yast?rev=56817&view=rev Log: - Removed the "filters" package from the "Add Driver" dialog because this package was dropped for openSUSE 11.2. - Be prepared for the upcomming PDF workflow by submitting the test page using "-o document-format=application/vnd.cups-postscript" (see Novell/Suse Bugzilla bnc#467877). - 2.18.11 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/driveradd.ycp trunk/printer/src/overview.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=56817&r1=56816&r2=56817&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu Apr 16 16:07:55 2009 @@ -1 +1 @@ -2.18.10 +2.18.11 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=56817&r1=56816&r2=56817&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Thu Apr 16 16:07:55 2009 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Apr 16 14:35:59 CEST 2009 - jsmeix@suse.de + +- Removed the "filters" package from the "Add Driver" dialog + because this package was dropped for openSUSE 11.2. +- Be prepared for the upcomming PDF workflow by submitting the test + page using "-o document-format=application/vnd.cups-postscript" + (see Novell/Suse Bugzilla bnc#467877). +- 2.18.11 + +------------------------------------------------------------------- Thu Apr 2 17:04:10 CEST 2009 - jsmeix@suse.de - Improved the driver search functionality in basicadd.ycp and Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=56817&r1=56816&r2=56817&view=diff ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Thu Apr 16 16:07:55 2009 @@ -117,18 +117,6 @@ "ghostscript-&omni : " + _("The Omni Printer Driver (Unmaintained)"), ghostscript_omni_installed ) - ), - `Left - ( `CheckBox - ( `id("filters"), - // CheckBox to select or un-select the printer driver package filters - // which provides some makeshift drivers only for a few of the - // non-standard printers (the so called "GDI printers"). - // There is no need to have the package name "filters" in this text - // because it is shown in a separated column to the left of this text. - "&filters : " + _("Makeshift Drivers for a Few Non-Standard (GDI) Printers"), - filters_installed - ) ) ) ), @@ -208,7 +196,6 @@ boolean hplip_install = (boolean)UI::QueryWidget( `id("hplip"), `Value ); boolean manufacturer_PPDs_install = (boolean)UI::QueryWidget( `id("manufacturer-PPDs"), `Value ); boolean ghostscript_omni_install = (boolean)UI::QueryWidget( `id("ghostscript-omni"), `Value ); - boolean filters_install = (boolean)UI::QueryWidget( `id("filters"), `Value ); string ppd_path_input_value = (string)UI::QueryWidget( `id("ppd_path_input"), `Value ); // Ignore an effectively empty ppd_path_input_value: if( cups_drivers_install == cups_drivers_installed @@ -216,7 +203,6 @@ && hplip_install == hplip_installed && manufacturer_PPDs_install == manufacturer_PPDs_installed && ghostscript_omni_install == ghostscript_omni_installed - && filters_install == filters_installed && "" == filterchars( ppd_path_input_value, Printer::alnum_chars ) ) { y2milestone( "Nothing changed in AddDriverDialog." ); @@ -242,7 +228,7 @@ // when I would let the package manager install several packages at once // but one package is not avaialble in the repository to be installed. // For example on a host without Internet access when whatever rarely used - // drivers (e.g. ghostscript-omni or filters) or too-big drivers (e.g. hplip) + // drivers (e.g. ghostscript-omni) or too-big drivers (e.g. hplip) // are not provided on whatever media for whatever product // (e.g. our Live CD or a stripped DVD/CD in whatever magazine). boolean package_changed = false; @@ -372,18 +358,6 @@ } } } - if( filters_install != filters_installed ) - { if( filters_install ) - { if( Printerlib::TestAndInstallPackage( "filters", "install" ) ) - { package_changed = true; - } - } - else - { if( Printerlib::TestAndInstallPackage( "filters", "remove" ) ) - { package_changed = true; - } - } - } // If driver packages were actually changed (the user may have rejected it), // enforce that the BasicAddDialog and/or the BasicModifyDialog // (only form those dialogs this AddDriverDialog can be called) Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=56817&r1=56816&r2=56817&view=diff ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Thu Apr 16 16:07:55 2009 @@ -470,14 +470,25 @@ } string testprint_job_title = "YaST2testprint_" + queue_name; // Do not enforce to talk to the cupsd on localhost when submiting the testpage - // because testpage printing must also work for a "client-only" config: - if( ! Printerlib::ExecuteBashCommand( "/usr/bin/lp -d '" + // because testpage printing must also work for a "client-only" config. + // Use "-o document-format=application/vnd.cups-postscript" to be prepared + // for the upcomming PDF workflow. + // In the PDF workflow everything is converted to PDF before further processing so that + // PostScript programs like the CUPS test page are executed by Ghostscript when it is called by pstopdf. + // The option "-o document-format=application/vnd.cups-postscript" overrides the PDF workflow so that + // PostScript programs are executed by the PostScript printer or the rasterizing instance of Ghostscript. + // A consequence is that then pstops is not run so that -o page-label="queue_name:YaST2testprint@hostname" + // does no longer work which is now implemented via a sed magic which is fail-safe because + // sed would output the unchanged CUPS test page if it cannot do the substitution. + // The output of $(hostname) is also safe for the PostScript code "(string) show" because + // a hostname contains up to 24 ASCII characters A-Z a-z 0-9 and the hyphen (see RFC 952): + if( ! Printerlib::ExecuteBashCommand( "sed -e \"s/Printer Test Page/$(hostname || echo 'YaST') : " + + queue_name + + "/\" /usr/share/cups/data/testprint.ps | /usr/bin/lp -d '" + queue_name + "' -t '" + testprint_job_title - + "' -o page-label=\"" - + queue_name - + ":YaST2testprint@$(hostname)\" /usr/share/cups/data/testprint.ps" + + "' -o document-format=application/vnd.cups-postscript" ) ) { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org