Hello community,
here is the log from the commit of package yast2-scanner for openSUSE:11.1
checked in at Thu Dec 4 18:00:15 CET 2008.
--------
--- old-versions/11.1/all/yast2-scanner/yast2-scanner.changes 2008-12-03 14:34:05.000000000 +0100
+++ /mounts/work_src_done/11.1/yast2-scanner/yast2-scanner.changes 2008-12-04 12:50:39.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Dec 4 12:16:23 CET 2008 - jsmeix@suse.de
+
+- V 2.17.5
+- Since openSUSE 11.1 'usb_device' must be replaced by 'usb' in
+ HAL fdi files (see Novell/Suse Bugzilla bnc#438867).
+ Adapted test_and_set_scanner_access_permissions so that it
+ works for openSUSE 11.1 and is still to some extent
+ backward compatible with openSUSE 11.0.
+
+-------------------------------------------------------------------
calling whatdependson for 11.1-i586
Old:
----
yast2-scanner-2.17.4.tar.bz2
New:
----
yast2-scanner-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.ra9730/_old 2008-12-04 18:00:10.000000000 +0100
+++ /var/tmp/diff_new_pack.ra9730/_new 2008-12-04 18:00:10.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.17.4)
+# spec file for package yast2-scanner (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://en.opensuse.org/YaST
Name: yast2-scanner
-Version: 2.17.4
+Version: 2.17.5
Release: 2
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.17.4.tar.bz2
+Source0: yast2-scanner-2.17.5.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files xorg-x11-libX11-devel yast2 yast2-devtools yast2-testsuite
Requires: yast2
@@ -53,7 +53,7 @@
Johannes Meixner
%prep
-%setup -n yast2-scanner-2.17.4
+%setup -n yast2-scanner-2.17.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -93,7 +93,15 @@
%{prefix}/lib/YaST2/bin/*scanner*
%{prefix}/lib/YaST2/bin/displaytest
%doc %{prefix}/share/doc/packages/yast2-scanner
+
%changelog
+* Thu Dec 04 2008 jsmeix@suse.de
+- V 2.17.5
+- Since openSUSE 11.1 'usb_device' must be replaced by 'usb' in
+ HAL fdi files (see Novell/Suse Bugzilla bnc#438867).
+ Adapted test_and_set_scanner_access_permissions so that it
+ works for openSUSE 11.1 and is still to some extent
+ backward compatible with openSUSE 11.0.
* Wed Dec 03 2008 jsmeix@suse.de
- V 2.17.4
- Using /usr/share/hal/fdi/information/20thirdparty/70-scanner.fdi
++++++ yast2-scanner-2.17.4.tar.bz2 -> yast2-scanner-2.17.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.4/configure new/yast2-scanner-2.17.5/configure
--- old/yast2-scanner-2.17.4/configure 2008-12-03 14:28:35.000000000 +0100
+++ new/yast2-scanner-2.17.5/configure 2008-12-04 12:21:56.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-scanner 2.17.4.
+# Generated by GNU Autoconf 2.61 for yast2-scanner 2.17.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-scanner'
PACKAGE_TARNAME='yast2-scanner'
-PACKAGE_VERSION='2.17.4'
-PACKAGE_STRING='yast2-scanner 2.17.4'
+PACKAGE_VERSION='2.17.5'
+PACKAGE_STRING='yast2-scanner 2.17.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1438,7 +1438,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.17.4 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.17.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1509,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-scanner 2.17.4:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.17.5:";;
esac
cat <<\_ACEOF
@@ -1615,7 +1615,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-scanner configure 2.17.4
+yast2-scanner configure 2.17.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1629,7 +1629,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.17.4, which was
+It was created by yast2-scanner $as_me 2.17.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2450,7 +2450,7 @@
# Define the identity of the package.
PACKAGE='yast2-scanner'
- VERSION='2.17.4'
+ VERSION='2.17.5'
cat >>confdefs.h <<_ACEOF
@@ -2678,7 +2678,7 @@
-VERSION="2.17.4"
+VERSION="2.17.5"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
@@ -22553,7 +22553,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.17.4, which was
+This file was extended by yast2-scanner $as_me 2.17.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22606,7 +22606,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-scanner config.status 2.17.4
+yast2-scanner config.status 2.17.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.4/configure.in new/yast2-scanner-2.17.5/configure.in
--- old/yast2-scanner-2.17.4/configure.in 2008-12-03 14:28:20.000000000 +0100
+++ new/yast2-scanner-2.17.5/configure.in 2008-12-04 12:21:41.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-scanner, 2.17.4, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.17.5, http://bugs.opensuse.org/, yast2-scanner)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.4"
+VERSION="2.17.5"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.4/tools/test_and_set_scanner_access_permissions new/yast2-scanner-2.17.5/tools/test_and_set_scanner_access_permissions
--- old/yast2-scanner-2.17.4/tools/test_and_set_scanner_access_permissions 2008-12-03 13:19:28.000000000 +0100
+++ new/yast2-scanner-2.17.5/tools/test_and_set_scanner_access_permissions 2008-12-04 12:16:14.000000000 +0100
@@ -118,15 +118,19 @@
echo ' <device>' >>$HAL_LOCAL_FILE
echo '' >>$HAL_LOCAL_FILE
echo '<!-- To grant access to USB scanners create entries like:' >>$HAL_LOCAL_FILE
-echo ' <match key="info.subsystem" string="usb_device">' >>$HAL_LOCAL_FILE
-echo ' <match key="usb_device.vendor_id" int="0x1a2b">' >>$HAL_LOCAL_FILE
-echo ' <match key="usb_device.product_id" int="0x3c4d">' >>$HAL_LOCAL_FILE
+echo ' <match key="info.subsystem" string="usb">' >>$HAL_LOCAL_FILE
+echo ' <match key="usb.vendor_id" int="0x1a2b">' >>$HAL_LOCAL_FILE
+echo ' <match key="usb.product_id" int="0x3c4d">' >>$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 '"1a2b" and "3c4d" stand for the USB device IDs' >>$HAL_LOCAL_FILE
-echo 'as displayed by the command /usr/sbin/lsusb -->' >>$HAL_LOCAL_FILE
+echo 'as displayed by the command /usr/sbin/lsusb' >>$HAL_LOCAL_FILE
+echo 'Up to openSUSE 11.0 replace "usb" with "usb_device" i.e. use' >>$HAL_LOCAL_FILE
+echo 'string="usb_device", usb_device.vendor_id, usb_device.product_id' >>$HAL_LOCAL_FILE
+echo 'Since openSUSE 11.1 "usb_device" is replaced by "usb"' >>$HAL_LOCAL_FILE
+echo 'see https://bugzilla.novell.com/show_bug.cgi?id=438867 -->' >>$HAL_LOCAL_FILE
echo '' >>$HAL_LOCAL_FILE
# Setting extglob is required to remove an arbitrary number
@@ -184,11 +188,14 @@
# The "scanner" capability is not yet known to HAL:
UNKNOWN_TO_HAL="$UNKNOWN_TO_HAL USB-ID(hex)=$VENDOR_PRODUCT"
# Skip scanners which are already listed in the global HAL file:
+ # Up to openSUSE 11.0 the keys were usb_device.vendor_id and usb_device.product_id in HAL_GLOBAL_FILE
+ # since openSUSE 11.1 the keys are usb.vendor_id and usb.product_id in HAL_GLOBAL_FILE:
+ grep -i -A 1 "usb.vendor_id\" int=\"0x$VENDOR\"" $HAL_GLOBAL_FILE | grep -q -i "usb.product_id\" int=\"0x$PRODUCT\"" && continue
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
# Write an entry to the local HAL file:
- echo ' <match key="info.subsystem" string="usb_device">' >>$HAL_LOCAL_FILE
- echo " " >>$HAL_LOCAL_FILE
- echo " " >>$HAL_LOCAL_FILE
+ echo ' <match key="info.subsystem" string="usb">' >>$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
@@ -258,14 +265,15 @@
do echo " $m" 1>&2
done
echo "" 1>&2
- echo "To access the scanner as normal user," 1>&2
- echo "udev, HAL, and hal-resmgr are needed to grant" 1>&2
+ echo "To access a scanner as normal user," 1>&2
+ echo "udev and HAL are needed to grant" 1>&2
echo "appropriate access permissions automatically." 1>&2
+ echo "(Up to openSUSE 11.0 hal-resmgr is also needed.)" 1>&2
echo "Therefore the scanner model must be known to HAL." 1>&2
echo "If the scanner is not known to HAL, a re-plug" 1>&2
echo "of a USB scanner should help." 1>&2
echo "Otherwise a reboot should be done to restart" 1>&2
- echo "the whole udev/HAL/hal-resmgr machinery." 1>&2
+ echo "the whole udev and HAL machinery." 1>&2
echo "Check if the scanner is listed in the 'lshal' output." 1>&2
echo "If a SCSI scanner which was switched on during boot" 1>&2
echo "is not listed in the 'lshal' output, the usual reason" 1>&2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.4/VERSION new/yast2-scanner-2.17.5/VERSION
--- old/yast2-scanner-2.17.4/VERSION 2008-12-03 11:37:35.000000000 +0100
+++ new/yast2-scanner-2.17.5/VERSION 2008-12-04 12:16:20.000000000 +0100
@@ -1 +1 @@
-2.17.4
+2.17.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
