Hello community,
here is the log from the commit of package yast2-scanner
checked in at Mon Nov 6 22:39:56 CET 2006.
--------
--- yast2-scanner/yast2-scanner.changes 2006-10-31 15:47:23.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-scanner/yast2-scanner.changes 2006-11-06 15:45:06.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Nov 6 15:22:51 CET 2006 - jsmeix@suse.de
+
+- V 2.14.5
+- Improved test_and_set_scanner_access_permissions to make
+ manufacturer specific entries for SCSI "processors".
+- Fixed when the info regarding outdated hpoj pops up (must be
+ before the hp-officeJet package may get installed).
+
+-------------------------------------------------------------------
Old:
----
yast2-scanner-2.14.4.tar.bz2
New:
----
yast2-scanner-2.14.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.fulFlb/_old 2006-11-06 22:39:38.000000000 +0100
+++ /var/tmp/diff_new_pack.fulFlb/_new 2006-11-06 22:39:38.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.14.4)
+# spec file for package yast2-scanner (Version 2.14.5)
#
# 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.4
+Version: 2.14.5
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.14.4.tar.bz2
+Source0: yast2-scanner-2.14.5.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.4
+%setup -n yast2-scanner-2.14.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,6 +75,12 @@
%doc %{prefix}/share/doc/packages/yast2-scanner
%changelog -n yast2-scanner
+* Mon Nov 06 2006 - jsmeix@suse.de
+- V 2.14.5
+- Improved test_and_set_scanner_access_permissions to make
+ manufacturer specific entries for SCSI "processors".
+- Fixed when the info regarding outdated hpoj pops up (must be
+ before the hp-officeJet package may get installed).
* Tue Oct 31 2006 - jsmeix@suse.de
- V 2.14.4
- Replaced complicated SetUsbScannerAccessPermissions()
++++++ yast2-scanner-2.14.4.tar.bz2 -> yast2-scanner-2.14.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.4/VERSION new/yast2-scanner-2.14.5/VERSION
--- old/yast2-scanner-2.14.4/VERSION 2006-10-31 15:14:08.000000000 +0100
+++ new/yast2-scanner-2.14.5/VERSION 2006-11-06 15:22:45.000000000 +0100
@@ -1 +1 @@
-2.14.4
+2.14.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.4/configure new/yast2-scanner-2.14.5/configure
--- old/yast2-scanner-2.14.4/configure 2006-10-31 15:39:51.000000000 +0100
+++ new/yast2-scanner-2.14.5/configure 2006-11-06 15:33:43.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.4.
+# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.5.
#
# 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.4'
-PACKAGE_STRING='yast2-scanner 2.14.4'
+PACKAGE_VERSION='2.14.5'
+PACKAGE_STRING='yast2-scanner 2.14.5'
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.4 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.14.5 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.4:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.14.5:";;
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.4
+yast2-scanner configure 2.14.5
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.4, which was
+It was created by yast2-scanner $as_me 2.14.5, 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.4'
+ VERSION='2.14.5'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.14.4"
+VERSION="2.14.5"
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.4, which was
+This file was extended by yast2-scanner $as_me 2.14.5, 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.4
+yast2-scanner config.status 2.14.5
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.4/configure.in new/yast2-scanner-2.14.5/configure.in
--- old/yast2-scanner-2.14.4/configure.in 2006-10-31 15:39:48.000000000 +0100
+++ new/yast2-scanner-2.14.5/configure.in 2006-11-06 15:33:40.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.4, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.14.5, 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.4"
+VERSION="2.14.5"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.4/src/Scanner.ycp new/yast2-scanner-2.14.5/src/Scanner.ycp
--- old/yast2-scanner-2.14.4/src/Scanner.ycp 2006-10-31 15:45:06.000000000 +0100
+++ new/yast2-scanner-2.14.5/src/Scanner.ycp 2006-11-06 15:44:41.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Scanner settings, input and output functions
* Authors: Johannes Meixner
*
- * $Id: Scanner.ycp 33942 2006-10-31 14:45:01Z jsmeix $
+ * $Id: Scanner.ycp 34095 2006-11-06 14:44:37Z jsmeix $
*
* Representation of the configuration of scanner.
* Input and output routines.
@@ -1372,18 +1372,20 @@
Instead use hpoj to set up the scanner.
Alternatively proceed and change the printer configuration to use the hplip service.
");
- string hpoj_message =
+ 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.
// Do not change or translate "PTAL", it is a subsystem name.
// Do not change or translate "ptal", it is a service name.
// Do not change or translate "hplip", it is a service name.
-_("The hpoj driver is outdated and no longer maintained.
-To use the up-to-date driver hpaio do not proceed, go back and select the driver hpaio.
-
-If the hpaio driver does not work for you and you must use the hpoj driver:
-
-The hpoj driver requires the PTAL system to be set up and running.
+_("The hpoj driver requires the PTAL system to be set up and running.
In particular, the ptal service must be up and running.
Before the ptal service can be started, the PTAL system must be initialized.
@@ -1424,10 +1426,20 @@
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;
-
// Define the progress stages:
Progress::New( // Header of a Progress::New:
// %1 will be replaced by the backend name
@@ -1577,15 +1589,20 @@
if( "hpoj" == backend_name
&& user_confirmation
)
- { if( ! Popup::ContinueCancel( hpoj_message ) )
+ { if( ! Popup::YesNo( hpoj_message ) )
{ // The user has decided not to initialize/activate/start the PTAL system:
- // Usually this is because of the hpoj_message which explains that hpoj is outdated
- // and that the user should cancel and try hpaio instead.
- y2milestone( "Set up hpoj SANE backend cancelled by user." );
- Progress::Title( // Last progress step progress bar title when the Progress was aborted:
- _("Cancelled")
+ // Don't abort (i.e. return false) in this case because it is no error
+ // when the user has decided not to initialize/activate/start the PTAL system
+ // because it may be already up and running or the user may want to set it up manually.
+ // Regardless of the state of the PTAL system the backend can be activated in /etc/sane.d/dll.conf
+ Report::Warning(
+ // Message of a Report::Warning for scanners which should be set up with the hpoj backend.
+ // Only a simple message because before there was a Popup::YesNo
+ // which asked the user whether he wants to let YaST activate the ptal service
+ // so that this message is shown if the user has explicitely rejected to do it.
+ // Do not change or translate "ptal", it is a service name.
+ _("If the ptal service is not running, the scanner cannot work.")
);
- return false;
}
else
{ // The user has decided to initialize/activate/start the PTAL system:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.4/src/dialogs.ycp new/yast2-scanner-2.14.5/src/dialogs.ycp
--- old/yast2-scanner-2.14.4/src/dialogs.ycp 2006-10-30 13:47:15.000000000 +0100
+++ new/yast2-scanner-2.14.5/src/dialogs.ycp 2006-11-06 15:44:41.000000000 +0100
@@ -4,8 +4,8 @@
* Summary: Dialogs definitions
* Authors: Johannes Meixner
*
- * $Id: dialogs.ycp 32411 2006-08-17 14:26:05Z jsmeix $
- * $Id: dialogs.ycp 32411 2006-08-17 14:26:05Z jsmeix $
+ * $Id: dialogs.ycp 34095 2006-11-06 14:44:37Z jsmeix $
+ * $Id: dialogs.ycp 34095 2006-11-06 14:44:37Z jsmeix $
*/
{
@@ -152,7 +152,7 @@
if( ret == `edit )
{ // Get what was selected:
string selected_item_id = WizardHW::SelectedItem();
- y2milestone( "selected_item_idelected in OverviewDialog: %1", selected_item_id );
+ y2milestone( "selected_item_id in OverviewDialog: %1", selected_item_id );
if( selected_item_id == "" )
{ Popup::AnyMessage( // Header of a Popup::AnyMessage when nothing was selected:
_("Nothing Selected"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.4/tools/test_and_set_scanner_access_permissions new/yast2-scanner-2.14.5/tools/test_and_set_scanner_access_permissions
--- old/yast2-scanner-2.14.4/tools/test_and_set_scanner_access_permissions 2006-10-31 15:37:51.000000000 +0100
+++ new/yast2-scanner-2.14.5/tools/test_and_set_scanner_access_permissions 2006-11-06 15:32:20.000000000 +0100
@@ -100,15 +100,36 @@
fi
if echo $LINE | grep -q '^/dev/sg[0-9][0-9]*$'
then # It is a SCSI scanner:
- # Test if this scanner does not show up as "scanner" but as "processor":
- if ! lsscsi -g | grep $LINE | grep -i 'scanner'
- then # Write an entry to the local HAL file:
- echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE
- echo ' <match key="@info.parent:scsi.type" string="processor">' >>$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 '' >>$HAL_LOCAL_FILE
+ # Test if this scanner does not show up as "scanner".
+ # There are two know manufacturers where this happens: "HP" and "EPSON".
+ # Some (all?) of their SCSI scanners show up as as "processor"
+ # (because those devices do not support the SCSI scanner protocol
+ # but only some kind of generic SCSI protocol):
+ LSSCSI_LINE=$( lsscsi -g | grep $LINE )
+ if ! echo $LSSCSI_LINE | grep -q -i 'scanner'
+ then # Test for the particular manufacturer:
+ if echo $LSSCSI_LINE | grep -q -i 'HP'
+ then # Write a HP entry to the local HAL file:
+ echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE
+ echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE
+ echo ' <match key="@info.parent:scsi.vendor" string="HP">' >>$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 '' >>$HAL_LOCAL_FILE
+ fi
+ if echo $LSSCSI_LINE | grep -q -i 'EPSON'
+ then # Write an EPSON entry to the local HAL file:
+ echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE
+ echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE
+ echo ' <match key="@info.parent:scsi.vendor" string="EPSON">' >>$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 '' >>$HAL_LOCAL_FILE
+ fi
fi
fi
done
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org