Hello community, here is the log from the commit of package dockutils checked in at Fri Jan 12 01:20:23 CET 2007. -------- --- dockutils/dockutils.changes 2006-11-15 20:52:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/dockutils/dockutils.changes 2007-01-11 21:22:39.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 11 20:51:55 CET 2007 - hmacht@suse.de + +- merge patch by seife back into tarball + +------------------------------------------------------------------- Old: ---- dockutils-common_functions-bug221311.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dockutils.spec ++++++ --- /var/tmp/diff_new_pack.i31003/_old 2007-01-12 01:19:56.000000000 +0100 +++ /var/tmp/diff_new_pack.i31003/_new 2007-01-12 01:19:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dockutils (Version 0.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,12 +12,11 @@ Name: dockutils Version: 0.1 -Release: 9 +Release: 16 Summary: Dockingstation support Group: System/Base License: GNU General Public License (GPL) Source0: %{name}-%{version}.tar.bz2 -Patch0: dockutils-common_functions-bug221311.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -33,7 +32,6 @@ %prep %setup -q -%patch0 -p0 %build @@ -51,6 +49,8 @@ %_sbindir/docker %changelog -n dockutils +* Thu Jan 11 2007 - hmacht@suse.de +- merge patch by seife back into tarball * Wed Nov 15 2006 - seife@suse.de - the last fix was wrong, the bug is invalid. * Wed Nov 15 2006 - seife@suse.de ++++++ dockutils-0.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dockutils-0.1/common_functions new/dockutils-0.1/common_functions --- old/dockutils-0.1/common_functions 2006-11-05 02:27:04.000000000 +0100 +++ new/dockutils-0.1/common_functions 2007-01-11 20:51:14.000000000 +0100 @@ -11,15 +11,17 @@ DEVS=`hal-find-by-property --key linux.subsystem --string scsi_host` for I in $DEVS; do - PATH=`/usr/bin/hal-get-property --udi $I --key linux.sysfs_path` + SYS_PATH=`/usr/bin/hal-get-property --udi $I --key linux.sysfs_path` TARGET=0 - for J in $PATH/device/target*; do + for J in $SYS_PATH/device/target*; do test -e $J && TARGET=1 done + # if we had undocked properly before, the target is no longer there. + # this avoids the rescanning of all devices (builtin disk etc). if [ $TARGET = 0 ]; then # rescan the host - echo "rescanning $PATH" - echo "- - -" > $PATH/scan + echo "rescanning $SYS_PATH" + echo "- - -" > $SYS_PATH/scan fi done } @@ -29,8 +31,8 @@ for I in $DEVS; do echo $I - PATH=`hal-get-property --udi $I --key linux.sysfs_path` - echo "unregistered $PATH" - echo 1 > $PATH/device/delete + SYS_PATH=`hal-get-property --udi $I --key linux.sysfs_path` + echo "unregistered $SYS_PATH" + echo 1 > $SYS_PATH/device/delete done } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org