Hello community,
here is the log from the commit of package yast2-scanner
checked in at Thu Jun 21 22:05:45 CEST 2007.
--------
--- yast2-scanner/yast2-scanner.changes 2007-06-13 16:08:30.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-scanner/yast2-scanner.changes 2007-06-21 15:24:24.842572000 +0200
@@ -1,0 +2,7 @@
+Thu Jun 21 15:12:27 CEST 2007 - jsmeix@suse.de
+
+- V 2.15.3
+- Adapted test_and_set_scanner_access_permissions to be prepared
+ for HPLIP version 2.x.
+
+-------------------------------------------------------------------
Old:
----
yast2-scanner-2.15.2.tar.bz2
New:
----
yast2-scanner-2.15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.N28825/_old 2007-06-21 22:04:11.000000000 +0200
+++ /var/tmp/diff_new_pack.N28825/_new 2007-06-21 22:04:11.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.15.2)
+# spec file for package yast2-scanner (Version 2.15.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-scanner
URL: http://en.opensuse.org/YaST
-Version: 2.15.2
+Version: 2.15.3
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.15.2.tar.bz2
+Source0: yast2-scanner-2.15.3.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
@@ -42,7 +42,7 @@
Johannes Meixner
%prep
-%setup -n yast2-scanner-2.15.2
+%setup -n yast2-scanner-2.15.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +76,10 @@
%doc %{prefix}/share/doc/packages/yast2-scanner
%changelog
+* Thu Jun 21 2007 - jsmeix@suse.de
+- V 2.15.3
+- Adapted test_and_set_scanner_access_permissions to be prepared
+ for HPLIP version 2.x.
* Wed Jun 13 2007 - jsmeix@suse.de
- V 2.15.2
- Adapted test_and_set_scanner_access_permissions according to the
++++++ yast2-scanner-2.15.2.tar.bz2 -> yast2-scanner-2.15.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.15.2/configure new/yast2-scanner-2.15.3/configure
--- old/yast2-scanner-2.15.2/configure 2007-06-13 16:04:54.000000000 +0200
+++ new/yast2-scanner-2.15.3/configure 2007-06-21 15:13:23.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-scanner 2.15.2.
+# Generated by GNU Autoconf 2.60 for yast2-scanner 2.15.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-scanner'
PACKAGE_TARNAME='yast2-scanner'
-PACKAGE_VERSION='2.15.2'
-PACKAGE_STRING='yast2-scanner 2.15.2'
+PACKAGE_VERSION='2.15.3'
+PACKAGE_STRING='yast2-scanner 2.15.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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.15.2 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.15.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-scanner 2.15.2:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.15.3:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-scanner configure 2.15.2
+yast2-scanner configure 2.15.3
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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.15.2, which was
+It was created by yast2-scanner $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-scanner'
- VERSION='2.15.2'
+ VERSION='2.15.3'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.2"
+VERSION="2.15.3"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-scanner $as_me 2.15.2, which was
+This file was extended by yast2-scanner $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-scanner config.status 2.15.2
+yast2-scanner config.status 2.15.3
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.15.2/configure.in new/yast2-scanner-2.15.3/configure.in
--- old/yast2-scanner-2.15.2/configure.in 2007-06-13 16:04:49.000000000 +0200
+++ new/yast2-scanner-2.15.3/configure.in 2007-06-21 15:13:19.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-scanner, 2.15.2, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.15.3, 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.2"
+VERSION="2.15.3"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.15.2/tools/test_and_set_scanner_access_permissions new/yast2-scanner-2.15.3/tools/test_and_set_scanner_access_permissions
--- old/yast2-scanner-2.15.2/tools/test_and_set_scanner_access_permissions 2007-06-13 16:02:08.000000000 +0200
+++ new/yast2-scanner-2.15.3/tools/test_and_set_scanner_access_permissions 2007-06-21 15:12:03.000000000 +0200
@@ -43,17 +43,47 @@
exit 2
fi
fi
-# Split it into seperated lines, remove the SANE backend name, and remove duplicates
-# (duplicates happen when different SANE backends are active for the same scanner):
-tr ';' '\n' <$TMP_DATA_RAW | cut -d ':' -s -f 2- | sort -u >$TMP_DATA
+# Split it into seperated lines, remove the SANE backend name if it is a usual SANE backend,
+# substitute the 'hpaio:/usb/' backend name with ':hpaio:/usb/' to keep this backend name
+# because it is needed later to match the SANE device from the 'hp-makeuri -s' command,
+# and remove duplicates which happen when different backends are active for the same scanner:
+tr ';' '\n' <$TMP_DATA_RAW | sed -e 's/^hpaio:\/usb\//:hpaio:\/usb\//' | cut -d ':' -s -f 2- | sort -u >$TMP_DATA
# TMP_DATA should contain lines with plain device infos for scanners like
# libusb:001:002
# libusb:004:005
+# hpaio:/usb/HP_LaserJet_1220?serial=00XXXXXXXXXX
# /dev/sg0
# /dev/sg2
+# and random useless stuff e.g. when the net backend is used on localhost
+# or for network scanners via the 'hpaio:/net/...' backend like
+# localhost:hpaio:/usb/HP_LaserJet_1220?serial=00XXXXXXXXXX
+# localhost:plustek:libusb:001:005
+# /net/Officejet_7200_series?ip=10.10.100.100
# A detailed syntax check is not done here because it happens later,
# see "Test for USB and SCSI scanners and ignore anything else" below.
+# For each 'hpaio:/usb/<model-string>' line output a matching 'libusb:<bus>:<device>' line:
+# List all HP USB devices, extract the bus and device number,
+# use 'hp-makeuri -s' to make the SANE device (ignore error messages on stderr
+# which happen for plain HP printers like 'error: Device does not support scan.'
+# or may happen for whatever else USB devices like 'error: Device not found'),
+# and if the SANE device from 'hp-makeuri -s' is found in TMP_DATA,
+# append a matching 'libusb:<bus>:<device>' line to TMP_DATA.
+# Duplicate 'libusb:<bus>:<device>' lines could happen regardless that
+# the BusDevice values are unique (because the lsusb output is unique)
+# because another backend might have already reported a HP USB scanner.
+# Skip this section if hp-makeuri cannot be executed for whatever reason.
+if [ -x /usr/bin/hp-makeuri ]
+then for BusDevice in $( lsusb -d 03f0: | cut -d ' ' -f 2,4 | tr ' :' ': ' )
+ do for URI in $( hp-makeuri -s $BusDevice 2>/dev/null)
+ do if grep -q "^$URI\$" $TMP_DATA
+ then grep -q "^libusb:$BusDevice\$" $TMP_DATA || echo libusb:$BusDevice >>$TMP_DATA
+ fi
+ done
+ done
+else echo "Cannot execute /usr/bin/hp-makeuri" 1>&2
+fi
+
# Write header to HAL_LOCAL_FILE
# and exit silently if this fails for whatever reason
# (e.g. no hal package installed):
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.15.2/VERSION new/yast2-scanner-2.15.3/VERSION
--- old/yast2-scanner-2.15.2/VERSION 2007-06-13 15:00:33.000000000 +0200
+++ new/yast2-scanner-2.15.3/VERSION 2007-06-21 15:12:20.000000000 +0200
@@ -1 +1 @@
-2.15.2
+2.15.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org