Hello community,
here is the log from the commit of package yast2-printer for openSUSE:Factory
checked in at Wed Feb 2 01:49:24 CET 2011.
--------
--- yast2-printer/yast2-printer.changes 2011-01-19 14:56:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2011-01-25 16:11:47.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Jan 25 14:10:21 CET 2011 - jsmeix(a)suse.de
+
+- Adapted 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
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-printer-2.20.5.tar.bz2
New:
----
yast2-printer-2.20.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.joSC7L/_old 2011-02-02 01:48:09.000000000 +0100
+++ /var/tmp/diff_new_pack.joSC7L/_new 2011-02-02 01:48:09.000000000 +0100
@@ -20,7 +20,7 @@
Name: yast2-printer
Summary: YaST2 - Printer Configuration
-Version: 2.20.5
+Version: 2.20.6
Release: 1
License: GPL
Group: System/YaST
@@ -45,7 +45,7 @@
This package contains the YaST2 component for printer configuration.
%description devel-doc
-Developer documentation for yast2-printer.
+This package contains the developer documentation for yast2-printer.
%prep
%setup -q
@@ -69,8 +69,6 @@
chmod 755 %{my_requires}
%define __find_requires %{my_requires}
-%post
-
%clean
rm -rf "$RPM_BUILD_ROOT"
++++++ yast2-printer-2.20.5.tar.bz2 -> yast2-printer-2.20.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.20.5/VERSION new/yast2-printer-2.20.6/VERSION
--- old/yast2-printer-2.20.5/VERSION 2011-01-19 14:40:55.000000000 +0100
+++ new/yast2-printer-2.20.6/VERSION 2011-01-25 16:00:23.000000000 +0100
@@ -1 +1 @@
-2.20.5
+2.20.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.20.5/package/yast2-printer.changes new/yast2-printer-2.20.6/package/yast2-printer.changes
--- old/yast2-printer-2.20.5/package/yast2-printer.changes 2011-01-19 14:40:55.000000000 +0100
+++ new/yast2-printer-2.20.6/package/yast2-printer.changes 2011-01-25 16:04:35.000000000 +0100
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Tue Jan 25 14:10:21 CET 2011 - jsmeix(a)suse.de
+
+- Adapted 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(a)suse.de
- Rework the "Autoconfig Settings" dialog and drop the support for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.20.5/src/autoconfig.ycp new/yast2-printer-2.20.6/src/autoconfig.ycp
--- old/yast2-printer-2.20.5/src/autoconfig.ycp 2011-01-19 15:07:14.000000000 +0100
+++ new/yast2-printer-2.20.6/src/autoconfig.ycp 2011-01-25 16:04:35.000000000 +0100
@@ -58,7 +58,7 @@
// CheckBox for automatic configuration of USB printers
// by installing or removing the RPM package udev-configure-printer.
// Do not change or translate "udev-configure-printer", it is a RPM package name.
- _("Use the package udev-configure-printer for automated USB printer configuration")
+ _("&Use the package udev-configure-printer for automated USB printer configuration")
)
),
// Have space between the content and the bottom of the dialog:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.20.5/src/driveradd.ycp new/yast2-printer-2.20.6/src/driveradd.ycp
--- old/yast2-printer-2.20.5/src/driveradd.ycp 2011-01-19 14:40:55.000000000 +0100
+++ new/yast2-printer-2.20.6/src/driveradd.ycp 2011-01-25 16:00:23.000000000 +0100
@@ -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;
+ }
}
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
