Author: jsmeix Date: Tue Jan 25 16:00:23 2011 New Revision: 63266 URL: http://svn.opensuse.org/viewcvs/yast?rev=63266&view=rev Log: - Adapt the "Driver Packages" dialog because the package "cups-drivers-splix" is renamed to "splix" for openSUSE 11.4 (see Novell/openSUSE Bugzilla bnc#659579). To be backward compatible it tries first to install "splix" but if this fails it tries to install "cups-drivers-splix" and it removes both splix and cups-drivers-splix if installed (see Novell/openSUSE Bugzilla bnc#642510). - 2.20.6 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/driveradd.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=63266&r1=63265&r2=63266&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Tue Jan 25 16:00:23 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=63266&r1=63265&r2=63266&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Jan 25 16:00:23 2011 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Jan 25 14:10:21 CET 2011 - jsmeix@suse.de + +- Adapt the "Driver Packages" dialog because the package + "cups-drivers-splix" is renamed to "splix" for openSUSE 11.4 + (see Novell/openSUSE Bugzilla bnc#659579). + To be backward compatible it tries first to install "splix" + but if this fails it tries to install "cups-drivers-splix" + and it removes both splix and cups-drivers-splix if installed + (see Novell/openSUSE Bugzilla bnc#642510). +- 2.20.6 + +------------------------------------------------------------------- Wed Jan 19 13:28:09 CET 2011 - jsmeix@suse.de - Rework the "Autoconfig Settings" dialog and drop the support for Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=63266&r1=63265&r2=63266&view=diff ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Tue Jan 25 16:00:23 2011 @@ -52,9 +52,10 @@ boolean gutenprint_installed = Printerlib::TestAndInstallPackage( "gutenprint", "installed" ); boolean hplip_installed = Printerlib::TestAndInstallPackage( "hplip", "installed" ); boolean manufacturer_PPDs_installed = Printerlib::TestAndInstallPackage( "manufacturer-PPDs", "installed" ); - boolean cups_drivers_splix_installed = Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" ); + boolean splix_installed = Printerlib::TestAndInstallPackage( "splix", "installed" ) + || Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" ); boolean m2300w_installed = Printerlib::TestAndInstallPackage( "m2300w", "installed" ); - y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' cups_drivers_splix_installed:'%7' m2300w_installed:'%8'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, cups_drivers_splix_installed, m2300w_installed ); + y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' splix_installed:'%7' m2300w_installed:'%8'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, splix_installed, m2300w_installed ); term contents = `VBox ( `VStretch(), `Left @@ -132,12 +133,12 @@ ), `Left ( `CheckBox - ( `id("cups-drivers-splix"), - // CheckBox to select or un-select the printer driver package cups-drivers-splix. - // There is no need to have the package name "cups-drivers-splix" in this text + ( `id("splix"), + // CheckBox to select or un-select the printer driver package splix. + // There is no need to have the package name "splix" in this text // because it is shown in a separated column to the left of this text. - "cups-drivers-&splix : " + _("SpliX Driver for SPL Printers without JBIG"), - cups_drivers_splix_installed + "&splix : " + _("SpliX Driver for SPL Printers without JBIG"), + splix_installed ) ), `Left @@ -229,7 +230,7 @@ boolean gutenprint_install = (boolean)UI::QueryWidget( `id("gutenprint"), `Value ); boolean hplip_install = (boolean)UI::QueryWidget( `id("hplip"), `Value ); boolean manufacturer_PPDs_install = (boolean)UI::QueryWidget( `id("manufacturer-PPDs"), `Value ); - boolean cups_drivers_splix_install = (boolean)UI::QueryWidget( `id("cups-drivers-splix"), `Value ); + boolean splix_install = (boolean)UI::QueryWidget( `id("splix"), `Value ); boolean m2300w_install = (boolean)UI::QueryWidget( `id("m2300w"), `Value ); string ppd_path_input_value = (string)UI::QueryWidget( `id("ppd_path_input"), `Value ); // Ignore an effectively empty ppd_path_input_value: @@ -239,7 +240,7 @@ && gutenprint_install == gutenprint_installed && hplip_install == hplip_installed && manufacturer_PPDs_install == manufacturer_PPDs_installed - && cups_drivers_splix_install == cups_drivers_splix_installed + && splix_install == splix_installed && m2300w_install == m2300w_installed && "" == filterchars( ppd_path_input_value, Printer::alnum_chars ) ) @@ -407,15 +408,29 @@ } } } - if( cups_drivers_splix_install != cups_drivers_splix_installed ) - { if( cups_drivers_splix_install ) - { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "install" ) ) + if( splix_install != splix_installed ) + { if( splix_install ) + { if( Printerlib::TestAndInstallPackage( "splix", "install" ) ) { package_changed = true; } + if( ! Printerlib::TestAndInstallPackage( "splix", "installed" ) ) + { // Try to install the old cups-drivers-splix only if the newer splix was not installed: + if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "install" ) ) + { package_changed = true; + } + } } else - { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "remove" ) ) - { package_changed = true; + { // Try to remove both splix and cups-drivers-splix if installed: + if( Printerlib::TestAndInstallPackage( "splix", "installed" ) ) + { if( Printerlib::TestAndInstallPackage( "splix", "remove" ) ) + { package_changed = true; + } + } + if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" ) ) + { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "remove" ) ) + { package_changed = true; + } } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org