Hello community, here is the log from the commit of package yast2-printer for openSUSE:Factory checked in at Fri Feb 11 01:39:38 CET 2011. -------- --- yast2-printer/yast2-printer.changes 2011-02-04 15:02:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2011-02-10 16:31:30.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 10 16:06:03 CET 2011 - jsmeix@suse.de + +- Be backward compatible in the "Driver Packages" dialog + regarding OpenPrintingPPDs-ghostscript and cups-drivers: + It tries first to install OpenPrintingPPDs-ghostscript + but if this fails it tries to install cups-drivers + and it removes both OpenPrintingPPDs-ghostscript and + cups-drivers if installed. +- 2.20.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-printer-2.20.7.tar.bz2 New: ---- yast2-printer-2.20.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.3j6R77/_old 2011-02-11 01:39:27.000000000 +0100 +++ /var/tmp/diff_new_pack.3j6R77/_new 2011-02-11 01:39:27.000000000 +0100 @@ -20,7 +20,7 @@ Name: yast2-printer Summary: YaST2 - Printer Configuration -Version: 2.20.7 +Version: 2.20.8 Release: 1 License: GPL Group: System/YaST ++++++ yast2-printer-2.20.7.tar.bz2 -> yast2-printer-2.20.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.20.7/VERSION new/yast2-printer-2.20.8/VERSION --- old/yast2-printer-2.20.7/VERSION 2011-02-04 14:57:22.000000000 +0100 +++ new/yast2-printer-2.20.8/VERSION 2011-02-10 16:26:40.000000000 +0100 @@ -1 +1 @@ -2.20.7 +2.20.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.20.7/package/yast2-printer.changes new/yast2-printer-2.20.8/package/yast2-printer.changes --- old/yast2-printer-2.20.7/package/yast2-printer.changes 2011-02-04 14:57:22.000000000 +0100 +++ new/yast2-printer-2.20.8/package/yast2-printer.changes 2011-02-10 16:26:40.000000000 +0100 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Feb 10 16:06:03 CET 2011 - jsmeix@suse.de + +- Be backward compatible in the "Driver Packages" dialog + regarding OpenPrintingPPDs-ghostscript and cups-drivers: + It tries first to install OpenPrintingPPDs-ghostscript + but if this fails it tries to install cups-drivers + and it removes both OpenPrintingPPDs-ghostscript and + cups-drivers if installed. +- 2.20.8 + +------------------------------------------------------------------- Fri Feb 4 14:51:44 CET 2011 - jsmeix@suse.de - Fixed the automatic configuration in printer_proposal.ycp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.20.7/src/Printer.ycp new/yast2-printer-2.20.8/src/Printer.ycp --- old/yast2-printer-2.20.7/src/Printer.ycp 2011-01-19 14:40:55.000000000 +0100 +++ new/yast2-printer-2.20.8/src/Printer.ycp 2011-02-10 16:26:40.000000000 +0100 @@ -388,10 +388,10 @@ `DownloadProgress( // Header of a DownloadProgress indicator: _("Retrieving printer driver information..."), create_database_progress_filename, - // On my openSUSE 11.1 the size is about 90000 bytes. - // The number 102400 results exactly "100.0 KB" in the + // On my openSUSE 11.4 the size is about 110000 bytes. + // The number 122880 results exactly "120.0 KB" in the // YaST Gtk user inteface for a DownloadProgress: - 102400 + 122880 ) ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.20.7/src/driveradd.ycp new/yast2-printer-2.20.8/src/driveradd.ycp --- old/yast2-printer-2.20.7/src/driveradd.ycp 2011-01-25 16:00:23.000000000 +0100 +++ new/yast2-printer-2.20.8/src/driveradd.ycp 2011-02-10 16:26:40.000000000 +0100 @@ -271,14 +271,34 @@ // for whatever product (e.g. a Live CD or a stripped DVD/CD in whatever magazine). boolean package_changed = false; if( OpenPrintingPPDs_ghostscript_install != OpenPrintingPPDs_ghostscript_installed ) - { if( OpenPrintingPPDs_ghostscript_install ) + { // Since openSUSE 11.4 OpenPrintingPPDs-ghostscript is to a certain extent the successor of cups-drivers + // (more precisely: OpenPrintingPPDs-ghostscript contains most of what cups-drivers contained), + // see https://bugzilla.novell.com/show_bug.cgi?id=641704 + // To be backward compatible try also cups-drivers: + if( OpenPrintingPPDs_ghostscript_install ) { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "install" ) ) { package_changed = true; } + if( ! Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "installed" ) ) + { // Try to install the old cups-drivers only if the newer OpenPrintingPPDs-ghostscript was not installed: + if( Printerlib::TestAndInstallPackage( "cups-drivers", "install" ) ) + { package_changed = true; + } + } } else - { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "remove" ) ) - { package_changed = true; + { // Try to remove both OpenPrintingPPDs-ghostscript and cups-drivers if installed: + if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "installed" ) ) + { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "remove" ) ) + { package_changed = true; + } + } + if( Printerlib::TestAndInstallPackage( "cups-drivers", "installed" ) ) + { // The user must confirm each package which should be removed + // so that the user can decide not to remove cups-drivers: + if( Printerlib::TestAndInstallPackage( "cups-drivers", "remove" ) ) + { package_changed = true; + } } } } @@ -409,7 +429,10 @@ } } if( splix_install != splix_installed ) - { if( splix_install ) + { // Since openSUSE 11.4 cups-drivers-splix is renamed splix, + // see https://bugzilla.novell.com/show_bug.cgi?id=659579 + // To be backward compatible try also cups-drivers-splix: + if( splix_install ) { if( Printerlib::TestAndInstallPackage( "splix", "install" ) ) { package_changed = true; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org