Hello community,
here is the log from the commit of package yast2-scanner
checked in at Tue Nov 7 13:09:54 CET 2006.
--------
--- yast2-scanner/yast2-scanner.changes 2006-11-06 15:45:06.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-scanner/yast2-scanner.changes 2006-11-07 09:42:46.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Nov 7 09:09:50 CET 2006 - jsmeix@suse.de
+
+- V 2.14.6
+- Improved when the the info regarding outdated hpoj pops up.
+ Moved it from the ActivateBackend function directly into the
+ SelectModelDialog which avoids that the user must go "Back"
+ to the SelectModelDialog to select the up-to-date hpaio driver.
+- Added a help text regarding the most often reported problem
+ regarding scanner setup (a driver is set up but no scanner
+ is recognized by the driver).
+
+-------------------------------------------------------------------
Old:
----
yast2-scanner-2.14.5.tar.bz2
New:
----
yast2-scanner-2.14.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.ioTm3p/_old 2006-11-07 13:08:41.000000000 +0100
+++ /var/tmp/diff_new_pack.ioTm3p/_new 2006-11-07 13:08:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.14.5)
+# spec file for package yast2-scanner (Version 2.14.6)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-scanner
-Version: 2.14.5
+Version: 2.14.6
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.14.5.tar.bz2
+Source0: yast2-scanner-2.14.6.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
@@ -41,7 +41,7 @@
Johannes Meixner
%prep
-%setup -n yast2-scanner-2.14.5
+%setup -n yast2-scanner-2.14.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,6 +75,15 @@
%doc %{prefix}/share/doc/packages/yast2-scanner
%changelog -n yast2-scanner
+* Tue Nov 07 2006 - jsmeix@suse.de
+- V 2.14.6
+- Improved when the the info regarding outdated hpoj pops up.
+ Moved it from the ActivateBackend function directly into the
+ SelectModelDialog which avoids that the user must go "Back"
+ to the SelectModelDialog to select the up-to-date hpaio driver.
+- Added a help text regarding the most often reported problem
+ regarding scanner setup (a driver is set up but no scanner
+ is recognized by the driver).
* Mon Nov 06 2006 - jsmeix@suse.de
- V 2.14.5
- Improved test_and_set_scanner_access_permissions to make
++++++ yast2-scanner-2.14.5.tar.bz2 -> yast2-scanner-2.14.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.5/VERSION new/yast2-scanner-2.14.6/VERSION
--- old/yast2-scanner-2.14.5/VERSION 2006-11-06 15:22:45.000000000 +0100
+++ new/yast2-scanner-2.14.6/VERSION 2006-11-07 09:09:47.000000000 +0100
@@ -1 +1 @@
-2.14.5
+2.14.6
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.5/configure new/yast2-scanner-2.14.6/configure
--- old/yast2-scanner-2.14.5/configure 2006-11-06 15:33:43.000000000 +0100
+++ new/yast2-scanner-2.14.6/configure 2006-11-07 09:14:58.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.5.
+# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-scanner'
PACKAGE_TARNAME='yast2-scanner'
-PACKAGE_VERSION='2.14.5'
-PACKAGE_STRING='yast2-scanner 2.14.5'
+PACKAGE_VERSION='2.14.6'
+PACKAGE_STRING='yast2-scanner 2.14.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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.14.5 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.14.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-scanner 2.14.5:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.14.6:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-scanner configure 2.14.5
+yast2-scanner configure 2.14.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.14.5, which was
+It was created by yast2-scanner $as_me 2.14.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-scanner'
- VERSION='2.14.5'
+ VERSION='2.14.6'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.14.5"
+VERSION="2.14.6"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-scanner $as_me 2.14.5, which was
+This file was extended by yast2-scanner $as_me 2.14.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-scanner config.status 2.14.5
+yast2-scanner config.status 2.14.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.5/configure.in new/yast2-scanner-2.14.6/configure.in
--- old/yast2-scanner-2.14.5/configure.in 2006-11-06 15:33:40.000000000 +0100
+++ new/yast2-scanner-2.14.6/configure.in 2006-11-07 09:14:54.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-scanner, 2.14.5, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.14.6, 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.14.5"
+VERSION="2.14.6"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.5/src/Scanner.ycp new/yast2-scanner-2.14.6/src/Scanner.ycp
--- old/yast2-scanner-2.14.5/src/Scanner.ycp 2006-11-06 15:44:41.000000000 +0100
+++ new/yast2-scanner-2.14.6/src/Scanner.ycp 2006-11-07 09:42:05.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Scanner settings, input and output functions
* Authors: Johannes Meixner
*
- * $Id: Scanner.ycp 34095 2006-11-06 14:44:37Z jsmeix $
+ * $Id: Scanner.ycp 34110 2006-11-07 08:42:03Z jsmeix $
*
* Representation of the configuration of scanner.
* Input and output routines.
@@ -1372,13 +1372,6 @@
Instead use hpoj to set up the scanner.
Alternatively proceed and change the printer configuration to use the hplip service.
");
- string hpoj_outdated_message =
- // Message of a Popup::ContinueCancel for scanners which should be set up with the hpoj driver
- // Do not change or translate "hpoj", it is a driver name.
- // Do not change or translate "hpaio", it is a driver name.
-_("The hpoj driver should still work but it is outdated and no longer maintained.
-To use the up-to-date driver hpaio, cancel now and go back and select the driver hpaio.
-");
string hpoj_message =
// Message of a Popup::YesNo for scanners which should be set up with the hpoj driver
// Do not change or translate "hpoj", it is a driver name.
@@ -1426,17 +1419,6 @@
return false;
}
}
- // Tell the user about the outdated hpoj backend:
- if( "hpoj" == backend_name
- && user_confirmation
- )
- { if( ! Popup::ContinueCancel( hpoj_outdated_message ) )
- { // The user has decided to cancel the set up of the outdated hpoj backend:
- y2milestone( "Set up outdated hpoj backend cancelled by user." );
- // Return true because actually nothing failed here:
- return true;
- }
- }
// To be safe assume that something will really be modified.
// If there is in fact nothing modified, it doesn't harm if 'modified' is 'true':
modified = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.5/src/dialogs.ycp new/yast2-scanner-2.14.6/src/dialogs.ycp
--- old/yast2-scanner-2.14.5/src/dialogs.ycp 2006-11-06 15:44:41.000000000 +0100
+++ new/yast2-scanner-2.14.6/src/dialogs.ycp 2006-11-07 09:42:05.000000000 +0100
@@ -4,8 +4,8 @@
* Summary: Dialogs definitions
* Authors: Johannes Meixner
*
- * $Id: dialogs.ycp 34095 2006-11-06 14:44:37Z jsmeix $
- * $Id: dialogs.ycp 34095 2006-11-06 14:44:37Z jsmeix $
+ * $Id: dialogs.ycp 34110 2006-11-07 08:42:03Z jsmeix $
+ * $Id: dialogs.ycp 34110 2006-11-07 08:42:03Z jsmeix $
*/
{
@@ -628,10 +628,10 @@
&& ! Arch::i386()
)
{ if( ! Arch::x86_64() )
- { Popup::AnyMessage( // Header of a Popup::AnyMessage when the epkowa backend was selected
+ { Popup::AnyMessage( // Header of a Popup::AnyMessage when the epkowa driver was selected
// on a non-i386-compatible architecture (i.e. neither i386 nor x86_64).
_("Unsupported Driver"),
- // Body of a Popup::AnyMessage when the epkowa backend was selected
+ // Body of a Popup::AnyMessage when the epkowa driver was selected
// on a non-i386-compatible architecture (i.e. neither i386 nor x86_64).
// Do not change or translate "epkowa", it is a driver name.
// Do not change or translate "iscan", it is a package name.
@@ -640,13 +640,36 @@
);
continue;
}
- Popup::AnyMessage( // Header of a Popup::AnyMessage when the epkowa backend was selected on x86_64:
- _("Possibly Problematic Driver"),
- // Body of a Popup::AnyMessage when the epkowa backend was selected on x86_64.
- // Do not change or translate "epkowa", it is a driver name.
- _("The epkowa driver may cause problems on 64-bit architectures.\nSee our support database for details.")
- );
+ if( ! Popup::ContinueCancelHeadline( // Header of a Popup::ContinueCancelHeadline
+ // when the epkowa driver was selected on x86_64:
+ _("Possibly Problematic Driver"),
+ // Body of a Popup::ContinueCancelHeadline
+ // when the epkowa driver was selected on x86_64.
+ // Do not change or translate "epkowa", it is a driver name.
+ _("The epkowa driver may cause problems on 64-bit architectures.\nSee our support database for details.")
+ )
+ )
+ { // The user has decided to cancel the set up of the epkowa backend on x86_64:
+ continue;
+ }
+ }
+ // Tell the user that the hpoj backend is outdated and no longer maintained:
+ if( "hpoj" == Scanner::database[Scanner::selected_model_database_index,"backend"]:"unknown" )
+ { if( ! Popup::ContinueCancelHeadline( // Header of a Popup::ContinueCancelHeadline
+ // when the outdated hpoj driver was selected:
+ _("Outdated Driver"),
+ // Body of a Popup::ContinueCancelHeadline
+ // when the outdated hpoj driver was selected.
+ // Do not change or translate "hpoj", it is a driver name.
+ // Do not change or translate "hpaio", it is a driver name.
+ _("The hpoj driver should work but it is no longer maintained.\nTry to use the up-to-date driver hpaio.")
+ )
+ )
+ { // The user has decided to cancel the set up of the outdated hpoj backend:
+ continue;
+ }
}
+ // Leve this dialog and do the "next" step according to the sequences in wizards.ycp:
break;
}
y2milestone( "Ignoring unexpected returncode in SelectModelDialog: %1", ret );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.5/src/helps.ycp new/yast2-scanner-2.14.6/src/helps.ycp
--- old/yast2-scanner-2.14.5/src/helps.ycp 2006-10-30 13:47:15.000000000 +0100
+++ new/yast2-scanner-2.14.6/src/helps.ycp 2006-11-07 09:42:05.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Johannes Meixner
*
- * $Id: helps.ycp 28759 2006-03-09 13:17:45Z jsmeix $
+ * $Id: helps.ycp 34110 2006-11-07 08:42:03Z jsmeix $
*/
{
@@ -32,18 +32,18 @@
</p>"),
"overview" :
-// Overview dialog help 1/7:
+// Overview dialog help 1/8:
_("<p>
<b><big>Scanner Configuration</big></b><br>
Set up or change the scanner configuration and show the already active scanners.
</p>") +
-// Overview dialog help 2/7:
+// Overview dialog help 2/8:
_("<p>
To set up a new scanner, choose the scanner from the list of
detected scanners and press <b>Edit</b>.
If your scanner has not been detected, use <b>Add</b> for a manual configuration.
</p>") +
-// Overview dialog help 3/7:
+// Overview dialog help 3/8:
// 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.
@@ -59,7 +59,7 @@
check whether it appears in the output of <tt>/usr/sbin/lsusb</tt>.
If it is not listed there, the USB system cannot communicate with the scanner.
</p>") +
-// Overview dialog help 4/7:
+// Overview dialog help 4/8:
// Do not change or translate "lsscsi", it is a command name.
_("<p>
SCSI scanners are normally detected.
@@ -68,12 +68,12 @@
If not, the SCSI system cannot communicate with the scanner.
Verify that an appropriate kernel module for the SCSI host adapter has been loaded.
</p>") +
-// Overview dialog help 5/7:
+// Overview dialog help 5/8:
_("<p>
Parallel port scanners cannot be configured with this tool.
These devices must be configured manually.
</p>") +
-// Overview dialog help 6/7:
+// Overview dialog help 6/8:
// Do not confuse a "network scanner" (i.e. a scanner which is directly accessible in the network)
// with a "network scanner" (i.e. a program which scans the network for other hosts or services)
// or with a "remote scanner" (i.e. a scanner which is connected to another host in the network).
@@ -87,7 +87,7 @@
In contrast, scanning via network means accessing a remote scanner
connected to another host in the network.
</p>") +
-// Overview dialog help 7/7:
+// Overview dialog help 7/8:
// 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).
// It is not possible to modify or remove an active scanner directly.
@@ -99,6 +99,27 @@
Press <b>Delete</b> to remove a driver.
If you press <b>Other</b>, you can
restart the detection, test active scanners, or set up scanning via network.
+</p>") +
+// Overview dialog help 8/8:
+// The most often problem which is reported by users regarding scanner setup is
+// when a driver was set up but then no scanner was recognized by this driver.
+// If the driver is the right one for the scanner, then in very most cases
+// the reason is a low-level (kernel related) device communication problem
+// (i.e. a low-level USB problem or a low-level SCSI problem).
+// Those problems cannot be fixed from within the YaST scanner setup module
+// but at least the user must be informed.
+// Be careful when you change or translate "No scanner recognized by this driver"
+// because exactly this text is shown here to the user in this case.
+// In particular keep the meaning of "recognize" because the driver actually runs
+// but the running driver fails to recognize the scanner.
+_("<p>
+If a driver is set up but no scanner is recognized by the driver, possible reasons are:
+The scanner is not connected or switched off,
+the driver is not the right one for the particular model
+(even small differences in model names or internal differences in
+the same model series may require different drivers),
+there are low-level (kernel related) device communication problems
+(e.g. a low-level USB problem or a low-level SCSI problem).
</p>"),
"select_model" :
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org