Hello community, here is the log from the commit of package yast2-scanner checked in at Wed Nov 29 15:43:03 CET 2006. -------- --- yast2-scanner/yast2-scanner.changes 2006-11-20 11:44:44.000000000 +0100 +++ /mounts/work_src_done/NOARCH/NOARCH/yast2-scanner/yast2-scanner.changes 2006-11-29 14:51:57.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Nov 29 14:42:19 CET 2006 - jsmeix@suse.de + +- V 2.14.11 +- Fixed test_and_set_scanner_access_permissions to search only + in field 2 of the lsscsi output if it is SCSI type "scanner" and + to search only in field 3 if it is manufactuer "HP" or "EPSON" + (see Suse Bugzilla bug 223875). + +------------------------------------------------------------------- Old: ---- yast2-scanner-2.14.10.tar.bz2 New: ---- yast2-scanner-2.14.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-scanner.spec ++++++ --- /var/tmp/diff_new_pack.Xw1xyZ/_old 2006-11-29 15:42:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Xw1xyZ/_new 2006-11-29 15:42:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-scanner (Version 2.14.10) +# spec file for package yast2-scanner (Version 2.14.11) # # 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.10 +Version: 2.14.11 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-scanner-2.14.10.tar.bz2 +Source0: yast2-scanner-2.14.11.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.10 +%setup -n yast2-scanner-2.14.11 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,12 @@ %doc %{prefix}/share/doc/packages/yast2-scanner %changelog -n yast2-scanner +* Wed Nov 29 2006 - jsmeix@suse.de +- V 2.14.11 +- Fixed test_and_set_scanner_access_permissions to search only + in field 2 of the lsscsi output if it is SCSI type "scanner" and + to search only in field 3 if it is manufactuer "HP" or "EPSON" + (see Suse Bugzilla bug 223875). * Mon Nov 20 2006 - jsmeix@suse.de - V 2.14.10 - Fixed OverviewDialog() regarding the 'net' meta-backend so that ++++++ yast2-scanner-2.14.10.tar.bz2 -> yast2-scanner-2.14.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.10/VERSION new/yast2-scanner-2.14.11/VERSION --- old/yast2-scanner-2.14.10/VERSION 2006-11-20 11:21:52.000000000 +0100 +++ new/yast2-scanner-2.14.11/VERSION 2006-11-29 14:42:11.000000000 +0100 @@ -1 +1 @@ -2.14.10 +2.14.11 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.10/configure new/yast2-scanner-2.14.11/configure --- old/yast2-scanner-2.14.10/configure 2006-11-20 11:36:07.000000000 +0100 +++ new/yast2-scanner-2.14.11/configure 2006-11-29 14:45:02.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.10. +# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.11. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-scanner' PACKAGE_TARNAME='yast2-scanner' -PACKAGE_VERSION='2.14.10' -PACKAGE_STRING='yast2-scanner 2.14.10' +PACKAGE_VERSION='2.14.11' +PACKAGE_STRING='yast2-scanner 2.14.11' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-scanner 2.14.10 to adapt to many kinds of systems. +\`configure' configures yast2-scanner 2.14.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-scanner 2.14.10:";; + short | recursive ) echo "Configuration of yast2-scanner 2.14.11:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-scanner configure 2.14.10 +yast2-scanner configure 2.14.11 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-scanner $as_me 2.14.10, which was +It was created by yast2-scanner $as_me 2.14.11, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-scanner' - VERSION='2.14.10' + VERSION='2.14.11' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.14.10" +VERSION="2.14.11" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix@suse.de>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-scanner $as_me 2.14.10, which was +This file was extended by yast2-scanner $as_me 2.14.11, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-scanner config.status 2.14.10 +yast2-scanner config.status 2.14.11 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.10/configure.in new/yast2-scanner-2.14.11/configure.in --- old/yast2-scanner-2.14.10/configure.in 2006-11-20 11:36:03.000000000 +0100 +++ new/yast2-scanner-2.14.11/configure.in 2006-11-29 14:44:57.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.10, http://bugs.opensuse.org/, yast2-scanner) +AC_INIT(yast2-scanner, 2.14.11, 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.10" +VERSION="2.14.11" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix@suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.10/src/Scanner.ycp new/yast2-scanner-2.14.11/src/Scanner.ycp --- old/yast2-scanner-2.14.10/src/Scanner.ycp 2006-11-20 11:44:21.000000000 +0100 +++ new/yast2-scanner-2.14.11/src/Scanner.ycp 2006-11-29 14:51:31.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Scanner settings, input and output functions * Authors: Johannes Meixner <jsmeix@suse.de> * - * $Id: Scanner.ycp 34463 2006-11-20 10:44:16Z jsmeix $ + * $Id: Scanner.ycp 34636 2006-11-29 13:51:29Z jsmeix $ * * Representation of the configuration of scanner. * Input and output routines. @@ -892,7 +892,8 @@ foreach( map< string, string > active_scanner, active_scanners, { if( issubstring( active_scanner["sane_device"]:"unknown", device ) - && "net" != active_scanner["backend"]:"" ) + && "net" != active_scanner["backend"]:"" + ) { show_as_detected_scanner = false; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.10/tools/test_and_set_scanner_access_permissions new/yast2-scanner-2.14.11/tools/test_and_set_scanner_access_permissions --- old/yast2-scanner-2.14.10/tools/test_and_set_scanner_access_permissions 2006-11-06 15:32:20.000000000 +0100 +++ new/yast2-scanner-2.14.11/tools/test_and_set_scanner_access_permissions 2006-11-29 14:41:55.000000000 +0100 @@ -106,9 +106,9 @@ # (because those devices do not support the SCSI scanner protocol # but only some kind of generic SCSI protocol): LSSCSI_LINE=$( lsscsi -g | grep $LINE ) - if ! echo $LSSCSI_LINE | grep -q -i 'scanner' + if ! echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f2 | grep -q -i 'scanner' then # Test for the particular manufacturer: - if echo $LSSCSI_LINE | grep -q -i 'HP' + if echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f3 | grep -q -i 'HP' then # Write a HP entry to the local HAL file: echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE @@ -119,7 +119,7 @@ echo ' </match>' >>$HAL_LOCAL_FILE echo '' >>$HAL_LOCAL_FILE fi - if echo $LSSCSI_LINE | grep -q -i 'EPSON' + if echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f3 | grep -q -i 'EPSON' then # Write an EPSON entry to the local HAL file: echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org