Hello community,
here is the log from the commit of package yast2-scanner
checked in at Wed Mar 19 01:33:42 CET 2008.
--------
--- yast2-scanner/yast2-scanner.changes 2007-07-19 16:01:25.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-scanner/yast2-scanner.changes 2008-03-18 14:49:35.735783000 +0100
@@ -1,0 +2,21 @@
+Tue Mar 18 12:48:38 CET 2008 - jsmeix@suse.de
+
+- V 2.16.0
+- Removed the RPM test for "sane-backends" from
+ create_scanner_database because all what matters in this script
+ is whether or not the description files exist.
+ Furthermore the YaST scanner module tests during startup
+ if "sane-backends" is installed (and installs it if not).
+- Skipped "SCSI via USB" scanners in
+ test_and_set_scanner_access_permissions
+ (see Novell/Suse Bugzilla bnc#341565).
+- Added more explanatory text for the proprietary iscan driver
+ on x86_64 (see Novell/Suse Bugzilla bnc#337816).
+
+-------------------------------------------------------------------
+Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz
+
+- Added 'StartupNotify=true' to the desktop file
+ (see Novell/Suse Bugzilla bnc#304964).
+
+-------------------------------------------------------------------
@@ -13 +34 @@
- (see Suse Bugzilla bug 260991).
+ (see Novell/Suse Bugzilla bnc#260991).
@@ -27 +48 @@
- currently newest changes in HAL (see Suse Bugzilla bug 250659)
+ currently newest changes in HAL (see Novell Bugzilla bnc#250659)
@@ -29 +50 @@
- do not contain only zeroes (see Suse Bugzilla bug 283132).
+ do not contain only zeroes (see Novell/Suse Bugzilla bnc#283132).
@@ -36 +57,2 @@
-- removed outdated translations from .desktop-files (#271209)
+- Removed outdated translations from .desktop-files
+ (see Novell/Suse Bugzilla bnc#271209).
@@ -61 +83 @@
- (see Suse Bugzilla bug 223875).
+ (see Novell/Suse Bugzilla bnc#223875).
@@ -125 +147 @@
- (for background info see Suse Bugzilla bug 160899).
+ (for background info see Novell/Suse Bugzilla bnc#160899).
@@ -136 +158 @@
- (see Suse Bugzilla #202351).
+ (see Novell/Suse Bugzilla bnc#202351).
@@ -173 +195 @@
- (see Suse Bugzilla #184824).
+ (see Novell/Suse Bugzilla bnc#184824).
@@ -196 +218,2 @@
- to allow normal user access (see Suse Bugzilla #153705).
+ to allow normal user access
+ (see Novell/Suse Bugzilla bnc#153705).
@@ -204 +227 @@
- (see Suse Bugzilla #153705).
+ (see Novell/Suse Bugzilla bnc#153705).
@@ -233 +256 @@
- (see Suse Bugzilla #145522).
+ (see Novell/Suse Bugzilla bnc#145522).
@@ -270 +293 @@
- (see Suse Bugzilla #142859).
+ (see Novell/Suse Bugzilla bnc#142859).
@@ -310 +333,2 @@
- (comment dated 2005-08-26 03:00 MST in bug 100695).
+ (comment dated 2005-08-26 03:00 MST
+ in Novell/Suse Bugzilla bnc#100695).
@@ -318 +342,2 @@
- method using USB vendor and product IDs (bug 100695).
+ method using USB vendor and product IDs
+ (see Novell/Suse Bugzilla bnc#100695).
Old:
----
yast2-scanner-2.15.5.tar.bz2
New:
----
yast2-scanner-2.16.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.q26459/_old 2008-03-19 01:33:07.000000000 +0100
+++ /var/tmp/diff_new_pack.q26459/_new 2008-03-19 01:33:07.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-scanner (Version 2.15.5)
+# spec file for package yast2-scanner (Version 2.16.0)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,19 +10,20 @@
# norootforbuild
+Url: http://en.opensuse.org/YaST
+
Name: yast2-scanner
-URL: http://en.opensuse.org/YaST
-Version: 2.15.5
+Version: 2.16.0
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.15.5.tar.bz2
-prefix: /usr
+Source0: yast2-scanner-2.16.0.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
-BuildArchitectures: noarch
-Summary: YaST2 Scanner Configuration
+BuildArch: noarch
+Summary: YaST2 - Scanner Configuration
%description
This package provides support for the configuration of USB scanners,
@@ -42,7 +43,7 @@
Johannes Meixner
%prep
-%setup -n yast2-scanner-2.15.5
+%setup -n yast2-scanner-2.16.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,4 +75,3 @@
%{prefix}/share/applications/YaST2/scanner.desktop
%{prefix}/lib/YaST2/bin/*scanner*
%doc %{prefix}/share/doc/packages/yast2-scanner
-
++++++ yast2-scanner-2.15.5.tar.bz2 -> yast2-scanner-2.16.0.tar.bz2 ++++++
++++ 3552 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.15.5/autodocs-ycp.ami new/yast2-scanner-2.16.0/autodocs-ycp.ami
--- old/yast2-scanner-2.15.5/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-scanner-2.16.0/autodocs-ycp.ami 2008-03-18 14:35:11.000000000 +0100
@@ -0,0 +1,27 @@
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
+
+htmldir = $(docdir)/autodocs
+
+html_DATA = index.html $(wildcard *.html)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
+
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
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.15.5/configure.in new/yast2-scanner-2.16.0/configure.in
--- old/yast2-scanner-2.15.5/configure.in 2007-07-19 15:53:18.000000000 +0200
+++ new/yast2-scanner-2.16.0/configure.in 2008-03-18 14:35:11.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-scanner
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-scanner, 2.15.5, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.16.0, 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.15.5"
+VERSION="2.16.0"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
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.15.5/doc/autodocs/Makefile.am new/yast2-scanner-2.16.0/doc/autodocs/Makefile.am
--- old/yast2-scanner-2.15.5/doc/autodocs/Makefile.am 2007-07-19 15:47:21.000000000 +0200
+++ new/yast2-scanner-2.16.0/doc/autodocs/Makefile.am 2008-03-18 11:38:10.000000000 +0100
@@ -1,13 +1,3 @@
-# Makefile.am for scanner/doc/autodocs
+# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/autodocs
-
-#index.html: $(srcdir)/../../src/*.ycp $(srcdir)/../../src/*.pm
-# $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.{ycp,pm}
-
-index.html: $(srcdir)/../../src/*.ycp
- $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp
-
-html_DATA = index.html $(wildcard *.html)
-
-CLEANFILES = $(html_DATA)
+include $(top_srcdir)/autodocs-ycp.ami
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.15.5/Makefile.am new/yast2-scanner-2.16.0/Makefile.am
--- old/yast2-scanner-2.15.5/Makefile.am 2007-07-19 15:53:18.000000000 +0200
+++ new/yast2-scanner-2.16.0/Makefile.am 2008-03-18 14:35:11.000000000 +0100
@@ -30,7 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = doc src testsuite tools
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.15.5/missing new/yast2-scanner-2.16.0/missing
--- old/yast2-scanner-2.15.5/missing 2007-07-19 15:53:24.000000000 +0200
+++ new/yast2-scanner-2.16.0/missing 2008-03-18 14:35:16.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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.15.5/src/scanner.desktop new/yast2-scanner-2.16.0/src/scanner.desktop
--- old/yast2-scanner-2.15.5/src/scanner.desktop 2007-07-19 15:47:21.000000000 +0200
+++ new/yast2-scanner-2.16.0/src/scanner.desktop 2008-03-18 11:38:11.000000000 +0100
@@ -22,3 +22,4 @@
Name=Scanner
GenericName=Configure a scanner
+StartupNotify=true
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.15.5/src/Scanner.ycp new/yast2-scanner-2.16.0/src/Scanner.ycp
--- old/yast2-scanner-2.15.5/src/Scanner.ycp 2007-07-19 16:01:06.000000000 +0200
+++ new/yast2-scanner-2.16.0/src/Scanner.ycp 2008-03-18 14:47:03.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Scanner settings, input and output functions
* Authors: Johannes Meixner
*
- * $Id: Scanner.ycp 39545 2007-07-19 14:01:06Z jsmeix $
+ * $Id: Scanner.ycp 45551 2008-03-18 13:47:02Z jsmeix $
*
* Representation of the configuration of scanner.
* Input and output routines.
@@ -23,6 +23,7 @@
import "Label";
import "Service";
import "SuSEFirewall";
+import "Arch";
/**
* Something was committed to the system?
@@ -325,15 +326,29 @@
// Message of a Report::Error
// Do not change or translate "iscan", it is a package name.
// Do not change or translate "i386", it is an architecture name.
- // Do not change or translate "x86_64", it is an architecture name.
- // Do not change or translate "AMD", it is a manufacturer name.
_("The package iscan should be installed
but it contains proprietary binary-only i386-only software.
-Therefore it is only available for i386-compatible architectures
-and it may cause problems on AMD 64-bit (x86_64) systems.
+Therefore it is only available for i386-compatible architectures.
Some scanners are also supported by another driver.
If you really want to install iscan, you must do it manually.
");
+ string iscan_64bit_message =
+ // Do not change or translate "iscan", it is a package name.
+ // Do not change or translate "x86_64", it is an architecture name.
+ // Do not change or translate "AMD", it is a manufacturer name.
+ // Do not change or translate "scanimage", it is a program name.
+ // Do not change or translate "xscanimage", it is a program name.
+ // Do not change or translate "xsane", it is a program name.
+ // Do not change or translate "kooka", it is a program name.
+_("Iscan is only available as 32-bit software.
+On AMD 64-bit (x86_64) systems the scanner driver in the iscan package
+works only if also the scanning user frontend is 32-bit software.
+You can use the special frontend /usr/bin/iscan for Epson scanners
+which is included in the iscan package.
+If you like to use a standard frontend like scanimage, xscanimage, xsane, or kooka,
+you must explicitely install the 32-bit package version
+(i.e. get the package from the right media or repository).
+");
if( Package::Installed( package_name ) )
{ return true;
}
@@ -355,6 +370,9 @@
// Finally on x86_64 the 32-bit iscan software cannot be used with the usual scanning frontends.
// Therefore there is only a message and the user must do the installation manually.
y2milestone( "No automated installation of proprietary iscan." );
+ if( Arch::x86_64() )
+ { iscan_message = iscan_message + "\n" + iscan_64bit_message;
+ }
Report::Error( iscan_message );
return 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.15.5/tools/create_scanner_database new/yast2-scanner-2.16.0/tools/create_scanner_database
--- old/yast2-scanner-2.15.5/tools/create_scanner_database 2007-07-19 15:47:21.000000000 +0200
+++ new/yast2-scanner-2.16.0/tools/create_scanner_database 2008-03-18 11:40:04.000000000 +0100
@@ -30,7 +30,6 @@
# At least the SANE description files must exist:
PACKAGE="sane-backends"
DESCRIPTION_FILES="/usr/share/sane/descriptions/*.desc"
-rpm -q $PACKAGE &>/dev/null || { echo "Error: Required package $PACKAGE is not installed." 1>&2 ; exit 2 ; }
ls $DESCRIPTION_FILES &>/dev/null || { echo "Error: Required SANE description files $DESCRIPTION_FILES not found." 1>&2 ; exit 3 ; }
# Write the package which is processed:
echo ":package \"$PACKAGE\"" >>$TMP_DATA
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.15.5/tools/test_and_set_scanner_access_permissions new/yast2-scanner-2.16.0/tools/test_and_set_scanner_access_permissions
--- old/yast2-scanner-2.15.5/tools/test_and_set_scanner_access_permissions 2007-07-19 15:47:21.000000000 +0200
+++ new/yast2-scanner-2.16.0/tools/test_and_set_scanner_access_permissions 2008-03-18 12:46:31.000000000 +0100
@@ -112,57 +112,73 @@
then # It is a USB scanner:
# Determine the USB vendor and product IDs:
BUS_DEVICE=$( echo $LINE | cut -d ':' -s -f 2- )
- VENDOR_PRODUCT=$( lsusb -s $BUS_DEVICE | grep -o 'ID [0-9A-Fa-f]*:[0-9A-Fa-f]*' | cut -b 4- )
+ VENDOR_PRODUCT=$( lsusb -s $BUS_DEVICE | tr '[:upper:]' '[:lower:]' | grep -o 'id [0-9a-f]*:[0-9a-f]*' | cut -b 4- )
VENDOR=$( echo $VENDOR_PRODUCT | cut -d ':' -s -f 1 )
PRODUCT=$( echo $VENDOR_PRODUCT | cut -d ':' -s -f 2 )
- # Make sure that both VENDOR and PRODUCT do not contain only zeroes:
- if echo $VENDOR | grep -q [1-9A-Fa-f] && echo $PRODUCT | grep -q [1-9A-Fa-f]
- then # Test if this scanner is not already listed in the global HAL file:
- if ! grep -i -A 1 "usb_device.vendor_id\" int=\"0x$VENDOR\"" $HAL_GLOBAL_FILE | grep -q -i "usb_device.product_id\" int=\"0x$PRODUCT\""
- then # Write an entry to the local HAL file:
- echo ' <match key="info.bus" string="usb_device">' >>$HAL_LOCAL_FILE
- echo " " >>$HAL_LOCAL_FILE
- echo " " >>$HAL_LOCAL_FILE
- echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE
- echo ' </match>' >>$HAL_LOCAL_FILE
- echo ' </match>' >>$HAL_LOCAL_FILE
- echo ' </match>' >>$HAL_LOCAL_FILE
- echo '' >>$HAL_LOCAL_FILE
- fi
- fi
+ # Skip scanners where VENDOR or PRODUCT contains only zeroes:
+ echo $VENDOR | grep -q [1-9a-f] || continue
+ echo $PRODUCT | grep -q [1-9a-f] || continue
+ # Skip scanners which are already listed in the global HAL file:
+ grep -i -A 1 "usb_device.vendor_id\" int=\"0x$VENDOR\"" $HAL_GLOBAL_FILE | grep -q -i "usb_device.product_id\" int=\"0x$PRODUCT\"" && continue
+ # Skip "SCSI via USB" scanners:
+ # There is a small number of USB scanners which are not talked to via libusb.
+ # They talk an unusual protocol which is a derivative of usb storage.
+ # User space should treat them as SCSI scanners.
+ # Furthermore, granting access via libusb here could oops the kernel.
+ # Therefore USB user access for those scanners must not be enabled.
+ # See the Novell/Suse Bugzilla bug
+ # https://bugzilla.novell.com/show_bug.cgi?id=341565
+ [ "04ce:0300" = "$VENDOR_PRODUCT" ] && continue
+ [ "05da:0094" = "$VENDOR_PRODUCT" ] && continue
+ [ "05da:0099" = "$VENDOR_PRODUCT" ] && continue
+ [ "05da:009a" = "$VENDOR_PRODUCT" ] && continue
+ [ "05da:00a0" = "$VENDOR_PRODUCT" ] && continue
+ [ "05da:00a3" = "$VENDOR_PRODUCT" ] && continue
+ [ "05da:80a3" = "$VENDOR_PRODUCT" ] && continue
+ [ "05da:80ac" = "$VENDOR_PRODUCT" ] && continue
+ [ "05da:00b6" = "$VENDOR_PRODUCT" ] && continue
+ # Write an entry to the local HAL file:
+ echo ' <match key="info.bus" string="usb_device">' >>$HAL_LOCAL_FILE
+ echo " " >>$HAL_LOCAL_FILE
+ echo " " >>$HAL_LOCAL_FILE
+ echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE
+ echo ' </match>' >>$HAL_LOCAL_FILE
+ echo ' </match>' >>$HAL_LOCAL_FILE
+ echo ' </match>' >>$HAL_LOCAL_FILE
+ echo '' >>$HAL_LOCAL_FILE
fi
if echo $LINE | grep -q '^/dev/sg[0-9][0-9]*$'
then # It is a SCSI scanner:
- # Test if this scanner does not show up as "scanner".
- # There are two know manufacturers where this happens: "HP" and "EPSON".
- # Some (all?) of their SCSI scanners show up as as "processor"
+ LSSCSI_LINE=$( lsscsi -g | grep $LINE )
+ # Skip scanners which show up as SCSI type "scanner" because those
+ # match to the generic SCSI entry in the global HAL file.
+ echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f2 | grep -q -i 'scanner' && continue
+ # There are two know manufacturers where SCSI scanners do not show up as "scanner":
+ # "HP" and "EPSON": Some (all?) of their SCSI scanners show up as as "processor"
# (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 | tr -s ' ' | cut -d ' ' -f2 | grep -q -i 'scanner'
- then # Test for the particular manufacturer:
- 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
- echo ' <match key="@info.parent:scsi.vendor" string="HP">' >>$HAL_LOCAL_FILE
- echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE
- echo ' </match>' >>$HAL_LOCAL_FILE
- echo ' </match>' >>$HAL_LOCAL_FILE
- echo ' </match>' >>$HAL_LOCAL_FILE
- echo '' >>$HAL_LOCAL_FILE
- fi
- 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
- echo ' <match key="@info.parent:scsi.vendor" string="EPSON">' >>$HAL_LOCAL_FILE
- echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE
- echo ' </match>' >>$HAL_LOCAL_FILE
- echo ' </match>' >>$HAL_LOCAL_FILE
- echo ' </match>' >>$HAL_LOCAL_FILE
- echo '' >>$HAL_LOCAL_FILE
- fi
+ # Test for the particular manufacturer:
+ 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
+ echo ' <match key="@info.parent:scsi.vendor" string="HP">' >>$HAL_LOCAL_FILE
+ echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE
+ echo ' </match>' >>$HAL_LOCAL_FILE
+ echo ' </match>' >>$HAL_LOCAL_FILE
+ echo ' </match>' >>$HAL_LOCAL_FILE
+ echo '' >>$HAL_LOCAL_FILE
+ fi
+ 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
+ echo ' <match key="@info.parent:scsi.vendor" string="EPSON">' >>$HAL_LOCAL_FILE
+ echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE
+ echo ' </match>' >>$HAL_LOCAL_FILE
+ echo ' </match>' >>$HAL_LOCAL_FILE
+ echo ' </match>' >>$HAL_LOCAL_FILE
+ echo '' >>$HAL_LOCAL_FILE
fi
fi
done
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.15.5/VERSION new/yast2-scanner-2.16.0/VERSION
--- old/yast2-scanner-2.15.5/VERSION 2007-07-19 15:50:49.000000000 +0200
+++ new/yast2-scanner-2.16.0/VERSION 2008-03-18 11:42:31.000000000 +0100
@@ -1 +1 @@
-2.15.5
+2.16.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org