Hello community,
here is the log from the commit of package yast2-scanner
checked in at Fri Mar 21 01:28:07 CET 2008.
--------
--- yast2-scanner/yast2-scanner.changes 2008-03-18 14:49:35.000000000 +0100
+++ yast2-scanner/yast2-scanner.changes 2008-03-19 17:25:05.929365000 +0100
@@ -1,0 +2,10 @@
+Wed Mar 19 16:45:38 CET 2008 - jsmeix@suse.de
+
+- V 2.16.1
+- Added hint how to set up HP all-in-one network scanners
+ to the help text (see Novell/Suse Bugzilla bnc#310476).
+- Replaced the "scanimage -d ... -T" test
+ by "scanimage -d ... -v >/dev/null"
+ (see Novell/Suse Bugzilla bnc#344534).
+
+-------------------------------------------------------------------
Old:
----
yast2-scanner-2.16.0.tar.bz2
New:
----
yast2-scanner-2.16.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.x12731/_old 2008-03-21 01:27:13.000000000 +0100
+++ /var/tmp/diff_new_pack.x12731/_new 2008-03-21 01:27:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.16.0)
+# spec file for package yast2-scanner (Version 2.16.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,12 +13,12 @@
Url: http://en.opensuse.org/YaST
Name: yast2-scanner
-Version: 2.16.0
+Version: 2.16.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.16.0.tar.bz2
+Source0: yast2-scanner-2.16.1.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
@@ -43,7 +43,7 @@
Johannes Meixner
%prep
-%setup -n yast2-scanner-2.16.0
+%setup -n yast2-scanner-2.16.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +76,13 @@
%{prefix}/lib/YaST2/bin/*scanner*
%doc %{prefix}/share/doc/packages/yast2-scanner
%changelog
+* Wed Mar 19 2008 jsmeix@suse.de
+- V 2.16.1
+- Added hint how to set up HP all-in-one network scanners
+ to the help text (see Novell/Suse Bugzilla bnc#310476).
+- Replaced the "scanimage -d ... -T" test
+ by "scanimage -d ... -v >/dev/null"
+ (see Novell/Suse Bugzilla bnc#344534).
* Tue Mar 18 2008 jsmeix@suse.de
- V 2.16.0
- Removed the RPM test for "sane-backends" from
++++++ yast2-scanner-2.16.0.tar.bz2 -> yast2-scanner-2.16.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.16.0/configure new/yast2-scanner-2.16.1/configure
--- old/yast2-scanner-2.16.0/configure 2008-03-18 14:35:15.000000000 +0100
+++ new/yast2-scanner-2.16.1/configure 2008-03-19 17:07:25.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.16.0.
+# Generated by GNU Autoconf 2.61 for yast2-scanner 2.16.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-scanner'
PACKAGE_TARNAME='yast2-scanner'
-PACKAGE_VERSION='2.16.0'
-PACKAGE_STRING='yast2-scanner 2.16.0'
+PACKAGE_VERSION='2.16.1'
+PACKAGE_STRING='yast2-scanner 2.16.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.16.0 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.16.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-scanner 2.16.0:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.16.1:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-scanner configure 2.16.0
+yast2-scanner configure 2.16.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.16.0, which was
+It was created by yast2-scanner $as_me 2.16.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-scanner'
- VERSION='2.16.0'
+ VERSION='2.16.1'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.16.0"
+VERSION="2.16.1"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
@@ -3303,7 +3303,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.16.0, which was
+This file was extended by yast2-scanner $as_me 2.16.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3346,7 +3346,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-scanner config.status 2.16.0
+yast2-scanner config.status 2.16.1
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.16.0/configure.in new/yast2-scanner-2.16.1/configure.in
--- old/yast2-scanner-2.16.0/configure.in 2008-03-18 14:35:11.000000000 +0100
+++ new/yast2-scanner-2.16.1/configure.in 2008-03-19 17:07:22.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-scanner, 2.16.0, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.16.1, 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.16.0"
+VERSION="2.16.1"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.16.0/src/helps.ycp new/yast2-scanner-2.16.1/src/helps.ycp
--- old/yast2-scanner-2.16.0/src/helps.ycp 2008-03-18 11:38:11.000000000 +0100
+++ new/yast2-scanner-2.16.1/src/helps.ycp 2008-03-19 17:24:28.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Johannes Meixner
*
- * $Id: helps.ycp 39495 2007-07-18 10:35:58Z jsmeix $
+ * $Id: helps.ycp 45625 2008-03-19 16:24:28Z jsmeix $
*/
{
@@ -47,7 +47,7 @@
// Do not change or translate "HP", it is a manufacturer name.
// Do not change or translate "OfficeJet", it is a model name.
// Do not change or translate "PSC", it is a model (Printer Scanner Copier) name.
-// Do not change or translate "/usr/sbin/lsusb", it is a command name.
+// Do not change or translate "lsusb", it is a command name.
_("<p>
A normal USB scanner should be detected automatically.
It might happen that particular USB devices which are no scanners are shown too
@@ -58,7 +58,7 @@
In particular, HP all-in-one devices, such as OfficeJets and PSCs,
are not detected, but can be configured this way.
If you have difficulties configuring your scanner here,
-check whether it appears in the output of <tt>/usr/sbin/lsusb</tt>.
+check whether it appears in the output of <tt>lsusb</tt>.
If it is not listed there, the USB system cannot communicate with the scanner.
</p>") +
// Overview dialog help 4/8:
@@ -81,13 +81,19 @@
// or with a "remote scanner" (i.e. a scanner which is connected to another host in the network).
// Do not confuse "scanning via network" (i.e. use a remote scanner via another host in the network)
// with "scanning the network" (i.e. scan the network for other hosts or services).
+// Do not change or translate "hp-setup", it is a command name.
_("<p>
-Network scanners cannot be configured with this tool.
-These devices must be configured manually.
+Network scanners cannot be configured with this tool
+except for HP all-in-one devices.
+Network scanners must be configured manually.
A network scanner is a scanner that has a network interface
so it is directly accessible in the network.
In contrast, scanning via network means accessing a remote scanner
connected to another host in the network.
+To set up the scanner unit in a HP all-in-one device
+which is connected via a built-in network interface,
+first run <tt>hp-setup</tt> as root, then you can configure
+the scanner unit with this tool using <b>Add</b>.
</p>") +
// Overview dialog help 7/8:
// Do not confuse "scanning via network" (i.e. use a remote scanner via another host in the network)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.16.0/src/Scanner.ycp new/yast2-scanner-2.16.1/src/Scanner.ycp
--- old/yast2-scanner-2.16.0/src/Scanner.ycp 2008-03-18 14:47:03.000000000 +0100
+++ new/yast2-scanner-2.16.1/src/Scanner.ycp 2008-03-19 17:24:28.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Scanner settings, input and output functions
* Authors: Johannes Meixner
*
- * $Id: Scanner.ycp 45551 2008-03-18 13:47:02Z jsmeix $
+ * $Id: Scanner.ycp 45625 2008-03-19 16:24:28Z jsmeix $
*
* Representation of the configuration of scanner.
* Input and output routines.
@@ -2061,8 +2061,8 @@
Popup::ShowFeedback( sformat( // Header of a Popup::ShowFeedback where %1 will be replaced by the driver name:
_("Testing %1"), backend_name ),
// Body of a Popup::ShowFeedback where %1 will be replaced by the SANE device identifier.
- // Do not change or translate "scanimage -d %1 -T", it is a fixed command.
- sformat( _("Testing with 'scanimage -d %1 -T'..."),
+ // Do not change or translate "scanimage -d %1 -v", it is a fixed command.
+ sformat( _("Testing with 'scanimage -d %1 -v'..."),
sane_device
)
);
@@ -2072,8 +2072,8 @@
// %1 will be replaced by the SANE device identifier
// %2 will be replaced by the actual test results
// which are usually only available in English.
- // Do not change or translate "scanimage -d %1 -T", it is a fixed command.
- _("Test with 'scanimage -d %1 -T' failed.\nThe results are:\n\n%2"),
+ // Do not change or translate "scanimage -d %1 -v", it is a fixed command.
+ _("Test with 'scanimage -d %1 -v' failed.\nThe results are:\n\n%2"),
sane_device,
// Fallback message if the real results are missing:
result["stderr"]:_("(no results available)")
@@ -2096,8 +2096,8 @@
// %1 will be replaced by the SANE device identifier
// %2 will be replaced by the actual test results
// which are usually only available in English.
- // Do not change or translate "scanimage -d %1 -T", it is a fixed command.
- _("Test with 'scanimage -d %1 -T' succeeded.\nThe results are:\n\n%2"),
+ // Do not change or translate "scanimage -d %1 -v", it is a fixed command.
+ _("Test with 'scanimage -d %1 -v' succeeded.\nThe results are:\n\n%2"),
sane_device,
// Fallback message if the real results are missing:
result["stderr"]:_("(no results available)")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.16.0/tools/test_scanner_backend new/yast2-scanner-2.16.1/tools/test_scanner_backend
--- old/yast2-scanner-2.16.0/tools/test_scanner_backend 2008-03-18 11:38:10.000000000 +0100
+++ new/yast2-scanner-2.16.1/tools/test_scanner_backend 2008-03-19 16:44:47.000000000 +0100
@@ -10,22 +10,30 @@
umask 022
MY_NAME=${0##*/}
-BACKEND="$1"
-[ -z "$BACKEND" ] && { echo -en "\nUsage:\n$MY_NAME backend\n" 1>&2 ; exit 1 ; }
+SANE_DEVICE="$1"
+[ -z "$SANE_DEVICE" ] && { echo -en "\nUsage:\n$MY_NAME SANE_device\n" 1>&2 ; exit 1 ; }
-MAXIMUM_WAIT="120"
-# The exit code of "scanimage -d $BACKEND -T" is needed as exit code of this script.
+# The test via "scanimage -d $SANE_DEVICE -T" does not work for any backend
+# because it tries using a variety of buffer sizes during the data transfer,
+# followed by a cancel instead of completing the scan.
+# This might put some scanners/backends into an inconsistent state,
+# when they do not properly implement the cancel, see the Novell/Suse Bugzilla bug
+# https://bugzilla.novell.com/show_bug.cgi?id=344534
+# Therefore the test is done via "scanimage -d $SANE_DEVICE -v >/dev/null"
+# which does a complete scan and "-v" provides some basic info what it does.
+# The exit code of "scanimage" is needed as exit code of this script.
# Therefore this command must run in the foreground.
# Therefore a simple time bomb background process is started before it.
-# This time bomb background process process is normally killed at the end.
+# This time bomb background process is normally killed at the end.
# As a signal is processed not until a "sleep" has finished,
# it is crucial not to do simply "sleep $MAXIMUM_WAIT"
# but to do "for i in $( seq $MAXIMUM_WAIT ) ; do sleep 1 ; done"
# otherwise it would wait in any case until "sleep $MAXIMUM_WAIT" has finished.
+MAXIMUM_WAIT="120"
if [ -x /usr/bin/scanimage ]
then ( for i in $( seq $MAXIMUM_WAIT ) ; do sleep 1 ; done ; killall -9 scanimage &>/dev/null ) &
timebombPID=$!
- scanimage -d $BACKEND -T
+ scanimage -d $SANE_DEVICE -v >/dev/null
scanimageEXIT=$?
# If the timebomb is still running, scanimage has finished
# and killing the timebomb will be successful.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.16.0/VERSION new/yast2-scanner-2.16.1/VERSION
--- old/yast2-scanner-2.16.0/VERSION 2008-03-18 11:42:31.000000000 +0100
+++ new/yast2-scanner-2.16.1/VERSION 2008-03-19 17:07:14.000000000 +0100
@@ -1 +1 @@
-2.16.0
+2.16.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org