Hello community, here is the log from the commit of package pm-utils checked in at Fri Mar 16 14:10:04 CET 2007. -------- --- pm-utils/pm-utils.changes 2007-03-14 21:30:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2007-03-16 10:52:54.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Mar 16 10:51:47 CET 2007 - seife@suse.de + +- update to current CVS + - pm-utils-0.99.2-fix-stopservice.diff integrated upstream +- fix the handling of config files in /etc/pm/config.d/ (they were + simply ignored before) + +------------------------------------------------------------------- Old: ---- pm-utils-0.99.2.20070314-suse.diff pm-utils-0.99.2.20070314.tar.gz pm-utils-0.99.2-fix-stopservice.diff New: ---- pm-utils-0.99.2.20070315-suse.diff pm-utils-0.99.2.20070315.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.N19995/_old 2007-03-16 14:09:59.000000000 +0100 +++ /var/tmp/diff_new_pack.N19995/_new 2007-03-16 14:09:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package pm-utils (Version 0.99.2.20070314) +# spec file for package pm-utils (Version 0.99.2.20070315) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,16 +12,15 @@ Name: pm-utils URL: http://webcvs.freedesktop.org/pm-utils/ -Version: 0.99.2.20070314 +Version: 0.99.2.20070315 Release: 1 %define pm_utils_suse_version 20070314 Summary: Tools to suspend and hibernate computers. License: GNU General Public License (GPL) Group: System/Base Source: %{name}-%{version}.tar.gz -Patch0: pm-utils-0.99.2.20070314-suse.diff +Patch0: pm-utils-0.99.2.20070315-suse.diff Patch1: pm-utils-0.99.2-uswsusp-support.diff -Patch2: pm-utils-0.99.2-fix-stopservice.diff Patch3: pm-utils-0.99.2-comment-configfile.diff Source1: pm-utils-suse-%{pm_utils_suse_version}.tar.gz Source2: README.upstream-hooks @@ -46,7 +45,6 @@ %prep %setup -b 1 %patch1 -p0 -%patch2 -p0 %patch3 -p0 %patch0 -p0 @@ -79,6 +77,11 @@ %doc hooks %changelog +* Fri Mar 16 2007 - seife@suse.de +- update to current CVS + - pm-utils-0.99.2-fix-stopservice.diff integrated upstream +- fix the handling of config files in /etc/pm/config.d/ (they were + simply ignored before) * Wed Mar 14 2007 - seife@suse.de - update to version 0.99.2+ (CVS as of today) - move the executables from /etc/pm to /usr/lib/pm-utils ++++++ pm-utils-0.99.2.20070314-suse.diff -> pm-utils-0.99.2.20070315-suse.diff ++++++ --- pm-utils/pm-utils-0.99.2.20070314-suse.diff 2007-03-14 19:35:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils-0.99.2.20070315-suse.diff 2007-03-16 10:49:38.000000000 +0100 @@ -1,6 +1,6 @@ --- pm/functions +++ pm/functions -@@ -15,7 +15,7 @@ +@@ -15,39 +15,30 @@ HIBERNATE_METHOD="" S2DISK_BIN=/usr/sbin/s2disk S2DISK_CONF=/var/lib/s2disk.conf @@ -9,7 +9,52 @@ [ -f /usr/lib/pm-utils/defaults ] && . /usr/lib/pm-utils/defaults -@@ -71,7 +71,7 @@ +-GLOBAL_CONFIG_VARIABLES="" +-add_global() { +- export $1 +- GLOBAL_CONFIG_VARIABLES="$GLOBAL_CONFIG_VARIABLES $1" +-} +- + # export them all here +-add_global HIBERNATE_RESUME_POST_VIDEO +-add_global INHIBIT +-add_global PM_LOGFILE +-add_global PM_CMDLINE +-add_global RESUME_MODULES +-add_global SUSPEND_MODULES +-add_global TEMPORARY_CPUFREQ_GOVERNOR +-add_global HIBERNATE_METHOD +-add_global S2DISK_BIN +-add_global S2DISK_CONF ++export HIBERNATE_RESUME_POST_VIDEO ++export INHIBIT ++export PM_LOGFILE ++export PM_CMDLINE ++export RESUME_MODULES ++export SUSPEND_MODULES ++export TEMPORARY_CPUFREQ_GOVERNOR ++export HIBERNATE_METHOD ++export S2DISK_BIN ++export S2DISK_CONF + + source_configs() + { + cfgs="/etc/pm/config.d/*[^~]" + for cfg in $cfgs ; do + [ -x $cfg ] || continue +- while read LINE ; do +- case "$GLOBAL_CONFIG_VARIABLES " in +- *" ${LINE%=*} "*) continue ;; +- *) eval $LINE ;; +- esac +- done < $cfg ++ set -a ++ . $cfg ++ set +a + done + } + +@@ -71,7 +62,7 @@ remove_suspend_lock() { @@ -18,7 +63,7 @@ chvt 1 chvt $VT openvt -- sh -c "usleep $1 ; rm -f /.suspended >/dev/null 2>&1 0<&1" >/dev/null 2>&1 0<&1 & -@@ -97,7 +97,7 @@ +@@ -97,7 +88,7 @@ [ -z "$1" ] && return 0 [ -f /var/run/pm-suspend ] && . /var/run/pm-suspend ++++++ pm-utils-0.99.2.20070314.tar.gz -> pm-utils-0.99.2.20070315.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.2.20070314/configure new/pm-utils-0.99.2.20070315/configure --- old/pm-utils-0.99.2.20070314/configure 2007-03-14 19:16:48.000000000 +0100 +++ new/pm-utils-0.99.2.20070315/configure 2007-03-16 10:47:31.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for pm-utils 0.99.2.20070314. +# Generated by GNU Autoconf 2.61 for pm-utils 0.99.2.20070315. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ # Identity of this package. PACKAGE_NAME='pm-utils' PACKAGE_TARNAME='pm-utils' -PACKAGE_VERSION='0.99.2.20070314' -PACKAGE_STRING='pm-utils 0.99.2.20070314' +PACKAGE_VERSION='0.99.2.20070315' +PACKAGE_STRING='pm-utils 0.99.2.20070315' PACKAGE_BUGREPORT='' ac_unique_file="src" @@ -1170,7 +1170,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 pm-utils 0.99.2.20070314 to adapt to many kinds of systems. +\`configure' configures pm-utils 0.99.2.20070315 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1236,7 +1236,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pm-utils 0.99.2.20070314:";; + short | recursive ) echo "Configuration of pm-utils 0.99.2.20070315:";; esac cat <<\_ACEOF @@ -1318,7 +1318,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pm-utils configure 0.99.2.20070314 +pm-utils configure 0.99.2.20070315 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1332,7 +1332,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pm-utils $as_me 0.99.2.20070314, which was +It was created by pm-utils $as_me 0.99.2.20070315, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2023,7 +2023,7 @@ # Define the identity of the package. PACKAGE=pm-utils - VERSION=0.99.2.20070314 + VERSION=0.99.2.20070315 cat >>confdefs.h <<_ACEOF @@ -3698,7 +3698,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pm-utils $as_me 0.99.2.20070314, which was +This file was extended by pm-utils $as_me 0.99.2.20070315, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3751,7 +3751,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -pm-utils config.status 0.99.2.20070314 +pm-utils config.status 0.99.2.20070315 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.2.20070314/configure.in new/pm-utils-0.99.2.20070315/configure.in --- old/pm-utils-0.99.2.20070314/configure.in 2007-03-14 19:13:34.000000000 +0100 +++ new/pm-utils-0.99.2.20070315/configure.in 2007-03-16 10:47:20.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(pm-utils, 0.99.2.20070314) +AC_INIT(pm-utils, 0.99.2.20070315) AC_CONFIG_SRCDIR(src) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.2.20070314/pm/functions new/pm-utils-0.99.2.20070315/pm/functions --- old/pm-utils-0.99.2.20070314/pm/functions 2007-03-14 19:15:11.000000000 +0100 +++ new/pm-utils-0.99.2.20070315/pm/functions 2007-03-16 10:43:57.000000000 +0100 @@ -246,7 +246,7 @@ { service "$1" status 2>/dev/null | grep -c -q running if [ "$?" == "0" ]; then - N=${1//[_.]/_} + N=${1//[-.]/_} echo "export ${N}_SERVICE_ACTIVATE=yes" >> /var/run/pm-suspend service "$1" stop fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org