Hello community,
here is the log from the commit of package yast2-scanner
checked in at Tue Aug 15 18:29:58 CEST 2006.
--------
--- yast2-scanner/yast2-scanner.changes 2006-03-23 15:50:06.000000000 +0100
+++ yast2-scanner/yast2-scanner.changes 2006-08-15 13:58:45.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Aug 15 11:40:28 CEST 2006 - jsmeix@suse.de
+
+- V 2.14.0
+- Increased MAXIMUM_WAIT in test_scanner_backend to 120 seconds
+ because otherwise it is early aborted for some scanners
+ which need a long time to warm up the lamp.
+- Test also for "hpfax" in DependantPrintQueueExists() function
+ (see Suse Bugzilla #184824).
+- Fixed SetScsiScannerAccessPermissions(): First enable sane-dev
+ then (re)start it.
+
+-------------------------------------------------------------------
Old:
----
yast2-scanner-2.13.16.tar.bz2
New:
----
yast2-scanner-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.nn0Tv5/_old 2006-08-15 18:29:34.000000000 +0200
+++ /var/tmp/diff_new_pack.nn0Tv5/_new 2006-08-15 18:29:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.13.16)
+# spec file for package yast2-scanner (Version 2.14.0)
#
# 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.13.16
+Version: 2.14.0
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.13.16.tar.bz2
+Source0: yast2-scanner-2.14.0.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
@@ -37,7 +37,7 @@
Johannes Meixner
%prep
-%setup -n yast2-scanner-2.13.16
+%setup -n yast2-scanner-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,15 @@
%doc %{prefix}/share/doc/packages/yast2-scanner
%changelog -n yast2-scanner
+* Tue Aug 15 2006 - jsmeix@suse.de
+- V 2.14.0
+- Increased MAXIMUM_WAIT in test_scanner_backend to 120 seconds
+ because otherwise it is early aborted for some scanners
+ which need a long time to warm up the lamp.
+- Test also for "hpfax" in DependantPrintQueueExists() function
+ (see Suse Bugzilla #184824).
+- Fixed SetScsiScannerAccessPermissions(): First enable sane-dev
+ then (re)start it.
* Thu Mar 23 2006 - jsmeix@suse.de
- V 2.13.16
- Added Confirm::MustBeRoot() to the initial ReadDialog()
++++++ yast2-scanner-2.13.16.tar.bz2 -> yast2-scanner-2.14.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/Makefile.am new/yast2-scanner-2.14.0/Makefile.am
--- old/yast2-scanner-2.13.16/Makefile.am 2006-03-23 15:40:53.000000000 +0100
+++ new/yast2-scanner-2.14.0/Makefile.am 2006-08-15 12:26:14.000000000 +0200
@@ -6,7 +6,9 @@
# (Edit ./SUBDIRS instead)
#
-PREFIX = /usr
+#where devtools are
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -30,6 +32,10 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
AUTOMAKE_OPTIONS = foreign dist-bzip2
+# where devtools instal m4 snippets
+# argh, executed literally
+#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
@@ -57,12 +63,8 @@
# info '(automake)Conditionals'
if CREATE_PKGCONFIG
-# pkg-config
-# if a package does not have its own pc, copy the generic one
-$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in
- test -f $@ || cp -p $< $@
# create the file here instead of by configure
-# because the prerequisite is made here
+# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
$(RPMNAME).pc: $(RPMNAME).pc.in
@@ -94,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -115,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -142,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -198,10 +200,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/Makefile.am.common new/yast2-scanner-2.14.0/Makefile.am.common
--- old/yast2-scanner-2.13.16/Makefile.am.common 2006-03-23 15:40:53.000000000 +0100
+++ new/yast2-scanner-2.14.0/Makefile.am.common 2006-08-15 12:26:14.000000000 +0200
@@ -9,7 +9,7 @@
# suffix mapping: info '(make)Static Usage'
# apply only to our modules, not external ones
${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $<
+ Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $<
# files to clean
CLEANFILES = ${ybcfiles}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/Makefile.in new/yast2-scanner-2.14.0/Makefile.in
--- old/yast2-scanner-2.13.16/Makefile.in 2006-03-23 15:40:59.000000000 +0100
+++ new/yast2-scanner-2.14.0/Makefile.in 2006-08-15 12:26:19.000000000 +0200
@@ -135,6 +135,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
+YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -194,7 +195,10 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-PREFIX = /usr
+
+#where devtools are
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
@@ -210,6 +214,10 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
AUTOMAKE_OPTIONS = foreign dist-bzip2
+# where devtools instal m4 snippets
+# argh, executed literally
+#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
CLEANFILES =
MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
POT_DST = $(shell find -type d -name testsuite -prune , \
@@ -220,7 +228,7 @@
$(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1)
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
@@ -693,12 +701,8 @@
@echo $(EXTRA_DIST)
# info '(automake)Conditionals'
-# pkg-config
-# if a package does not have its own pc, copy the generic one
-@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in
-@CREATE_PKGCONFIG_TRUE@ test -f $@ || cp -p $< $@
# create the file here instead of by configure
-# because the prerequisite is made here
+# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in
@@ -721,7 +725,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -742,7 +746,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -769,18 +773,18 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -823,10 +827,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
checkpo:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/VERSION new/yast2-scanner-2.14.0/VERSION
--- old/yast2-scanner-2.13.16/VERSION 2006-03-23 15:38:03.000000000 +0100
+++ new/yast2-scanner-2.14.0/VERSION 2006-08-15 11:38:51.000000000 +0200
@@ -1 +1 @@
-2.13.16
+2.14.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/configure new/yast2-scanner-2.14.0/configure
--- old/yast2-scanner-2.13.16/configure 2006-03-23 15:40:57.000000000 +0100
+++ new/yast2-scanner-2.14.0/configure 2006-08-15 12:26:18.000000000 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-scanner 2.13.16.
+# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.0.
#
-# Report bugs to http://www.suse.de/feedback.
+# Report bugs to http://bugs.opensuse.org/.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -269,13 +269,13 @@
# Identity of this package.
PACKAGE_NAME='yast2-scanner'
PACKAGE_TARNAME='yast2-scanner'
-PACKAGE_VERSION='2.13.16'
-PACKAGE_STRING='yast2-scanner 2.13.16'
-PACKAGE_BUGREPORT='http://www.suse.de/feedback'
+PACKAGE_VERSION='2.14.0'
+PACKAGE_STRING='yast2-scanner 2.14.0'
+PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_F
ALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YCPDOC YCPMAKEDEP LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_F
ALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YCPDOC YCPMAKEDEP YCPC LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -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.13.16 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.14.0 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.13.16:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.14.0:";;
esac
cat <<\_ACEOF
@@ -812,7 +812,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to http://www.suse.de/feedback.
+Report bugs to http://bugs.opensuse.org/.
_ACEOF
fi
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-scanner configure 2.13.16
+yast2-scanner configure 2.14.0
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.13.16, which was
+It was created by yast2-scanner $as_me 2.14.0, 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.13.16'
+ VERSION='2.14.0'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.16"
+VERSION="2.14.0"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
@@ -2107,8 +2107,8 @@
{ (exit 1); exit 1; }; }
fi
-devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools`
+devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -2236,6 +2236,52 @@
echo "$as_me: error: ycpmakedep is not installed" >&2;}
{ (exit 1); exit 1; }; }
fi
+# Extract the first word of "ycpc", so it can be a program name with args.
+set dummy ycpc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_YCPC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $YCPC in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_YCPC="$YCPC" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:$bindir"
+for as_dir in $as_dummy
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_YCPC="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_path_YCPC" && ac_cv_path_YCPC="false"
+ ;;
+esac
+fi
+YCPC=$ac_cv_path_YCPC
+
+if test -n "$YCPC"; then
+ echo "$as_me:$LINENO: result: $YCPC" >&5
+echo "${ECHO_T}$YCPC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test "$YCPC" = "false"; then
+ { { echo "$as_me:$LINENO: error: ycpc is not installed" >&5
+echo "$as_me: error: ycpc is not installed" >&2;}
+ { (exit 1); exit 1; }; }
+fi
ac_config_files="$ac_config_files Makefile doc/autodocs/Makefile doc/Makefile src/Makefile testsuite/Makefile tools/Makefile"
@@ -2647,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-scanner $as_me 2.13.16, which was
+This file was extended by yast2-scanner $as_me 2.14.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2702,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-scanner config.status 2.13.16
+yast2-scanner config.status 2.14.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -2965,6 +3011,7 @@
s,@STYLESHEET_YCPDOC@,$STYLESHEET_YCPDOC,;t t
s,@YCPDOC@,$YCPDOC,;t t
s,@YCPMAKEDEP@,$YCPMAKEDEP,;t t
+s,@YCPC@,$YCPC,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/configure.in new/yast2-scanner-2.14.0/configure.in
--- old/yast2-scanner-2.13.16/configure.in 2006-03-23 15:40:53.000000000 +0100
+++ new/yast2-scanner-2.14.0/configure.in 2006-08-15 12:26:14.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-scanner
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-scanner, 2.13.16, http://www.suse.de/feedback, yast2-scanner)
+AC_INIT(yast2-scanner, 2.14.0, 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.13.16"
+VERSION="2.14.0"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
@@ -110,8 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
-devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools`
+devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
dnl producing pkg-config for others?
AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
@@ -138,6 +138,10 @@
if test "$YCPMAKEDEP" = "false"; then
AC_MSG_ERROR([ycpmakedep is not installed])
fi
+AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
+if test "$YCPC" = "false"; then
+ AC_MSG_ERROR([ycpc is not installed])
+fi
AC_CONFIG_FILES(Makefile doc/autodocs/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/doc/Makefile.in new/yast2-scanner-2.14.0/doc/Makefile.in
--- old/yast2-scanner-2.13.16/doc/Makefile.in 2006-03-23 15:40:58.000000000 +0100
+++ new/yast2-scanner-2.14.0/doc/Makefile.in 2006-08-15 12:26:19.000000000 +0200
@@ -113,6 +113,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/doc/autodocs/Makefile.in new/yast2-scanner-2.14.0/doc/autodocs/Makefile.in
--- old/yast2-scanner-2.13.16/doc/autodocs/Makefile.in 2006-03-23 15:40:58.000000000 +0100
+++ new/yast2-scanner-2.14.0/doc/autodocs/Makefile.in 2006-08-15 12:26:19.000000000 +0200
@@ -103,6 +103,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/src/Makefile.in new/yast2-scanner-2.14.0/src/Makefile.in
--- old/yast2-scanner-2.13.16/src/Makefile.in 2006-03-23 15:40:59.000000000 +0100
+++ new/yast2-scanner-2.14.0/src/Makefile.in 2006-08-15 12:26:19.000000000 +0200
@@ -114,6 +114,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -470,7 +471,7 @@
# suffix mapping: info '(make)Static Usage'
# apply only to our modules, not external ones
${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $<
+ Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $<
# generate dependencies
# two steps not to lose the file if the command fails
# hook: create the links before we look for files
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/src/Scanner.ycp new/yast2-scanner-2.14.0/src/Scanner.ycp
--- old/yast2-scanner-2.13.16/src/Scanner.ycp 2006-03-23 15:31:56.000000000 +0100
+++ new/yast2-scanner-2.14.0/src/Scanner.ycp 2006-08-15 13:34:09.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Scanner settings, input and output functions
* Authors: Johannes Meixner
*
- * $Id: Scanner.ycp 28759 2006-03-09 13:17:45Z jsmeix $
+ * $Id: Scanner.ycp 32354 2006-08-15 11:35:44Z jsmeix $
*
* Representation of the configuration of scanner.
* Input and output routines.
@@ -679,12 +679,12 @@
}
);
if( active_scsi_scanner )
- { if( ! Service::Restart( "sane-dev" ) )
- { y2milestone( "Service::Restart('sane-dev') failed." );
+ { if( ! Service::Enable( "sane-dev" ) )
+ { y2milestone( "Service::Enable('sane-dev') failed." );
return false;
}
- if( ! Service::Enable( "sane-dev" ) )
- { y2milestone( "Service::Enable('sane-dev') failed." );
+ if( ! Service::Restart( "sane-dev" ) )
+ { y2milestone( "Service::Restart('sane-dev') failed." );
return false;
}
y2milestone( "Service sane-dev (re)-started and enabled." );
@@ -722,11 +722,14 @@
* @return true if a dependant CUPS print queue exists for the backends hpaio or hpoj
*/
boolean DependantPrintQueueExists( string backend_name )
-{ // Example of a "/usr/bin/lpstat -v" output when the hp CUPS backend is used:
- // device for Queue1: hp:/usb/HP_LaserJet_1220?device=/dev/usb/lp0
- // Example of a "/usr/bin/lpstat -v" output when the ptal CUPS backend is used:
- // device for Queue2: ptal:/mlc:par:HP_LaserJet_1220
- // device for Queue3: ptal:/mlc:usb:HP_LaserJet_1220
+{ // Examples of a "/usr/bin/lpstat -v" output when the hp CUPS backend is used:
+ // device for Queue1: hp:/usb/DeskJet_990C?serial=MX09R1T14QLH
+ // device for Queue2: hp:/net/Officejet_7200_series?ip=10.10.100.100
+ // Example of a "/usr/bin/lpstat -v" output when the hpfax CUPS backend is used:
+ // device for Queue3: hpfax:/net/Officejet_7200_series?ip=10.10.100.100
+ // Examples of a "/usr/bin/lpstat -v" output when the ptal CUPS backend is used:
+ // device for Queue4: ptal:/mlc:par:HP_LaserJet_1220
+ // device for Queue5: ptal:/mlc:usb:HP_LaserJet_1220
// If /usr/bin/lpstat (from the package cups-client) is not installed
// or if it is not from CUPS (e.g. from LPRng or from a third-party printing system)
// and doesn't support the -v parameter or results a different output
@@ -736,7 +739,7 @@
// Note that therefore it is not detected when the hplip service or the ptal service
// is required by a print queue for LPRng or for a third-party printing system.
if( "hpaio" == backend_name )
- { return ExecuteBashCommand( "/usr/bin/lpstat -v | /bin/grep -q ': hp:/'" );
+ { return ExecuteBashCommand( "/usr/bin/lpstat -v | /bin/egrep -q ': hp:/|: hpfax:/'" );
}
if( "hpoj" == backend_name )
{ return ExecuteBashCommand( "/usr/bin/lpstat -v | /bin/grep -q ': ptal:/'" );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/testsuite/Makefile.in new/yast2-scanner-2.14.0/testsuite/Makefile.in
--- old/yast2-scanner-2.13.16/testsuite/Makefile.in 2006-03-23 15:40:59.000000000 +0100
+++ new/yast2-scanner-2.14.0/testsuite/Makefile.in 2006-08-15 12:26:19.000000000 +0200
@@ -101,6 +101,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/tools/Makefile.in new/yast2-scanner-2.14.0/tools/Makefile.in
--- old/yast2-scanner-2.13.16/tools/Makefile.in 2006-03-23 15:40:59.000000000 +0100
+++ new/yast2-scanner-2.14.0/tools/Makefile.in 2006-08-15 12:26:19.000000000 +0200
@@ -97,6 +97,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.13.16/tools/test_scanner_backend new/yast2-scanner-2.14.0/tools/test_scanner_backend
--- old/yast2-scanner-2.13.16/tools/test_scanner_backend 2006-03-23 15:31:55.000000000 +0100
+++ new/yast2-scanner-2.14.0/tools/test_scanner_backend 2006-08-15 11:45:36.000000000 +0200
@@ -13,7 +13,7 @@
BACKEND="$1"
[ -z "$BACKEND" ] && { echo -en "\nUsage:\n$MY_NAME backend\n" 1>&2 ; exit 1 ; }
-MAXIMUM_WAIT="60"
+MAXIMUM_WAIT="120"
# The exit code of "scanimage -d $BACKEND -T" is needed as exit code of this script.
# Therefore this command must run in the foreground.
# Therefore a simple time bomb background process is started before it.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org