Hello community,
here is the log from the commit of package yast2-printer
checked in at Mon Sep 3 18:48:49 CEST 2007.
--------
--- yast2-printer/yast2-printer.changes 2007-08-06 10:07:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2007-09-03 17:43:46.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Sep 3 17:31:11 CEST 2007 - mzugec@suse.cz
+
+- changed testsuite output
+
+-------------------------------------------------------------------
+Mon Sep 3 16:47:22 CEST 2007 - mzugec@suse.cz
+
+- read URI for usb printers from cups backend if not available
+in hwinfo (#307118)
+- 2.15.5
+
+-------------------------------------------------------------------
Old:
----
yast2-printer-2.15.4.tar.bz2
New:
----
yast2-printer-2.15.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.Y14021/_old 2007-09-03 18:48:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Y14021/_new 2007-09-03 18:48:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.15.4)
+# spec file for package yast2-printer (Version 2.15.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-printer
-Version: 2.15.4
+Version: 2.15.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.15.4.tar.bz2
+Source0: yast2-printer-2.15.5.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite zlib-devel
Requires: yast2 netcat zlib blocxx
@@ -28,12 +28,12 @@
Obsoletes: yast2-agent-cups-devel yast2-agent-printerdb-devel y2d_prnt y2t_prnt yast2-db-printer yast2-printerdb
Summary: YaST2 - Printer Configuration
%package devel-doc
-Version: 2.15.4
+Version: 2.15.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.15.4.tar.bz2
+Source0: yast2-printer-2.15.5.tar.bz2
prefix: /usr
BuildRequires: cups-devel yast2-core-devel zlib-devel
Summary: YaST2 - Developer documentation for yast2-printer
@@ -51,7 +51,7 @@
%prep
-%setup -n yast2-printer-2.15.4
+%setup -n yast2-printer-2.15.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -134,6 +134,12 @@
%exclude %{prefix}/share/doc/packages/yast2-printer/README
%changelog
+* Mon Sep 03 2007 - mzugec@suse.cz
+- changed testsuite output
+* Mon Sep 03 2007 - mzugec@suse.cz
+- read URI for usb printers from cups backend if not available
+ in hwinfo (#307118)
+- 2.15.5
* Mon Aug 06 2007 - mzugec@suse.cz
- reverted factory patch (remove tabs)
- 2.15.4
++++++ yast2-printer-2.15.4.tar.bz2 -> yast2-printer-2.15.5.tar.bz2 ++++++
++++ 16918 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.15.4/configure.in new/yast2-printer-2.15.5/configure.in
--- old/yast2-printer-2.15.4/configure.in 2007-08-06 09:38:01.000000000 +0200
+++ new/yast2-printer-2.15.5/configure.in 2007-09-03 17:42:36.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-printer
dnl
-dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.15.3, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.15.5, http://bugs.opensuse.org/, yast2-printer)
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.15.3"
+VERSION="2.15.5"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.15.4/Makefile.am new/yast2-printer-2.15.5/Makefile.am
--- old/yast2-printer-2.15.4/Makefile.am 2007-08-06 09:38:01.000000000 +0200
+++ new/yast2-printer-2.15.5/Makefile.am 2007-09-03 17:42:36.000000000 +0200
@@ -30,7 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = agent-cups agent-ppd agents data doc src testsuite tools
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.15.4/missing new/yast2-printer-2.15.5/missing
--- old/yast2-printer-2.15.4/missing 2007-08-06 09:38:16.000000000 +0200
+++ new/yast2-printer-2.15.5/missing 2007-09-03 17:42:50.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.15.4/src/modules/Printerlib.ycp new/yast2-printer-2.15.5/src/modules/Printerlib.ycp
--- old/yast2-printer-2.15.4/src/modules/Printerlib.ycp 2007-05-07 13:05:24.000000000 +0200
+++ new/yast2-printer-2.15.5/src/modules/Printerlib.ycp 2007-09-03 17:44:17.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Petr Blahos
*
- * $Id: Printerlib.ycp 37847 2007-05-07 11:05:14Z mzugec $
+ * $Id: Printerlib.ycp 40738 2007-09-03 15:43:19Z mzugec $
*
* Printer library exported functions. What else?!?
*/
@@ -125,7 +125,9 @@
* UNIX-like device
*/
global list<string> GetCupsUsbDeviceInfo (string device) {
+ if (device=="") return [];
integer pos = search(device, "lp");
+ if (pos==nil) return [];
string dev_num = substring (device, pos + 2);
list<string> ret = [];
if (dev_num != "")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.15.4/src/modules/Printer.ycp new/yast2-printer-2.15.5/src/modules/Printer.ycp
--- old/yast2-printer-2.15.4/src/modules/Printer.ycp 2007-05-07 13:05:24.000000000 +0200
+++ new/yast2-printer-2.15.5/src/modules/Printer.ycp 2007-09-03 17:44:17.000000000 +0200
@@ -12,7 +12,7 @@
* Petr Blahos
* Jiri Srain
*
- * $Id: Printer.ycp 37847 2007-05-07 11:05:14Z mzugec $
+ * $Id: Printer.ycp 40738 2007-09-03 15:43:19Z mzugec $
*
* Well we all know what modules are for.
*/
@@ -349,13 +349,15 @@
if (Spooler::Get () == "cups")
{
- dev_name
- = Printerlib::GetCupsUsbDeviceInfo (class_dev)[0]:"";
- if (dev_name == nil || dev_name == "")
- {
- dev_name = class_dev;
- }
+ dev_name = Printerlib::GetCupsUsbDeviceInfo (class_dev)[0]:"";
+ if ((dev_name == nil || dev_name == "")||(class_dev == nil || class_dev == "")){
+ dev_name = Printerlib::GetCupsUsbDevicesInfo()[0,0]:"";
+ }
+ else {
+ dev_name = class_dev;
+ }
}
+ if (dev_name==nil) dev_name="";
p = $[
"vendor" : i["sub_vendor"]:i["vendor"]:"",
"device" : i["sub_device"]:i["device"]:"",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.15.4/testsuite/tests/detectPrinters.out new/yast2-printer-2.15.5/testsuite/tests/detectPrinters.out
--- old/yast2-printer-2.15.4/testsuite/tests/detectPrinters.out 2006-12-11 13:17:34.000000000 +0100
+++ new/yast2-printer-2.15.5/testsuite/tests/detectPrinters.out 2007-09-03 17:41:44.000000000 +0200
@@ -1,6 +1,6 @@
Dump --- Detection for lprng
Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0
-Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]]
+Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]]
Read .target.size "/usr/lib/cups/backend/usb" -1
Read .ppd.db.vendorname "Canon" ""
Read .ppd.db.modelname ["Canon", "BJC-6100"] ""
@@ -8,10 +8,10 @@
Read .ppd.db.vendorname "Canon" ""
Read .ppd.db.modelname ["Canon", "BJC-6100"] ""
Execute .target.bash "grep '^usblp ' /proc/modules" 0
-Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Canon", "vendor_db":""]]
+Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Canon", "vendor_db":""]]
Dump --- Detection for cups
Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0
-Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]]
+Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]]
Read .target.size "/usr/lib/cups/backend/usb" -1
Read .ppd.db.vendorname "Canon" ""
Read .ppd.db.modelname ["Canon", "BJC-6100"] ""
@@ -19,29 +19,29 @@
Read .ppd.db.vendorname "Canon" ""
Read .ppd.db.modelname ["Canon", "BJC-6100"] ""
Execute .target.bash "grep '^usblp ' /proc/modules" 0
-Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Canon", "vendor_db":""]]
+Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Canon", "vendor_db":""]]
Dump --- Detection for lprng
Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0
-Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]]
+Read .probe.printer [$["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]]
Read .target.size "/usr/lib/cups/backend/usb" -1
Execute .target.bash "grep '^usblp ' /proc/modules" 0
Read .proc.modules $["usblp":""]
-Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0
+Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0
Read .ppd.db.vendorname "Epson" ""
Read .ppd.db.modelname ["Epson", "USB Printer"] ""
Execute .target.bash "grep '^usblp ' /proc/modules" 0
-Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Epson", "vendor_db":""]]
+Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Epson", "vendor_db":""]]
Dump --- Detection for cups
Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0
-Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]]
+Read .probe.printer [$["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]]
Read .target.size "/usr/lib/cups/backend/usb" -1
Execute .target.bash "grep '^usblp ' /proc/modules" 0
Read .proc.modules $["usblp":""]
-Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0
+Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0
Read .ppd.db.vendorname "Epson" ""
Read .ppd.db.modelname ["Epson", "USB Printer"] ""
Execute .target.bash "grep '^usblp ' /proc/modules" 0
-Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Epson", "vendor_db":""]]
+Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Epson", "vendor_db":""]]
Dump --- Detection for cups
Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0
Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc."]]
@@ -53,14 +53,14 @@
Read .ppd.db.vendorname "Epson" ""
Read .ppd.db.modelname ["Epson", "Stylus Photo 810"] ""
Execute .target.bash "grep '^usblp ' /proc/modules" 0
-Return [$["device":"Stylus Photo 810", "device_db":"", "info":"Epson Stylus Photo 810", "location":"USB printer on //EPSON/Stylus%20Photo%20810?serial=W33040110201335050", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb://EPSON/Stylus%20Photo%20810?serial=W33040110201335050", "vendor":"Epson", "vendor_db":""]]
+Return [$["device":"Stylus Photo 810", "device_db":"", "info":"Epson Stylus Photo 810", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Epson", "vendor_db":""]]
Dump --- Detection for cups
Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0
-Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "model":"Hewlett-Packard PSC 2200 Series", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"HP", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"HP"]]
+Read .probe.printer [$["bus":"USB", "class_id":265, "model":"Hewlett-Packard PSC 2200 Series", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"HP", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"HP"]]
Read .target.size "/usr/lib/cups/backend/usb" 555
Execute .target.bash_output "/usr/lib/cups/backend/usb" $["exit":0, "stderr":"", "stdout":"direct ptal:/mlc:usb:PSC_2200_Series \"Hewlett-Packard PSC 2200 Series\" \"PTAL mlc:usb:PSC_2200_Series\"\n"]
Execute .target.bash "grep '^usblp ' /proc/modules" 0
Read .ppd.db.vendorname "HP" ""
Read .ppd.db.modelname ["HP", "USB Printer"] ""
Execute .target.bash "grep '^usblp ' /proc/modules" 0
-Return [$["device":"USB Printer", "device_db":"", "info":"HP USB Printer", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"HP", "vendor_db":""]]
+Return [$["device":"USB Printer", "device_db":"", "info":"HP USB Printer", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"HP", "vendor_db":""]]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.15.4/testsuite/tests/detectPrinters.ycp new/yast2-printer-2.15.5/testsuite/tests/detectPrinters.ycp
--- old/yast2-printer-2.15.4/testsuite/tests/detectPrinters.ycp 2006-12-11 13:17:34.000000000 +0100
+++ new/yast2-printer-2.15.5/testsuite/tests/detectPrinters.ycp 2007-09-03 17:31:43.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Petr Blahos
*
- * $Id: detectPrinters.ycp 20185 2004-11-04 15:04:15Z jsrain $
+ * $Id: detectPrinters.ycp 40737 2007-09-03 15:30:44Z mzugec $
*
*/
@@ -104,7 +104,7 @@
$[
"bus":"USB",
"class_id":265,
- "dev_name":"/dev/usblp0",
+// "dev_name":"/dev/usblp0",
"device_id":200786,
"resource":$["baud":[$["speed":1500000]]],
"rev":"1.03",
@@ -150,7 +150,7 @@
$[
"bus":"USB",
"class_id":265,
- "dev_name":"/dev/usblp0",
+// "dev_name":"/dev/usblp0",
"device_id":200786,
"resource":$["baud":[$["speed":1500000]]],
"rev":"1.03",
@@ -228,7 +228,7 @@
$[
"bus":"USB",
"class_id":265,
- "dev_name":"/dev/usblp0",
+// "dev_name":"/dev/usblp0",
"resource":$["baud":[$["speed":1500000]]],
"rev":"1.03",
"sub_class_id":0,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.15.4/VERSION new/yast2-printer-2.15.5/VERSION
--- old/yast2-printer-2.15.4/VERSION 2007-08-06 10:00:32.000000000 +0200
+++ new/yast2-printer-2.15.5/VERSION 2007-09-03 16:47:12.000000000 +0200
@@ -1 +1 @@
-2.15.4
+2.15.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org