commit yast2-scanner for openSUSE:Factory

23 Sep 2010

Hello community,

here is the log from the commit of package yast2-scanner for openSUSE:Factory
checked in at Fri Sep 24 00:36:47 CEST 2010.



--------

--- yast2-scanner/yast2-scanner.changes	2010-04-06 17:59:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-scanner/yast2-scanner.changes	2010-09-23 15:55:42.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Sep 23 15:27:40 CEST 2010 - jsmeix@suse.de
+
+- V 2.20.0
+- Let the ConfigureBackendDialog automatically proceed to the next
+  dialog (i.e. to the overview dialog) after successful backend
+  activation (see openSUSE/Novell Bugzilla bnc#636083).
+- Fix determine_active_scanner_backends so that it also detects
+  active backends with '_' or '-' characters in the backend name
+  (see openSUSE/Novell Bugzilla bnc#641111).
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  yast2-scanner-2.19.2.tar.bz2

New:
----
  yast2-scanner-2.20.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.mfhgds/_old	2010-09-24 00:35:29.000000000 +0200
+++ /var/tmp/diff_new_pack.mfhgds/_new	2010-09-24 00:35:29.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-scanner (Version 2.19.2)
+# spec file for package yast2-scanner (Version 2.20.0)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,12 +19,12 @@
 
 
 Name:           yast2-scanner
-Version:        2.19.2
+Version:        2.20.0
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-scanner-2.19.2.tar.bz2
+Source0:        yast2-scanner-2.20.0.tar.bz2
 
 Prefix:         /usr
 
@@ -49,7 +49,7 @@
 "sane-backends".
 
 %prep
-%setup -n yast2-scanner-2.19.2
+%setup -n yast2-scanner-2.20.0
 
 %build
 %{prefix}/bin/y2tool y2autoconf

++++++ yast2-scanner-2.19.2.tar.bz2 -> yast2-scanner-2.20.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.2/VERSION new/yast2-scanner-2.20.0/VERSION
--- old/yast2-scanner-2.19.2/VERSION	2010-04-06 16:43:43.000000000 +0200
+++ new/yast2-scanner-2.20.0/VERSION	2010-09-23 15:27:36.000000000 +0200
@@ -1 +1 @@
-2.19.2
+2.20.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.2/configure new/yast2-scanner-2.20.0/configure
--- old/yast2-scanner-2.19.2/configure	2010-04-06 17:55:08.000000000 +0200
+++ new/yast2-scanner-2.20.0/configure	2010-09-23 15:34:45.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.2.
+# Generated by GNU Autoconf 2.63 for yast2-scanner 2.20.0.
 #
 # 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.2'
-PACKAGE_STRING='yast2-scanner 2.19.2'
+PACKAGE_VERSION='2.20.0'
+PACKAGE_STRING='yast2-scanner 2.20.0'
 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.2 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.20.0 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.2:";;
+     short | recursive ) echo "Configuration of yast2-scanner 2.20.0:";;
    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.2
+yast2-scanner configure 2.20.0
 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.2, which was
+It was created by yast2-scanner $as_me 2.20.0, 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.2'
+ VERSION='2.20.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2793,7 +2793,7 @@
 
 
 
-VERSION="2.19.2"
+VERSION="2.20.0"
 RPMNAME="yast2-scanner"
 MAINTAINER="Johannes Meixner <jsmeix@suse.de>"
 
@@ -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.2, which was
+This file was extended by yast2-scanner $as_me 2.20.0, 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.2
+yast2-scanner config.status 2.20.0
 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.2/configure.in new/yast2-scanner-2.20.0/configure.in
--- old/yast2-scanner-2.19.2/configure.in	2010-04-06 17:54:52.000000000 +0200
+++ new/yast2-scanner-2.20.0/configure.in	2010-09-23 15:34:29.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.2, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.20.0, 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.2"
+VERSION="2.20.0"
 RPMNAME="yast2-scanner"
 MAINTAINER="Johannes Meixner <jsmeix@suse.de>"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.2/src/Scanner.ycp new/yast2-scanner-2.20.0/src/Scanner.ycp
--- old/yast2-scanner-2.19.2/src/Scanner.ycp	2010-04-06 16:39:49.000000000 +0200
+++ new/yast2-scanner-2.20.0/src/Scanner.ycp	2010-04-06 17:56:00.000000000 +0200
@@ -25,7 +25,7 @@
  * Summary:     Scanner settings, input and output functions
  * Authors:     Johannes Meixner <jsmeix@suse.de>
  *
- * $Id: Scanner.ycp 60804 2010-02-11 16:19:48Z jsmeix $
+ * $Id: Scanner.ycp 61594 2010-04-06 15:56:00Z jsmeix $
  *
  * Representation of the configuration of scanner.
  * Input and output routines.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.2/src/dialogs.ycp new/yast2-scanner-2.20.0/src/dialogs.ycp
--- old/yast2-scanner-2.19.2/src/dialogs.ycp	2010-02-11 17:19:49.000000000 +0100
+++ new/yast2-scanner-2.20.0/src/dialogs.ycp	2010-09-23 15:27:25.000000000 +0200
@@ -848,9 +848,20 @@
                            // Only a simple message because before the function Scanner::ActivateBackend
                            // was called and this function would have shown more specific messages.
                            _("Failed to activate %1."), backend_name ) );
+    Wizard::EnableBackButton();
+    Wizard::EnableNextButton();
+  }
+  else
+  { // Wait two seconds so that the user can notice that Scanner::ActivateBackend(...) was successful
+    // and then automatically proceed to the 'next' dialog which is the overview dialog.
+    // Therefore there is no way 'back' when Scanner::ActivateBackend(...) was successful
+    // (which makes sense because why should the user undo right now what was successful)
+    // so that 'back' is only possible if Scanner::ActivateBackend(...) failed or when it
+    // was aborted by the user (e.g. when the user aborted to install a required package):
+    Wizard::EnableNextButton();
+    sleep( 2000 );
+    UI::FakeUserInput( `next );
   }
-  Wizard::EnableBackButton();
-  Wizard::EnableNextButton();
   any ret = nil;
   while(true)
   { ret = UI::UserInput();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-2.19.2/tools/determine_active_scanner_backends new/yast2-scanner-2.20.0/tools/determine_active_scanner_backends
--- old/yast2-scanner-2.19.2/tools/determine_active_scanner_backends	2010-02-11 16:18:00.000000000 +0100
+++ new/yast2-scanner-2.20.0/tools/determine_active_scanner_backends	2010-09-23 15:03:09.000000000 +0200
@@ -40,7 +40,7 @@
 # Get the raw data
 # The 'sort -u' is crucial because the YaST scanner module requires
 # a list of unique backend names (e.g. in Scanner::Overview ):
-grep '^[[:alnum:]][[:alnum:]]*$' /etc/sane.d/dll.conf | sort -u >$TMP_DATA
+grep '^[[:alnum:]][[:alnum:]_-]*$' /etc/sane.d/dll.conf | sort -u >$TMP_DATA
 
 # Output:
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)