Hello community, here is the log from the commit of package yast2-scanner checked in at Mon Nov 20 13:59:36 CET 2006. -------- --- yast2-scanner/yast2-scanner.changes 2006-11-17 10:53:52.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-scanner/yast2-scanner.changes 2006-11-20 11:44:44.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 20 11:21:55 CET 2006 - jsmeix@suse.de + +- V 2.14.10 +- Fixed OverviewDialog() regarding the 'net' meta-backend so that + click 'Edit' or 'Delete' launches the network scanning dialog + if the 'net' meta-backend is used. +- Fixed OverviewContents() so that a (local) autodetected scanner + is show to the user even if its device (e.g. "libusb:001:002") + appears also in the device info of the 'net' meta-backend for a + remote scanner (e.g. "net:192.168.1.2:epson:libusb:001:002"). + +------------------------------------------------------------------- Old: ---- yast2-scanner-2.14.9.tar.bz2 New: ---- yast2-scanner-2.14.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-scanner.spec ++++++ --- /var/tmp/diff_new_pack.KRizaC/_old 2006-11-20 13:59:31.000000000 +0100 +++ /var/tmp/diff_new_pack.KRizaC/_new 2006-11-20 13:59:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-scanner (Version 2.14.9) +# spec file for package yast2-scanner (Version 2.14.10) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-scanner -Version: 2.14.9 +Version: 2.14.10 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-scanner-2.14.9.tar.bz2 +Source0: yast2-scanner-2.14.10.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -41,7 +41,7 @@ Johannes Meixner <jsmeix@suse.de> %prep -%setup -n yast2-scanner-2.14.9 +%setup -n yast2-scanner-2.14.10 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,15 @@ %doc %{prefix}/share/doc/packages/yast2-scanner %changelog -n yast2-scanner +* Mon Nov 20 2006 - jsmeix@suse.de +- V 2.14.10 +- Fixed OverviewDialog() regarding the 'net' meta-backend so that + click 'Edit' or 'Delete' launches the network scanning dialog + if the 'net' meta-backend is used. +- Fixed OverviewContents() so that a (local) autodetected scanner + is show to the user even if its device (e.g. "libusb:001:002") + appears also in the device info of the 'net' meta-backend for a + remote scanner (e.g. "net:192.168.1.2:epson:libusb:001:002"). * Fri Nov 17 2006 - jsmeix@suse.de - V 2.14.9 - Fixed creation of interface_and_usbid_string in the model_items ++++++ yast2-scanner-2.14.9.tar.bz2 -> yast2-scanner-2.14.10.tar.bz2 ++++++ ++++ 1755 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.9/VERSION new/yast2-scanner-2.14.10/VERSION --- old/yast2-scanner-2.14.9/VERSION 2006-11-17 10:44:22.000000000 +0100 +++ new/yast2-scanner-2.14.10/VERSION 2006-11-20 11:21:52.000000000 +0100 @@ -1 +1 @@ -2.14.9 +2.14.10 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.9/configure.in new/yast2-scanner-2.14.10/configure.in --- old/yast2-scanner-2.14.9/configure.in 2006-11-17 10:47:53.000000000 +0100 +++ new/yast2-scanner-2.14.10/configure.in 2006-11-20 11:36:03.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-scanner, 2.14.9, http://bugs.opensuse.org/, yast2-scanner) +AC_INIT(yast2-scanner, 2.14.10, http://bugs.opensuse.org/, yast2-scanner) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.9" +VERSION="2.14.10" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix@suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.9/src/Scanner.ycp new/yast2-scanner-2.14.10/src/Scanner.ycp --- old/yast2-scanner-2.14.9/src/Scanner.ycp 2006-11-17 10:53:32.000000000 +0100 +++ new/yast2-scanner-2.14.10/src/Scanner.ycp 2006-11-20 11:44:21.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Scanner settings, input and output functions * Authors: Johannes Meixner <jsmeix@suse.de> * - * $Id: Scanner.ycp 34436 2006-11-17 09:53:29Z jsmeix $ + * $Id: Scanner.ycp 34463 2006-11-20 10:44:16Z jsmeix $ * * Representation of the configuration of scanner. * Input and output routines. @@ -866,7 +866,8 @@ // (i.e. if neither a scanner was autodetected nor an active scanner nor an active backend exists) string id_prefix = ""; // On top of the table list the autodetected but not yet configured scanners - // i.e. those scanners which are in autodetected_scanners but not in active_scanners: + // i.e. those scanners which are in autodetected_scanners but not in active_scanners + // except remote active scanners which are accessed via the "net" meta-backend: id_prefix = "autodetected_scanner:"; // Process the autodetected_scanners list: integer autodetected_scanners_index = -1; @@ -883,13 +884,15 @@ // The last entry in the autodetected_scanners list is an empty map. // Skip at least this last entry: if( "" != description ) - { // Test whether the autodetected_scanner is one of the active_scanners. + { // Test whether the autodetected_scanner is one of the active_scanners + // except remote active scanners which are accessed via the "net" meta-backend. // If yes, then there is no need to set it up again // and then don't show it in the list of detected_scanners: boolean show_as_detected_scanner = true; foreach( map< string, string > active_scanner, active_scanners, - { if( issubstring( active_scanner["sane_device"]:"unknown", device ) ) + { if( issubstring( active_scanner["sane_device"]:"unknown", device ) + && "net" != active_scanner["backend"]:"" ) { show_as_detected_scanner = false; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.9/src/dialogs.ycp new/yast2-scanner-2.14.10/src/dialogs.ycp --- old/yast2-scanner-2.14.9/src/dialogs.ycp 2006-11-07 09:42:05.000000000 +0100 +++ new/yast2-scanner-2.14.10/src/dialogs.ycp 2006-11-20 11:44:21.000000000 +0100 @@ -4,8 +4,8 @@ * Summary: Dialogs definitions * Authors: Johannes Meixner <jsmeix@suse.de> * - * $Id: dialogs.ycp 34110 2006-11-07 08:42:03Z jsmeix $ - * $Id: dialogs.ycp 34110 2006-11-07 08:42:03Z jsmeix $ + * $Id: dialogs.ycp 34463 2006-11-20 10:44:16Z jsmeix $ + * $Id: dialogs.ycp 34463 2006-11-20 10:44:16Z jsmeix $ */ { @@ -195,13 +195,21 @@ // because this model was normally added, configured, or edited before // (in particular if there is only one scanner connected): Scanner::selected_autodetected_scanners_index = -1; + // Test if the active scanner is a remote scanner + // (i.e. when it is accessed via the 'net' meta-backend): + integer active_scanners_index = tointeger( filterchars( selected_item_id, "0123456789" ) ); + if( "net" == Scanner::active_scanners[active_scanners_index,"backend"]:"" ) + { // Exit this dialog and run the ConfigureNetworkScanningDialog via the sequencer in wizards.ycp: + ret = `network_scanning; + break; + } // Exit this dialog and run the AddSequence() via the sequencer in wizards.ycp: ret = `edit; break; } if( issubstring( selected_item_id, "active_backend:" ) ) - { // A selected active backend cannot be edited. - // A selected active backend can only be deleted. + { // A selected active backend (without a matching active scanner) cannot be edited. + // A selected active backend (without a matching active scanner) can only be deleted. Popup::AnyMessage( // Header of a Popup::AnyMessage when an active driver // without a matching active scanner was selected // and then the user clicked the [Edit] button. @@ -301,11 +309,24 @@ { // Delete a selected active scanner: integer active_scanners_index = tointeger( filterchars( selected_item_id, "0123456789" ) ); backend_name = Scanner::active_scanners[active_scanners_index,"backend"]:""; + // Test if the active scanner is a remote scanner + // (i.e. when it is accessed via the 'net' meta-backend): + if( "net" == backend_name ) + { // Exit this dialog and run the ConfigureNetworkScanningDialog via the sequencer in wizards.ycp: + ret = `network_scanning; + break; + } } if( issubstring( selected_item_id, "active_backend:" ) ) { // Delete a selected active backend (without a matching active scanner): integer active_backends_index = tointeger( filterchars( selected_item_id, "0123456789" ) ); backend_name = Scanner::active_backends[active_backends_index]:""; + // Test if the active backend is the 'net' meta-backend: + if( "net" == backend_name ) + { // Exit this dialog and run the ConfigureNetworkScanningDialog via the sequencer in wizards.ycp: + ret = `network_scanning; + break; + } } y2milestone( "Selected backend to be deleted (i.e. deactivated) is: %1", backend_name ); if( "" == backend_name ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org