Hello community,
here is the log from the commit of package yast2-scanner for openSUSE:Factory
checked in at Tue Apr 6 22:29:38 CEST 2010.
--------
--- yast2-scanner/yast2-scanner.changes 2010-01-22 12:50:16.000000000 +0100
+++ yast2-scanner/yast2-scanner.changes 2010-04-06 17:59:15.000000000 +0200
@@ -1,0 +2,18 @@
+Tue Apr 6 17:43:24 CEST 2010 - jsmeix@suse.de
+
+- V 2.19.2
+- HAL is deprecated and does no longer support to grant read/write
+ device access permissions for scanners to the currently logged
+ in "desktop" user. Therefore the HAL related code was removed
+ (see Novell/Suse Bugzilla bnc#593946).
+- Implemented Novell/Suse Bugzilla bnc#578203 enhancement
+ to show in the model selection list "unmaintained driver"
+ and added info to the help text so that the user knows
+ in advance whether or not he could expect some help
+ if there are issues with an unmaintained driver.
+- In case of the "net" meta-backend, the [Edit] button in the
+ OverviewDialog now also launches the "Scanning via Network"
+ dialog even when the "net" meta-backend did not recognize
+ a scanner (see Novell/Suse Bugzilla bnc#578104).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-scanner-2.19.1.tar.bz2
New:
----
yast2-scanner-2.19.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.ahgRsc/_old 2010-04-06 22:28:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ahgRsc/_new 2010-04-06 22:28:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.19.1)
+# spec file for package yast2-scanner (Version 2.19.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,18 +19,21 @@
Name: yast2-scanner
-Version: 2.19.1
+Version: 2.19.2
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.19.1.tar.bz2
+Source0: yast2-scanner-2.19.2.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
# Used to exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list
# which are pulled in by Autoreqprov because of the displaytest tool:
%define my_requires /tmp/my-requires
+
Summary: YaST2 - Scanner Configuration
%description
@@ -46,14 +49,16 @@
"sane-backends".
%prep
-%setup -n yast2-scanner-2.19.1
+%setup -n yast2-scanner-2.19.2
%build
%{prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake
autoreconf --force --install
+
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
make %{?jobs:-j%jobs}
@@ -65,6 +70,7 @@
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
+
# Exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list
# which are pulled in by Autoreqprov because of the displaytest tool:
cat << EOF > %{my_requires}
++++++ yast2-scanner-2.19.1.tar.bz2 -> yast2-scanner-2.19.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/VERSION new/yast2-scanner-2.19.2/VERSION
--- old/yast2-scanner-2.19.1/VERSION 2010-01-21 17:35:33.000000000 +0100
+++ new/yast2-scanner-2.19.2/VERSION 2010-04-06 16:43:43.000000000 +0200
@@ -1 +1 @@
-2.19.1
+2.19.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/configure new/yast2-scanner-2.19.2/configure
--- old/yast2-scanner-2.19.1/configure 2010-01-21 17:43:51.000000000 +0100
+++ new/yast2-scanner-2.19.2/configure 2010-04-06 17:55:08.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-scanner 2.19.1.
+# Generated by GNU Autoconf 2.63 for yast2-scanner 2.19.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-scanner'
PACKAGE_TARNAME='yast2-scanner'
-PACKAGE_VERSION='2.19.1'
-PACKAGE_STRING='yast2-scanner 2.19.1'
+PACKAGE_VERSION='2.19.2'
+PACKAGE_STRING='yast2-scanner 2.19.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1527,7 +1527,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.19.1 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.19.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1598,7 +1598,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-scanner 2.19.1:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.19.2:";;
esac
cat <<\_ACEOF
@@ -1708,7 +1708,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-scanner configure 2.19.1
+yast2-scanner configure 2.19.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1722,7 +1722,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.19.1, which was
+It was created by yast2-scanner $as_me 2.19.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2569,7 +2569,7 @@
# Define the identity of the package.
PACKAGE='yast2-scanner'
- VERSION='2.19.1'
+ VERSION='2.19.2'
cat >>confdefs.h <<_ACEOF
@@ -2793,7 +2793,7 @@
-VERSION="2.19.1"
+VERSION="2.19.2"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
@@ -18326,7 +18326,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.19.1, which was
+This file was extended by yast2-scanner $as_me 2.19.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18389,7 +18389,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-scanner config.status 2.19.1
+yast2-scanner config.status 2.19.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/configure.in new/yast2-scanner-2.19.2/configure.in
--- old/yast2-scanner-2.19.1/configure.in 2010-01-21 17:43:35.000000000 +0100
+++ new/yast2-scanner-2.19.2/configure.in 2010-04-06 17:54:52.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-scanner, 2.19.1, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.19.2, 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.19.1"
+VERSION="2.19.2"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/src/Scanner.ycp new/yast2-scanner-2.19.2/src/Scanner.ycp
--- old/yast2-scanner-2.19.1/src/Scanner.ycp 2010-01-21 17:25:29.000000000 +0100
+++ new/yast2-scanner-2.19.2/src/Scanner.ycp 2010-04-06 16:39:49.000000000 +0200
@@ -1,10 +1,31 @@
+
+/*
+ * Copyright (c) 2010 Novell, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail,
+ * you may find current contact information at www.novell.com
+ */
+
/**
* File: modules/Scanner.ycp
* Package: Configuration of scanner
* Summary: Scanner settings, input and output functions
* Authors: Johannes Meixner
*
- * $Id: Scanner.ycp 60192 2009-12-23 14:36:04Z jsmeix $
+ * $Id: Scanner.ycp 60804 2010-02-11 16:19:48Z jsmeix $
*
* Representation of the configuration of scanner.
* Input and output routines.
@@ -84,6 +105,7 @@
* @struct scanner_model_map
* $[ "package":"The package which provides the backend: sane-backends/hplip/iscan/iscan-free (required)",
* "backend":"The name of the backend (required)",
+ * "version":"The backend's arbitrary version string or 'unmaintained' (may be the empty string)",
* "manufacturer":"The manufacturer name of the scanner (required)",
* "model":"The model name of the scanner (required)",
* "firmware":"Whether or not firmware upload is required (value is 'required' or the empty string)",
@@ -634,31 +656,6 @@
}
/**
- * Test and set scanner access permissions for USB scanners and SCSI scanners
- * for resmgr via HAL by calling a bash script which does all the work.
- * @return true on success
- */
-boolean SetScannerAccessPermissions()
-{ // Build the command line parameter:
- string sane_devices = "";
- foreach( map< string, string > active_scanner,
- active_scanners,
- { sane_devices = sane_devices + active_scanner["sane_device"]:"unknown" + ";";
- }
- );
- // Execute the command line:
- if( ! ExecuteBashCommand( test_and_set_scanner_access_permissions_commandline
- + " '"
- + sane_devices
- + "'"
- )
- )
- { return false;
- }
- return true;
-}
-
-/**
* Test whether there exist a print queue which depends on the specified SANE backend.
* Examples:
* hpaio (package hplip):
@@ -1374,6 +1371,7 @@
string manufacturer = database_entry["manufacturer"]:"unknown manufacturer";
string model = database_entry["model"]:"unknown model";
string backend = database_entry["backend"]:"unknown";
+ string version = database_entry["version"]:"";
string package = database_entry["package"]:"unknown";
string status = database_entry["status"]:"unknown";
string interface = database_entry["interface"]:"";
@@ -1457,16 +1455,26 @@
// Enclose the backend name and the package name in single quotes to seperate them
// from the rest of the model_string because they are untranslatable English words.
if( "good" == status )
- { status_string = sformat( // Scanner model list status entry for "good" supported models:
- // %1 will be replaced by the backend (scanner driver) name
- _("Driver %1 provides good functionality."),
- backend
- );
+ { if( "unmaintained" == version )
+ { status_string = sformat( // Scanner model list status entry for "good" supported models
+ // but where the backend (scanner driver) is unmaintained:
+ // %1 will be replaced by the backend (scanner driver) name
+ _("Unmaintained driver %1 may provide good functionality."),
+ backend
+ );
+ }
+ else
+ { status_string = sformat( // Scanner model list status entry for "good" supported models:
+ // %1 will be replaced by the backend (scanner driver) name
+ _("Driver %1 should provide good functionality."),
+ backend
+ );
+ }
}
else
{ if( "unsupported" == status )
{ if( "unsupported" == backend )
- { // Scanner model list status entry for unsupported models
+ { // Scanner model list status entry for unsupported models:
status_string = _("This scanner is not supported.");
}
else
@@ -1480,11 +1488,21 @@
}
else
{ if( "complete" == status )
- { status_string = sformat( // Scanner model list status entry for "complete" supported models:
- // %1 will be replaced by the backend (scanner driver) name
- _("Driver %1 provides complete functionality."),
- backend
- );
+ { if( "unmaintained" == version )
+ { status_string = sformat( // Scanner model list status entry for "complete" supported models
+ // but where the backend (scanner driver) is unmaintained:
+ // %1 will be replaced by the backend (scanner driver) name
+ _("Unmaintained driver %1 may provide complete functionality."),
+ backend
+ );
+ }
+ else
+ { status_string = sformat( // Scanner model list status entry for "complete" supported models:
+ // %1 will be replaced by the backend (scanner driver) name
+ _("Driver %1 should provide complete functionality."),
+ backend
+ );
+ }
}
else
{ if( "untested" == status )
@@ -1496,20 +1514,40 @@
}
else
{ if( "basic" == status )
- { status_string = sformat( // Scanner model list status entry for "basic" supported models:
- // %1 will be replaced by the backend (scanner driver) name
- _("Driver %1 provides basic functionality."),
- backend
- );
- }
- else
- { if( "minimal" == status )
- { status_string = sformat( // Scanner model list status entry for "minimal" supported models:
+ { if( "unmaintained" == version )
+ { status_string = sformat( // Scanner model list status entry for "basic" supported models
+ // but where the backend (scanner driver) is unmaintained:
+ // %1 will be replaced by the backend (scanner driver) name
+ _("Unmaintained driver %1 may provide basic functionality."),
+ backend
+ );
+ }
+ else
+ { status_string = sformat( // Scanner model list status entry for "basic" supported models:
// %1 will be replaced by the backend (scanner driver) name
- _("Driver %1 provides minimal functionality."),
+ _("Driver %1 should provide basic functionality."),
backend
);
}
+ }
+ else
+ { if( "minimal" == status )
+ { if( "unmaintained" == version )
+ { status_string = sformat( // Scanner model list status entry for "minimal" supported models
+ // but where the backend (scanner driver) is unmaintained:
+ // %1 will be replaced by the backend (scanner driver) name
+ _("Unmaintained driver %1 may provide minimal functionality."),
+ backend
+ );
+ }
+ else
+ { status_string = sformat( // Scanner model list status entry for "minimal" supported models:
+ // %1 will be replaced by the backend (scanner driver) name
+ _("Driver %1 should provide minimal functionality."),
+ backend
+ );
+ }
+ }
else
{ status_string = sformat( // Fallback scanner model list status entry for models
// which are listed but without a known support status:
@@ -1790,37 +1828,6 @@
Instead use hpaio to set up the scanner.
Alternatively proceed and change the printer configuration to use the ptal service.
");
- string hal_does_not_know_scanner_message =
- // Message of a Popup::Error when HAL does not know a scanner.
- // Do not change or translate "udev", it is a subsystem name.
- // Do not change or translate "HAL", it is a subsystem name.
- // Do not change or translate "hal-resmgr", it is a service name.
- // Do not change or translate "lshal", it is a command name.
- // Do not change or translate "saned", it is a program (sane daemon) name.
- // 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).
- // Translate the entry "Scanning via Network" in the "Other" drop down menue
- // and the button label "Local Host Configuration" so that it matches
- // exactly to what is actually shown in your language in your dialogs.
-_("A scanner is not known to HAL.
-To access the scanner as normal user,
-udev, HAL, and hal-resmgr are needed to grant
-appropriate access permissions automatically.
-Therefore the scanner model must be known to HAL.
-If the scanner is not known to HAL, a re-plug
-of a USB scanner should help.
-Otherwise a reboot should be done to restart
-the whole udev/HAL/hal-resmgr machinery.
-Check if the scanner is listed in the lshal output.
-If a SCSI scanner which was switched on during boot
-is not listed in the lshal output, the usual reason
-is that the kernel module for the scanner's SCSI host
-adapter does not notify HAL about the scanner device.
-If even a reboot does not help, you could access
-the scanner via the saned as a workaround.
-For this workaround choose 'Scanning via Network'
-and select the 'Local Host Configuration'.
-");
// Here the real code starts with proper indentation:
if( backend_name == "" )
{ if( database_index < 0 )
@@ -1843,7 +1850,7 @@
backend_name
),
" ",
- 6,
+ 5,
[ // 1. progress stage name of a Progress::New:
_("Check whether additional packages must be installed"),
// 2. progress stage name of a Progress::New:
@@ -1853,9 +1860,7 @@
// 4. progress stage name of a Progress::New:
_("Activate the driver"),
// 5. progress stage name of a Progress::New:
- _("Determine active scanners"),
- // 6. progress stage name of a Progress::New:
- _("Test and set USB and SCSI scanner access permissions")
+ _("Determine active scanners")
],
[ // 1. progress step progress bar title of a Progress::New:
_("Checking whether additional packages must be installed..."),
@@ -1867,8 +1872,6 @@
_("Activating the driver..."),
// 5. progress step progress bar title of a Progress::New:
_("Determining active scanners..."),
- // 6. progress step progress bar title of a Progress::New:
- _("Testing and setting USB and SCSI scanner access permissions..."),
// Last progress step progress bar title of a Progress::New:
_("Finished")
],
@@ -2031,37 +2034,6 @@
Progress::NextStage();
if( ! DetermineActiveScanners() )
{ active_scanners = [];
- // This Progress::NextStage makes sure that
- // the stage "Test and set USB and SCSI scanner access permissions"
- // is shown to the user even if it is not actually executed.
- // But because of the word "Test" it is not wrong to show it.
- Progress::NextStage();
- }
- else
- { Progress::NextStage();
- if( ! SetScannerAccessPermissions()
- && user_confirmation
- )
- { if( 10 == result["exit"]:9999 )
- { // Special handling when the exit code is 10 which indicates
- // that HAL does not know all active scanners.
- Popup::ErrorDetails( hal_does_not_know_scanner_message,
- // Only the stderr message shows exact information
- // which scanners are unknown to HAL which is of interest
- // when there is more than one scanner connected:
- result["stderr"]:""
- );
- }
- else
- { // Whatever other error:
- Popup::WarningDetails( // Message of a Popup::WarningDetails when setting scanner access permissions failed.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("Failed to set scanner access permissions.\n%1"),
- result["stderr"]:""
- );
- }
- }
}
if( ! DetermineActiveBackends() )
{ active_backends = [];
@@ -2217,9 +2189,6 @@
if( ! DetermineActiveScanners() )
{ active_scanners = [];
}
- else
- { SetScannerAccessPermissions();
- }
if( ! DetermineActiveBackends() )
{ active_backends = [];
}
@@ -2232,39 +2201,7 @@
* @return true on success
*/
global boolean TestBackend( string backend_name )
-{ // First of all the multi-line strings because such strings cannot be indented:
- string hal_does_not_know_scanner_message =
- // Message of a Popup::Error when HAL does not know a scanner.
- // Do not change or translate "udev", it is a subsystem name.
- // Do not change or translate "HAL", it is a subsystem name.
- // Do not change or translate "hal-resmgr", it is a service name.
- // Do not change or translate "lshal", it is a command name.
- // Do not change or translate "saned", it is a program (sane daemon) name.
- // 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).
- // Translate the entry "Scanning via Network" in the "Other" drop down menue
- // and the button label "Local Host Configuration" so that it matches
- // exactly to what is actually shown in your language in your dialogs.
-_("The scanner is not known to HAL.
-To access the scanner as normal user,
-udev, HAL, and hal-resmgr are needed to grant
-appropriate access permissions automatically.
-Therefore the scanner model must be known to HAL.
-If the scanner is not known to HAL, a re-plug
-of a USB scanner should help.
-Otherwise a reboot should be done to restart
-the whole udev/HAL/hal-resmgr machinery.
-Check if the scanner is listed in the lshal output.
-If a SCSI scanner which was switched on during boot
-is not listed in the lshal output, the usual reason
-is that the kernel module for the scanner's SCSI host
-adapter does not notify HAL about the scanner device.
-If even a reboot does not help, you could access
-the scanner via the saned as a workaround.
-For this workaround choose 'Scanning via Network'
-and select the 'Local Host Configuration'.
-");
- string sane_device = "";
+{ string sane_device = "";
// It is not possible to test a backend without a matching active scanner.
// Build the table of active scanners of the backend (see ModelItems above):
list< term > scanners_to_be_tested = [];
@@ -2370,29 +2307,6 @@
result["stderr"]:_("(no results available)")
)
);
- // Test if HAL knows the particular SANE device.
- // 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 ) )
- { if( 10 == result["exit"]:9999 )
- { // Special handling when the exit code is 10 which indicates
- // that HAL does not know the scanner.
- // Show only the error message but return true nevertheless
- // because the actual test via "scanimage" was successful.
- Popup::ErrorDetails( hal_does_not_know_scanner_message,
- sformat( // Popup::ErrorDetails details where
- // %1 will be replaced by the SANE device identifier:
- _("The following SANE device is not know to HAL: '%1'"),
- sane_device
- )
- );
- }
- // Ignore any other errors of test_and_set_scanner_access_permissions
- // e.g. when it fails because HAL stuff is not installed or whatever.
- }
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/src/dialogs.ycp new/yast2-scanner-2.19.2/src/dialogs.ycp
--- old/yast2-scanner-2.19.1/src/dialogs.ycp 2010-01-21 17:01:19.000000000 +0100
+++ new/yast2-scanner-2.19.2/src/dialogs.ycp 2010-02-11 17:19:49.000000000 +0100
@@ -1,11 +1,32 @@
+
+/*
+ * Copyright (c) 2010 Novell, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail,
+ * you may find current contact information at www.novell.com
+ */
+
/**
* File: include/scanner/dialogs.ycp
* Package: Configuration of scanner
* Summary: Dialogs definitions
* Authors: Johannes Meixner
*
- * $Id: dialogs.ycp 60192 2009-12-23 14:36:04Z jsmeix $
- * $Id: dialogs.ycp 60192 2009-12-23 14:36:04Z jsmeix $
+ * $Id: dialogs.ycp 60804 2010-02-11 16:19:48Z jsmeix $
+ * $Id: dialogs.ycp 60804 2010-02-11 16:19:48Z jsmeix $
*/
{
@@ -251,7 +272,14 @@
break;
}
if( issubstring( selected_item_id, "active_backend:" ) )
- { // A selected active backend (without a matching active scanner) cannot be edited.
+ { integer active_backends_index = tointeger( filterchars( selected_item_id, "0123456789" ) );
+ // Test if the active backend is the 'net' meta-backend:
+ if( "net" == Scanner::active_backends[active_backends_index]:"" )
+ { // Exit this dialog and run the ConfigureNetworkScanningDialog via the sequencer in wizards.ycp:
+ ret = `network_scanning;
+ break;
+ }
+ // A selected active backend (without a matching active scanner) cannot be edited.
// A selected active backend (without a matching active scanner) can only be deleted.
Popup::AnyMessage( // Header of a Popup::AnyMessage when an active driver
// without a matching active scanner was selected
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/src/helps.ycp new/yast2-scanner-2.19.2/src/helps.ycp
--- old/yast2-scanner-2.19.1/src/helps.ycp 2010-01-21 17:02:33.000000000 +0100
+++ new/yast2-scanner-2.19.2/src/helps.ycp 2010-02-11 17:19:49.000000000 +0100
@@ -1,10 +1,31 @@
+
+/*
+ * Copyright (c) 2010 Novell, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail,
+ * you may find current contact information at www.novell.com
+ */
+
/**
* File: include/scanner/helps.ycp
* Package: Configuration of scanner
* Summary: Help texts of all the dialogs
* Authors: Johannes Meixner
*
- * $Id: helps.ycp 60462 2010-01-20 15:49:56Z jsmeix $
+ * $Id: helps.ycp 60804 2010-02-11 16:19:48Z jsmeix $
*/
{
@@ -156,11 +177,16 @@
<tt>http://www.sane-project.org/</tt>.
</p>") +
// SelectModel dialog help 2/5:
+// Do not change or translate "SANE", it is a project name.
// Do not change or translate "sane-backends", it is a package name.
_("<p>
A model is supported if there is at least one appropriate scanner driver available.
-Most scanner drivers are provided by the sane-backends package.
-The support status varies from minimal to complete.
+Most scanner drivers are from the SANE project and provided in the sane-backends package.
+The support status for a particular model varies from minimal to complete.<br>
+When a driver is shown as 'unmaintained', it does not mean that the driver does not work.
+Even an unmaintained driver could work perfectly well.
+But it means that there is no longer someone who knows about the driver internals
+so that there is usually no help if there are issues with an unmaintained driver.
</p>") +
// SelectModel dialog help 3/5:
_("<p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/src/scanner.ycp new/yast2-scanner-2.19.2/src/scanner.ycp
--- old/yast2-scanner-2.19.1/src/scanner.ycp 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/src/scanner.ycp 2010-02-11 17:19:49.000000000 +0100
@@ -1,10 +1,31 @@
+
+/*
+ * Copyright (c) 2010 Novell, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail,
+ * you may find current contact information at www.novell.com
+ */
+
/**
* File: clients/scanner.ycp
* Package: Configuration of scanner
* Summary: Main file
* Authors: Johannes Meixner
*
- * $Id: scanner.ycp 52876 2008-11-04 11:42:48Z jsmeix $
+ * $Id: scanner.ycp 60804 2010-02-11 16:19:48Z jsmeix $
*
* Main file for scanner configuration. Uses all other files.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/src/wizards.ycp new/yast2-scanner-2.19.2/src/wizards.ycp
--- old/yast2-scanner-2.19.1/src/wizards.ycp 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/src/wizards.ycp 2010-02-11 17:19:49.000000000 +0100
@@ -1,10 +1,31 @@
+
+/*
+ * Copyright (c) 2010 Novell, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail,
+ * you may find current contact information at www.novell.com
+ */
+
/**
* File: include/scanner/wizards.ycp
* Package: Configuration of scanner
* Summary: Wizards definitions
* Authors: Johannes Meixner
*
- * $Id: wizards.ycp 45696 2008-03-25 15:24:19Z jsmeix $
+ * $Id: wizards.ycp 60804 2010-02-11 16:19:48Z jsmeix $
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/Makefile.am new/yast2-scanner-2.19.2/tools/Makefile.am
--- old/yast2-scanner-2.19.1/tools/Makefile.am 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/Makefile.am 2010-04-06 16:31:26.000000000 +0200
@@ -11,8 +11,7 @@
setup_ptal_scanner_service \
setup_hplip_scanner_service \
determine_network_scanner_config \
- setup_network_scanner_config \
- test_and_set_scanner_access_permissions
+ setup_network_scanner_config
EXTRA_DIST = $(ybin_SCRIPTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/Makefile.in new/yast2-scanner-2.19.2/tools/Makefile.in
--- old/yast2-scanner-2.19.1/tools/Makefile.in 2010-01-21 17:43:54.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/Makefile.in 2010-04-06 17:55:11.000000000 +0200
@@ -239,8 +239,7 @@
setup_ptal_scanner_service \
setup_hplip_scanner_service \
determine_network_scanner_config \
- setup_network_scanner_config \
- test_and_set_scanner_access_permissions
+ setup_network_scanner_config
EXTRA_DIST = $(ybin_SCRIPTS)
displaytest_SOURCES = displaytest.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/activate_scanner_backend new/yast2-scanner-2.19.2/tools/activate_scanner_backend
--- old/yast2-scanner-2.19.1/tools/activate_scanner_backend 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/activate_scanner_backend 2010-02-11 16:12:35.000000000 +0100
@@ -1,6 +1,24 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/autodetect_scanners new/yast2-scanner-2.19.2/tools/autodetect_scanners
--- old/yast2-scanner-2.19.1/tools/autodetect_scanners 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/autodetect_scanners 2010-02-11 16:16:40.000000000 +0100
@@ -1,6 +1,24 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/create_scanner_database new/yast2-scanner-2.19.2/tools/create_scanner_database
--- old/yast2-scanner-2.19.1/tools/create_scanner_database 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/create_scanner_database 2010-02-11 16:17:04.000000000 +0100
@@ -1,6 +1,24 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
@@ -23,7 +41,7 @@
# Function to extract entries from a description file with SANE syntax.
# Quoted quotation marks '\"' (happens in comments) are replaced by ' ':
Extract()
-{ cat $1 | sed -e 's/\\"/ /g' | egrep -o '^[[:space:]]*:backend[[:space:]]*"[^"]*"|^[[:space:]]*:mfg[[:space:]]*"[^"]*"|^[[:space:]]*:model[[:space:]]*"[^"]*"|^[[:space:]]*:firmware[[:space:]]*"[^"]*"|^[[:space:]]*:interface[[:space:]]*"[^"]*"|^[[:space:]]*:usbid[[:space:]]*"0x[0-9A-Fa-f]*"[[:space:]]*"0x[0-9A-Fa-f]*"|^[[:space:]]*:status[[:space:]]*:[a-z]*|^[[:space:]]*:comment[[:space:]]*"[^"]*"'
+{ cat $1 | sed -e 's/\\"/ /g' | egrep -o '^[[:space:]]*:backend[[:space:]]*"[^"]*"|^[[:space:]]*:version[[:space:]]*"[^"]*"|^[[:space:]]*:mfg[[:space:]]*"[^"]*"|^[[:space:]]*:model[[:space:]]*"[^"]*"|^[[:space:]]*:firmware[[:space:]]*"[^"]*"|^[[:space:]]*:interface[[:space:]]*"[^"]*"|^[[:space:]]*:usbid[[:space:]]*"0x[0-9A-Fa-f]*"[[:space:]]*"0x[0-9A-Fa-f]*"|^[[:space:]]*:status[[:space:]]*:[a-z]*|^[[:space:]]*:comment[[:space:]]*"[^"]*"'
}
# Process the SANE description files:
@@ -95,13 +113,14 @@
# Output header:
if [ "$OUTPUT_FORMAT" = "YCP" ]
then echo "["
-else echo "PACKAGE|BACKEND|MANUFACTURER|MODEL|FIRMWARE|INTERFACE|USBID|STATUS|COMMENT"
+else echo "PACKAGE|BACKEND|VERSION|MANUFACTURER|MODEL|FIRMWARE|INTERFACE|USBID|STATUS|COMMENT"
fi
# Function to output one scanner entry:
Output()
{ if [ -n "$PACKAGE" -a -n "$BACKEND" -a -n "$MANUFACTURER" -a -n "$MODEL" -a -n "$STATUS" ]
- then [ -z "$FIRMWARE" ] && FIRMWARE='""'
+ then [ -z "$VERSION" ] && VERSION='""'
+ [ -z "$FIRMWARE" ] && FIRMWARE='""'
[ -z "$INTERFACE" ] && INTERFACE='""'
[ -z "$USBID" ] && USBID='""'
[ -z "$COMMENT" ] && COMMENT='""'
@@ -112,8 +131,8 @@
fi
fi
if [ "$OUTPUT_FORMAT" = "YCP" ]
- then echo -e " \$[ \"package\":$PACKAGE,\n \"backend\":$BACKEND,\n \"manufacturer\":$MANUFACTURER,\n \"model\":$MODEL,\n \"firmware\":$FIRMWARE,\n \"interface\":$INTERFACE,\n \"usbid\":$USBID,\n \"status\":$STATUS,\n \"comment\":$COMMENT\n ],"
- else echo "$PACKAGE|$BACKEND|$MANUFACTURER|$MODEL|$FIRMWARE|$INTERFACE|$USBID|$STATUS|$COMMENT" | tr -d '"'
+ then echo -e " \$[ \"package\":$PACKAGE,\n \"backend\":$BACKEND,\n \"version\":$VERSION,\n \"manufacturer\":$MANUFACTURER,\n \"model\":$MODEL,\n \"firmware\":$FIRMWARE,\n \"interface\":$INTERFACE,\n \"usbid\":$USBID,\n \"status\":$STATUS,\n \"comment\":$COMMENT\n ],"
+ else echo "$PACKAGE|$BACKEND|$VERSION|$MANUFACTURER|$MODEL|$FIRMWARE|$INTERFACE|$USBID|$STATUS|$COMMENT" | tr -d '"'
fi
fi
}
@@ -131,6 +150,7 @@
:package) Output
PACKAGE="$VALUE"
BACKEND=""
+ VERSION=""
MANUFACTURER=""
MODEL=""
FIRMWARE=""
@@ -140,6 +160,16 @@
COMMENT="" ;;
:backend) Output
BACKEND=$( echo "$VALUE" | tr '[:upper:]' '[:lower:]' )
+ VERSION=""
+ MANUFACTURER=""
+ MODEL=""
+ FIRMWARE=""
+ INTERFACE=""
+ USBID=""
+ STATUS=""
+ COMMENT="" ;;
+ :version) Output
+ VERSION=$( echo "$VALUE" | tr '[:upper:]' '[:lower:]' )
MANUFACTURER=""
MODEL=""
FIRMWARE=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/deactivate_scanner_backend new/yast2-scanner-2.19.2/tools/deactivate_scanner_backend
--- old/yast2-scanner-2.19.1/tools/deactivate_scanner_backend 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/deactivate_scanner_backend 2010-02-11 16:17:35.000000000 +0100
@@ -1,8 +1,27 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
+
export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
export LC_ALL="POSIX"
export LANG="POSIX"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/determine_active_scanner_backends new/yast2-scanner-2.19.2/tools/determine_active_scanner_backends
--- old/yast2-scanner-2.19.1/tools/determine_active_scanner_backends 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/determine_active_scanner_backends 2010-02-11 16:18:00.000000000 +0100
@@ -1,6 +1,24 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/determine_active_scanners new/yast2-scanner-2.19.2/tools/determine_active_scanners
--- old/yast2-scanner-2.19.1/tools/determine_active_scanners 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/determine_active_scanners 2010-02-11 16:18:40.000000000 +0100
@@ -1,6 +1,24 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/determine_network_scanner_config new/yast2-scanner-2.19.2/tools/determine_network_scanner_config
--- old/yast2-scanner-2.19.1/tools/determine_network_scanner_config 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/determine_network_scanner_config 2010-02-11 16:19:11.000000000 +0100
@@ -1,6 +1,24 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/displaytest.c new/yast2-scanner-2.19.2/tools/displaytest.c
--- old/yast2-scanner-2.19.1/tools/displaytest.c 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/displaytest.c 2010-02-11 16:41:16.000000000 +0100
@@ -1,3 +1,26 @@
+
+/*
+ * Johannes Meixner , 2008, 2010
+ *
+ * Copyright (c) 2010 Novell, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail,
+ * you may find current contact information at www.novell.com
+ */
+
/*
* gcc -Wall -o display display.c -L/usr/X11R6/lib -lX11
*/
@@ -19,3 +42,4 @@
XCloseDisplay(d);
return 0;
}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/setup_hplip_scanner_service new/yast2-scanner-2.19.2/tools/setup_hplip_scanner_service
--- old/yast2-scanner-2.19.1/tools/setup_hplip_scanner_service 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/setup_hplip_scanner_service 2010-02-11 16:19:32.000000000 +0100
@@ -1,6 +1,24 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/setup_network_scanner_config new/yast2-scanner-2.19.2/tools/setup_network_scanner_config
--- old/yast2-scanner-2.19.1/tools/setup_network_scanner_config 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/setup_network_scanner_config 2010-02-11 16:19:48.000000000 +0100
@@ -1,6 +1,24 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/setup_ptal_scanner_service new/yast2-scanner-2.19.2/tools/setup_ptal_scanner_service
--- old/yast2-scanner-2.19.1/tools/setup_ptal_scanner_service 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/setup_ptal_scanner_service 2010-02-11 16:20:03.000000000 +0100
@@ -1,6 +1,24 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/test_and_set_scanner_access_permissions new/yast2-scanner-2.19.2/tools/test_and_set_scanner_access_permissions
--- old/yast2-scanner-2.19.1/tools/test_and_set_scanner_access_permissions 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/test_and_set_scanner_access_permissions 1970-01-01 01:00:00.000000000 +0100
@@ -1,290 +0,0 @@
-#! /bin/bash
-#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
-
-#set -x
-
-export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
-export LC_ALL="POSIX"
-export LANG="POSIX"
-umask 022
-
-# 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##*/}
-TMP_DATA=$(mktemp -u /tmp/$MY_NAME.XXXXXX)
-TMP_DATA_RAW=$(mktemp -u /tmp/$MY_NAME.XXXXXX)
-
-# Get the raw data (i.e. the SANE devices for the active scanners).
-# Either it is specified as command line parameter $1
-# (this is how YaST calls it to avoid duplicate time-consuming "scanimage" calls
-# because it knows the SANE devices from its determine_active_scanners call
-# note that YaST calls it with all SANE devices just like "scanimage -f '%d;'")
-# or (if $1 is empty) then run "scanimage" to determine the SANE devices:
-if [ -n "$1" ]
-then echo "$1" >$TMP_DATA_RAW
-else MAXIMUM_WAIT="60"
- if [ -x $( type -p scanimage || echo qqq ) ]
- then scanimage -f '%d;' >$TMP_DATA_RAW &
- scanimagePID=$!
- for i in $( seq $MAXIMUM_WAIT )
- do ps $scanimagePID &>/dev/null || break
- sleep 1
- done
- if ps $scanimagePID &>/dev/null
- then kill -9 $scanimagePID &>/dev/null
- fi
- else echo "Cannot execute /usr/bin/scanimage" 1>&2
- exit 2
- fi
-fi
-# Split it into seperated lines, remove the SANE backend name if it is a usual SANE backend,
-# substitute the 'hpaio:/usb/' backend name with ':hpaio:/usb/' to keep this backend name
-# because it is needed later to match the SANE device from the 'hp-makeuri -s' command,
-# and remove duplicates which happen when different backends are active for the same scanner:
-tr ';' '\n' <$TMP_DATA_RAW | sed -e 's/^hpaio:\/usb\//:hpaio:\/usb\//' | cut -d ':' -s -f 2- | sort -u >$TMP_DATA
-# TMP_DATA should contain lines with plain device infos for scanners like
-# libusb:001:002
-# libusb:004:005
-# hpaio:/usb/HP_LaserJet_1220?serial=00XXXXXXXXXX
-# /dev/sg0
-# /dev/sg2
-# and random useless stuff e.g. when the net backend is used on localhost
-# or for network scanners via the 'hpaio:/net/...' backend like
-# localhost:hpaio:/usb/HP_LaserJet_1220?serial=00XXXXXXXXXX
-# localhost:plustek:libusb:001:005
-# /net/Officejet_7200_series?ip=10.10.100.100
-# A detailed syntax check is not done here because it happens later,
-# see "Test for USB and SCSI scanners and ignore anything else" below.
-
-# For each 'hpaio:/usb/<model-string>' line output a matching 'libusb:<bus>:<device>' line:
-# List all HP USB devices, extract the bus and device number,
-# use 'hp-makeuri -s' to make the SANE device (ignore error messages on stderr
-# which happen for plain HP printers like 'error: Device does not support scan.'
-# or may happen for whatever else USB devices like 'error: Device not found'),
-# and if the SANE device from 'hp-makeuri -s' is found in TMP_DATA,
-# append a matching 'libusb:<bus>:<device>' line to TMP_DATA.
-# Duplicate 'libusb:<bus>:<device>' lines could happen regardless that
-# the BusDevice values are unique (because the lsusb output is unique)
-# because another backend might have already reported a HP USB scanner.
-# Skip this section if hp-makeuri cannot be executed for whatever reason.
-if [ -x $( type -p hp-makeuri || echo qqq ) ]
-then for BusDevice in $( lsusb -d 03f0: | cut -d ' ' -f 2,4 | tr ' :' ': ' )
- do for URI in $( hp-makeuri -s $BusDevice 2>/dev/null )
- do if grep -q "^$URI\$" $TMP_DATA
- then grep -q "^libusb:$BusDevice\$" $TMP_DATA || echo libusb:$BusDevice >>$TMP_DATA
- fi
- done
- done
-else echo "Cannot execute /usr/bin/hp-makeuri" 1>&2
-fi
-
-# 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
-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">' >>$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 '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
-# of leading zeroes from a varaiable via ${varaiable##*(0)}
-shopt -s extglob
-
-# Get the HAL UDIs:
-KNOWN_HAL_SCANNER_UDIs=""
-if [ -x $( type -p hal-find-by-capability || echo qqq ) ]
-then KNOWN_HAL_SCANNER_UDIs="$( hal-find-by-capability --capability scanner )"
-fi
-UNKNOWN_TO_HAL=""
-
-# Test and set scanner access permissions:
-exec <$TMP_DATA
-while read LINE
-do # Test for USB and SCSI scanners and ignore anything else:
- if echo $LINE | grep -q '^libusb:[0-9][0-9]*:[0-9][0-9]*$'
- then # It is a USB scanner:
- # Determine the USB vendor and product IDs:
- BUS_DEVICE=$( echo $LINE | cut -d ':' -s -f 2- )
- VENDOR_PRODUCT=$( lsusb -s $BUS_DEVICE | tr '[:upper:]' '[:lower:]' | grep -o 'id [0-9a-f]*:[0-9a-f]*' | cut -b 4- )
- VENDOR=$( echo $VENDOR_PRODUCT | cut -d ':' -s -f 1 )
- PRODUCT=$( echo $VENDOR_PRODUCT | cut -d ':' -s -f 2 )
- # Skip scanners where VENDOR or PRODUCT contains only zeroes:
- echo $VENDOR | grep -q [1-9a-f] || continue
- echo $PRODUCT | grep -q [1-9a-f] || continue
- # Skip "SCSI via USB" scanners:
- # There is a small number of USB scanners which are not talked to via libusb.
- # They talk an unusual protocol which is a derivative of usb storage.
- # User space should treat them as SCSI scanners.
- # Furthermore, granting access via libusb here could oops the kernel.
- # Therefore USB user access for those scanners must not be enabled.
- # See the Novell/Suse Bugzilla bug
- # https://bugzilla.novell.com/show_bug.cgi?id=341565
- [ "04ce:0300" = "$VENDOR_PRODUCT" ] && continue
- [ "05da:0094" = "$VENDOR_PRODUCT" ] && continue
- [ "05da:0099" = "$VENDOR_PRODUCT" ] && continue
- [ "05da:009a" = "$VENDOR_PRODUCT" ] && continue
- [ "05da:00a0" = "$VENDOR_PRODUCT" ] && continue
- [ "05da:00a3" = "$VENDOR_PRODUCT" ] && continue
- [ "05da:80a3" = "$VENDOR_PRODUCT" ] && continue
- [ "05da:80ac" = "$VENDOR_PRODUCT" ] && continue
- [ "05da:00b6" = "$VENDOR_PRODUCT" ] && continue
- # Scanners which are not skipped above must have an entry in a HAL fdi file.
- # If the "scanner" capability is already known to HAL, everything is already o.k
- # regardless if it is listed in the global or local HAL file or elsewhere.
- # If there are several scanners with the same USB IDs connected,
- # it is assumed that when HAL knows one, it knows all of them.
- # If KNOWN_HAL_SCANNER_UDIs is emptly e.g. because HAL does not run or is not installed
- # it is perfectly right to collect the models in UNKNOWN_TO_HAL
- # so that YaST can show an appropriate message to the user.
- HAL_UDI_VENDOR_PRODUCT=${VENDOR##*(0)}_${PRODUCT##*(0)}
- echo "$KNOWN_HAL_SCANNER_UDIs" | grep -q -i "/usb_device_$HAL_UDI_VENDOR_PRODUCT" && continue
- # 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">' >>$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
- echo ' </match>' >>$HAL_LOCAL_FILE
- echo '' >>$HAL_LOCAL_FILE
- fi
- if echo $LINE | grep -q '^/dev/sg[0-9][0-9]*$'
- then # It is a SCSI scanner:
- # If the "scanner" capability is already known to HAL, everything is already o.k
- # regardless if it is listed in the global or local HAL file or elsewhere.
- # If KNOWN_HAL_SCANNER_UDIs is emptly e.g. because HAL does not run or is not installed
- # it is perfectly right to collect the models in UNKNOWN_TO_HAL
- # so that YaST can show an appropriate message to the user.
- for u in $( echo "$KNOWN_HAL_SCANNER_UDIs" )
- do hal-get-property --udi "$u" --key linux.device_file
- done | grep -q "$LINE" && continue
- # The "scanner" capability is not yet known to HAL:
- UNKNOWN_TO_HAL="$UNKNOWN_TO_HAL SCSI-device=$LINE"
- # Skip scanners which show up as SCSI type "scanner" because those
- # match to the generic SCSI entry in the global HAL file.
- LSSCSI_LINE=$( lsscsi -g | grep $LINE )
- echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f2 | grep -q -i 'scanner' && continue
- # There are two know manufacturers where SCSI scanners do not show up as "scanner":
- # "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):
- # Test for the particular manufacturer:
- if echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f3 | 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 | tr -s ' ' | cut -d ' ' -f3 | 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
-done
-
-# Write footer to HAL_LOCAL_FILE:
-echo ' </device>' >>$HAL_LOCAL_FILE
-echo '</deviceinfo>' >>$HAL_LOCAL_FILE
-
-# Remove the temporary files:
-rm $TMP_DATA $TMP_DATA_RAW
-
-# If the scanner is not yet known to HAL, a re-plug of the USB scanner might help
-# otherwise a reboot of the computer should be done to restart the whole udev/HAL machinery
-# and if even a reboot doesn't help, the saned+net workaround should be used.
-# The exit code 10 indicates this case so that YaST can show an appropriate message to the user.
-if [ -n "$UNKNOWN_TO_HAL" ]
-then echo "The following models are currently not known to HAL:" 1>&2
- for m in $UNKNOWN_TO_HAL
- do echo " $m" 1>&2
- done
- echo "" 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 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
- echo "is that the kernel module for the scanner's SCSI host" 1>&2
- echo "adapter does not notify HAL about the scanner device." 1>&2
- echo "If even a reboot does not help, you could access" 1>&2
- echo "the scanner via the 'saned' as a workaround." 1>&2
- echo "For this workaround choose 'scanning via network'" 1>&2
- echo "and select the 'local host configuration'." 1>&2
- exit 10
-fi
-
-exit 0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.1/tools/test_scanner_backend new/yast2-scanner-2.19.2/tools/test_scanner_backend
--- old/yast2-scanner-2.19.1/tools/test_scanner_backend 2009-10-29 12:30:17.000000000 +0100
+++ new/yast2-scanner-2.19.2/tools/test_scanner_backend 2010-02-11 16:20:40.000000000 +0100
@@ -1,6 +1,24 @@
#! /bin/bash
+
+# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010
+#
+# Copyright (c) 2010 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
#
-# Johannes Meixner , 2004, 2005, 2006, 2007, 2008
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
#set -x
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
