Hello community,
here is the log from the commit of package yast2-scanner for openSUSE:11.1
checked in at Wed Dec 3 17:11:06 CET 2008.
--------
--- old-versions/11.1/all/yast2-scanner/yast2-scanner.changes 2008-11-21 12:38:35.000000000 +0100
+++ /mounts/work_src_done/11.1/yast2-scanner/yast2-scanner.changes 2008-12-03 14:34:05.741374000 +0100
@@ -1,0 +2,10 @@
+Wed Dec 3 11:37:38 CET 2008 - jsmeix@suse.de
+
+- V 2.17.4
+- Using /usr/share/hal/fdi/information/20thirdparty/70-scanner.fdi
+ instead of /etc/hal/fdi/policy/10osvendor/70-scanner.fdi
+ and /etc/hal/fdi/information/20thirdparty/80-scanner.fdi
+ instead of /etc/hal/fdi/policy/10osvendor/80-scanner.fdi
+ (see Novell/Suse Bugzilla bnc#438867).
+
+-------------------------------------------------------------------
calling whatdependson for 11.1-i586
Old:
----
yast2-scanner-2.17.3.tar.bz2
New:
----
yast2-scanner-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.r14207/_old 2008-12-03 17:10:54.000000000 +0100
+++ /var/tmp/diff_new_pack.r14207/_new 2008-12-03 17:10:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.17.3)
+# spec file for package yast2-scanner (Version 2.17.4)
#
# 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.3
-Release: 1
+Version: 2.17.4
+Release: 2
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.17.3.tar.bz2
+Source0: yast2-scanner-2.17.4.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.3
+%setup -n yast2-scanner-2.17.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -94,6 +94,13 @@
%{prefix}/lib/YaST2/bin/displaytest
%doc %{prefix}/share/doc/packages/yast2-scanner
%changelog
+* Wed Dec 03 2008 jsmeix@suse.de
+- V 2.17.4
+- Using /usr/share/hal/fdi/information/20thirdparty/70-scanner.fdi
+ instead of /etc/hal/fdi/policy/10osvendor/70-scanner.fdi
+ and /etc/hal/fdi/information/20thirdparty/80-scanner.fdi
+ instead of /etc/hal/fdi/policy/10osvendor/80-scanner.fdi
+ (see Novell/Suse Bugzilla bnc#438867).
* Fri Nov 21 2008 jsmeix@suse.de
- V 2.17.3
- Removed the "Cancel" button from the Overview dialog
++++++ yast2-scanner-2.17.3.tar.bz2 -> yast2-scanner-2.17.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.3/configure new/yast2-scanner-2.17.4/configure
--- old/yast2-scanner-2.17.3/configure 2008-11-21 11:57:50.000000000 +0100
+++ new/yast2-scanner-2.17.4/configure 2008-12-03 14:28:35.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.3.
+# Generated by GNU Autoconf 2.61 for yast2-scanner 2.17.4.
#
# 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.3'
-PACKAGE_STRING='yast2-scanner 2.17.3'
+PACKAGE_VERSION='2.17.4'
+PACKAGE_STRING='yast2-scanner 2.17.4'
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.3 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.17.4 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.3:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.17.4:";;
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.3
+yast2-scanner configure 2.17.4
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.3, which was
+It was created by yast2-scanner $as_me 2.17.4, 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.3'
+ VERSION='2.17.4'
cat >>confdefs.h <<_ACEOF
@@ -2678,7 +2678,7 @@
-VERSION="2.17.3"
+VERSION="2.17.4"
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.3, which was
+This file was extended by yast2-scanner $as_me 2.17.4, 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.3
+yast2-scanner config.status 2.17.4
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.3/configure.in new/yast2-scanner-2.17.4/configure.in
--- old/yast2-scanner-2.17.3/configure.in 2008-11-21 11:57:35.000000000 +0100
+++ new/yast2-scanner-2.17.4/configure.in 2008-12-03 14:28:20.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.3, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.17.4, 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.3"
+VERSION="2.17.4"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.3/src/Scanner.ycp new/yast2-scanner-2.17.4/src/Scanner.ycp
--- old/yast2-scanner-2.17.3/src/Scanner.ycp 2008-11-21 11:30:56.000000000 +0100
+++ new/yast2-scanner-2.17.4/src/Scanner.ycp 2008-12-03 14:33:48.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Scanner settings, input and output functions
* Authors: Johannes Meixner
*
- * $Id: Scanner.ycp 52876 2008-11-04 11:42:48Z jsmeix $
+ * $Id: Scanner.ycp 53840 2008-12-03 13:33:47Z jsmeix $
*
* Representation of the configuration of scanner.
* Input and output routines.
@@ -2398,8 +2398,9 @@
)
);
// Test if HAL knows the particular SANE device.
- // This writes also /etc/hal/fdi/policy/10osvendor/80-scanner.fdi
- // if the scanner is not listed in /etc/hal/fdi/policy/10osvendor/70-scanner.fdi
+ // This writes also /etc/hal/fdi/information/20thirdparty/80-scanner.fdi
+ // if the scanner is not listed in /usr/share/hal/fdi/information/20thirdparty/70-scanner.fdi
+ // (compare https://bugzilla.novell.com/show_bug.cgi?id=438867)
// which is perfectly o.k. because this could solve access permission issues
// automatically only by testing the device:
if( ! ExecuteBashCommand( test_and_set_scanner_access_permissions_commandline + " " + sane_device ) )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.3/tools/test_and_set_scanner_access_permissions new/yast2-scanner-2.17.4/tools/test_and_set_scanner_access_permissions
--- old/yast2-scanner-2.17.3/tools/test_and_set_scanner_access_permissions 2008-11-21 11:30:56.000000000 +0100
+++ new/yast2-scanner-2.17.4/tools/test_and_set_scanner_access_permissions 2008-12-03 13:19:28.000000000 +0100
@@ -9,12 +9,35 @@
export LANG="POSIX"
umask 022
-# When the package "sane" is installed, this file is created
-# which lists all known USB scanners:
-HAL_GLOBAL_FILE="/etc/hal/fdi/policy/10osvendor/70-scanner.fdi"
-# This file is written by this script for those scanners
-# which are not listed in HAL_GLOBAL_FILE:
-HAL_LOCAL_FILE="/etc/hal/fdi/policy/10osvendor/80-scanner.fdi"
+# When the package "sane" is installed, the HAL_GLOBAL_FILE is created
+# which lists all known USB scanners.
+# Up to openSUSE 11.0 it is /etc/hal/fdi/policy/10osvendor/70-scanner.fdi
+# since openSUSE 11.1 it is /usr/share/hal/fdi/information/20thirdparty/70-scanner.fdi
+# (see https://bugzilla.novell.com/show_bug.cgi?id=438867):
+HAL_GLOBAL_FILE="/dev/null"
+if test -r /usr/share/hal/fdi/information/20thirdparty/70-scanner.fdi
+then HAL_GLOBAL_FILE="/usr/share/hal/fdi/information/20thirdparty/70-scanner.fdi"
+else if test -r /etc/hal/fdi/policy/10osvendor/70-scanner.fdi
+ then HAL_GLOBAL_FILE="/etc/hal/fdi/policy/10osvendor/70-scanner.fdi"
+ fi
+fi
+# The HAL_LOCAL_FILE is written by this script for those scanners
+# which are not listed in HAL_GLOBAL_FILE.
+# Up to openSUSE 11.0 it was /etc/hal/fdi/policy/10osvendor/80-scanner.fdi
+# since openSUSE 11.1 it is /etc/hal/fdi/information/20thirdparty/80-scanner.fdi
+# (see https://bugzilla.novell.com/show_bug.cgi?id=438867).
+# Because /etc/hal/fdi/information/20thirdparty/80-scanner.fdi
+# should also work for openSUSE 11.0 it is used here in any case.
+# The directory /etc/hal/fdi/information/20thirdparty/ is not provided by the hal RPM
+# so that it is created with the usual default permissions "drwxr-xr-x root root"
+# as the directories in /etc/hal/fdi/ which are already provided by the hal RPM:
+HAL_LOCAL_FILE="/dev/null"
+if test -d /etc/hal/fdi/information/20thirdparty/
+then HAL_LOCAL_FILE="/etc/hal/fdi/information/20thirdparty/80-scanner.fdi"
+else if mkdir -m 755 -p /etc/hal/fdi/information/20thirdparty
+ then HAL_LOCAL_FILE="/etc/hal/fdi/information/20thirdparty/80-scanner.fdi"
+ fi
+fi
# Create temporary file names:
MY_NAME=${0##*/}
@@ -88,6 +111,7 @@
# Write header to HAL_LOCAL_FILE
# and exit silently if this fails for whatever reason
# (e.g. no hal package installed):
+[ "$HAL_LOCAL_FILE" = "/dev/null" ] && exit 0
cat /dev/null >$HAL_LOCAL_FILE || exit 0
echo '<?xml version="1.0" encoding="ISO-8859-1"?>' >>$HAL_LOCAL_FILE
echo '<deviceinfo version="0.2">' >>$HAL_LOCAL_FILE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.3/VERSION new/yast2-scanner-2.17.4/VERSION
--- old/yast2-scanner-2.17.3/VERSION 2008-11-21 11:46:46.000000000 +0100
+++ new/yast2-scanner-2.17.4/VERSION 2008-12-03 11:37:35.000000000 +0100
@@ -1 +1 @@
-2.17.3
+2.17.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org