Author: jsmeix Date: Wed Jun 13 15:12:21 2007 New Revision: 38428 URL: http://svn.opensuse.org/viewcvs/yast?rev=38428&view=rev Log: - V 2.15.2 - Adapted test_and_set_scanner_access_permissions according to the currently newest changes in HAL (see Suse Bugzilla bug 250659). - Adapted setup_hplip_scanner_service to be prepared for HPLIP version 2.x (but be backward compatible). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/tools/setup_hplip_scanner_service trunk/scanner/tools/test_and_set_scanner_access_permissions Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=38428&r1=38427&r2=38428&view=diff ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Wed Jun 13 15:12:21 2007 @@ -1 +1 @@ -2.15.1 +2.15.2 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=38428&r1=38427&r2=38428&view=diff ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Wed Jun 13 15:12:21 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Jun 13 15:01:23 CEST 2007 - jsmeix@suse.de + +- V 2.15.2 +- Adapted test_and_set_scanner_access_permissions according to the + currently newest changes in HAL (see Suse Bugzilla bug 250659). +- Adapted setup_hplip_scanner_service to be prepared for + HPLIP version 2.x (but be backward compatible). + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain@suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/scanner/tools/setup_hplip_scanner_service URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/setup_hplip_scanner_service?rev=38428&r1=38427&r2=38428&view=diff ============================================================================== --- trunk/scanner/tools/setup_hplip_scanner_service (original) +++ trunk/scanner/tools/setup_hplip_scanner_service Wed Jun 13 15:12:21 2007 @@ -16,12 +16,18 @@ insserv -r ptal fi -# Setup the hplip service: +# Setup the hplip services: +# HPLIP version 0.x and 1.x require the hplip services (hpiod and hpssd) to be up and running. +# For HPLIP version 2.x there is no longer a hpiod and hpssd is only optional. +# Therefore it is only for version 0.x and 1.x an error if /etc/init.d/hplip cannot be executed. +# Some functionality (e.g. faxing from applications requires a running hpssd). +# Therefore it might be better when hpssd is started in any case during boot +# so that we may have a /etc/init.d/hplip in version 2.x to start hpssd during boot. if [ -x /etc/init.d/hplip ] then insserv hplip || { echo "failed: insserv hplip" 1>&2 ; exit 2 ; } /etc/init.d/hplip restart || { echo "failed: /etc/init.d/hplip restart" 1>&2 ; exit 3 ; } else echo "cannot execute /etc/init.d/hplip" 1>&2 - exit 1 + rpm -q hplip | egrep -q '^hplip-0\.|^hplip-1\.' && exit 1 fi exit 0 Modified: trunk/scanner/tools/test_and_set_scanner_access_permissions URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/test_and_set_scanner_access_permissions?rev=38428&r1=38427&r2=38428&view=diff ============================================================================== --- trunk/scanner/tools/test_and_set_scanner_access_permissions (original) +++ trunk/scanner/tools/test_and_set_scanner_access_permissions Wed Jun 13 15:12:21 2007 @@ -63,9 +63,9 @@ echo ' <device>' >>$HAL_LOCAL_FILE echo '' >>$HAL_LOCAL_FILE echo ' Reply