Hello community,
here is the log from the commit of package pm-utils
checked in at Fri Jul 27 02:07:49 CEST 2007.
--------
--- pm-utils/pm-utils.changes 2007-04-04 13:12:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2007-07-24 21:52:58.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Jul 24 21:04:48 CEST 2007 - seife@suse.de
+
+- update to current CVS:
+ - our export-variables patch included
+ - minor build system tweaks
+- fix reading of multiple configuration files
+- removed docker hook, is now in dockutils
+
+-------------------------------------------------------------------
Old:
----
pm-utils-0.99.3-exportvariables.diff
pm-utils-0.99.3.tar.gz
pm-utils-suse-20070404.tar.gz
New:
----
pm-utils-0.99.3.20070618.tar.gz
pm-utils-0.99.3-fix-config-loading.diff
pm-utils-suse-20070724.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pm-utils.spec ++++++
--- /var/tmp/diff_new_pack.sD2798/_old 2007-07-27 02:07:33.000000000 +0200
+++ /var/tmp/diff_new_pack.sD2798/_new 2007-07-27 02:07:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package pm-utils (Version 0.99.3)
+# spec file for package pm-utils (Version 0.99.3.20070618)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,14 +12,14 @@
Name: pm-utils
URL: http://webcvs.freedesktop.org/pm-utils/
-Version: 0.99.3
-Release: 4
-%define pm_utils_suse_version 20070404
-Summary: Tools to suspend and hibernate computers.
-License: GNU General Public License (GPL)
+Version: 0.99.3.20070618
+Release: 1
+%define pm_utils_suse_version 20070724
+Summary: Tools to suspend and hibernate computers
+License: GPL v2 or later
Group: System/Base
Source: %{name}-%{version}.tar.gz
-Patch1: pm-utils-0.99.3-exportvariables.diff
+Patch1: pm-utils-0.99.3-fix-config-loading.diff
Patch2: pm-utils-0.99.3-uswsusp-support.diff
Patch3: pm-utils-0.99.3-comment-configfile.diff
Patch99: pm-utils-0.99.3-suse.diff
@@ -57,9 +57,9 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
-mkdir hooks
+mkdir -p examples/hooks
for i in 01grub 20video 49bluetooth 60sysfont 65alsa 90clock 99video; do
- mv $RPM_BUILD_ROOT/usr/lib/pm-utils/sleep.d/$i hooks
+ mv $RPM_BUILD_ROOT/usr/lib/pm-utils/sleep.d/$i examples/hooks
done
cp %{S:2} hooks
cd ../pm-utils-suse
@@ -75,10 +75,16 @@
/usr/bin/*
/usr/lib/pm-utils
%_mandir/man1/*
-%doc README COPYING ChangeLog AUTHORS
-%doc hooks
+%doc README ChangeLog AUTHORS
+%doc examples
%changelog
+* Tue Jul 24 2007 - seife@suse.de
+- update to current CVS:
+ - our export-variables patch included
+ - minor build system tweaks
+- fix reading of multiple configuration files
+- removed docker hook, is now in dockutils
* Wed Apr 04 2007 - seife@suse.de
- use long options for s2disk/s2both, short options will be depre-
cated
++++++ pm-utils-0.99.3.tar.gz -> pm-utils-0.99.3.20070618.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.3/ChangeLog new/pm-utils-0.99.3.20070618/ChangeLog
--- old/pm-utils-0.99.3/ChangeLog 2007-03-26 17:10:08.000000000 +0200
+++ new/pm-utils-0.99.3.20070618/ChangeLog 2007-07-24 20:18:05.000000000 +0200
@@ -1,3 +1,25 @@
+2007-06-18 Peter Jones
+
+ * pm/hooks/99video src/pm-action:
+ Add support for "--quirk-reset-brightness" (fixes the Fujitsu
+ Lifebook S7110)
+
+2007-06-04 Richard Hughes
+
+ * pm/hooks/20video:
+ We are not turning off the DAC and light in 20video, but we are
+ turning it on in 99video. Fix.
+
+2007-05-15 Peter Jones
+
+ * pm/functions:
+ - export config variables from pm/functions as well (patch from
+ Stefan)
+
+ * man/Makefile.am:
+ - only clean up man pages on mainainter-clean, not on normal
+ clean (Patch from Tim Dijkstra )
+
2007-03-26 Peter Jones
* pm/functions:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.3/configure new/pm-utils-0.99.3.20070618/configure
--- old/pm-utils-0.99.3/configure 2007-03-26 17:32:23.000000000 +0200
+++ new/pm-utils-0.99.3.20070618/configure 2007-07-24 20:19:10.000000000 +0200
@@ -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.3.
+# Generated by GNU Autoconf 2.61 for pm-utils 0.99.3.20070618.
#
# 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.3'
-PACKAGE_STRING='pm-utils 0.99.3'
+PACKAGE_VERSION='0.99.3.20070618'
+PACKAGE_STRING='pm-utils 0.99.3.20070618'
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.3 to adapt to many kinds of systems.
+\`configure' configures pm-utils 0.99.3.20070618 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.3:";;
+ short | recursive ) echo "Configuration of pm-utils 0.99.3.20070618:";;
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.3
+pm-utils configure 0.99.3.20070618
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.3, which was
+It was created by pm-utils $as_me 0.99.3.20070618, 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.3
+ VERSION=0.99.3.20070618
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.3, which was
+This file was extended by pm-utils $as_me 0.99.3.20070618, 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.3
+pm-utils config.status 0.99.3.20070618
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.3/configure.in new/pm-utils-0.99.3.20070618/configure.in
--- old/pm-utils-0.99.3/configure.in 2007-03-26 17:30:52.000000000 +0200
+++ new/pm-utils-0.99.3.20070618/configure.in 2007-07-24 20:18:55.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(pm-utils, 0.99.3)
+AC_INIT(pm-utils, 0.99.3.20070618)
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.3/man/Makefile.am new/pm-utils-0.99.3.20070618/man/Makefile.am
--- old/pm-utils-0.99.3/man/Makefile.am 2007-03-09 17:12:29.000000000 +0100
+++ new/pm-utils-0.99.3.20070618/man/Makefile.am 2007-06-05 22:43:54.000000000 +0200
@@ -7,6 +7,9 @@
pm-pmu.sgml \
$(man_MANS)
+MAINTAINERCLEANFILES = \
+ $(man_MANS)
+
pm-pmu.1: pm-pmu.sgml
docbook2man $?
@@ -15,5 +18,4 @@
clean-local :
rm -f *~
- rm -f *.1
rm -f manpage.*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.3/man/Makefile.in new/pm-utils-0.99.3.20070618/man/Makefile.in
--- old/pm-utils-0.99.3/man/Makefile.in 2007-03-26 17:32:22.000000000 +0200
+++ new/pm-utils-0.99.3.20070618/man/Makefile.in 2007-07-24 20:19:08.000000000 +0200
@@ -140,6 +140,9 @@
pm-pmu.sgml \
$(man_MANS)
+MAINTAINERCLEANFILES = \
+ $(man_MANS)
+
all: all-am
.SUFFIXES:
@@ -281,6 +284,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-generic clean-local mostlyclean-am
@@ -359,7 +363,6 @@
clean-local :
rm -f *~
- rm -f *.1
rm -f manpage.*
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.3/pm/functions new/pm-utils-0.99.3.20070618/pm/functions
--- old/pm-utils-0.99.3/pm/functions 2007-03-26 17:30:15.000000000 +0200
+++ new/pm-utils-0.99.3.20070618/pm/functions 2007-06-05 22:43:54.000000000 +0200
@@ -8,13 +8,13 @@
# PM_CMDLINE
# RESUME_MODULES
#
+set -a
HIBERNATE_RESUME_POST_VIDEO=no
INHIBIT=/var/run/pm-utils.inhibit
PM_LOGFILE=${PM_LOGFILE:=/var/log/pm-suspend.log}
SUSPEND_MODULES=""
TEMPORARY_CPUFREQ_GOVERNOR="userspace"
-set -a
[ -f /usr/lib/pm-utils/defaults ] && . /usr/lib/pm-utils/defaults
set +a
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.3/pm/hooks/20video new/pm-utils-0.99.3.20070618/pm/hooks/20video
--- old/pm-utils-0.99.3/pm/hooks/20video 2007-03-14 19:13:09.000000000 +0100
+++ new/pm-utils-0.99.3.20070618/pm/hooks/20video 2007-06-05 22:43:54.000000000 +0200
@@ -42,6 +42,10 @@
fi
# We might need to do one or many of these quirks
+ if [ "${DISPLAY_QUIRK_RADEON_OFF}" == "true" ]; then
+ radeon dac off
+ radeon light off
+ fi
if [ "${DISPLAY_QUIRK_VBESTATE_RESTORE}" == "true" ]; then
vbe vbestate save > /var/run/vbestate
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.3/pm/hooks/99video new/pm-utils-0.99.3.20070618/pm/hooks/99video
--- old/pm-utils-0.99.3/pm/hooks/99video 2007-03-14 19:15:59.000000000 +0100
+++ new/pm-utils-0.99.3.20070618/pm/hooks/99video 2007-07-24 20:18:05.000000000 +0200
@@ -9,6 +9,17 @@
. /usr/lib/pm-utils/functions
+
+reset_brightness() {
+ for bl in /sys/class/backlight/* ; do
+ [ -d $bl ] || continue
+ [ -f $bl/brightness ] || continue
+ BR=$(cat $bl/brightness)
+ echo 0 > $bl/brightness
+ echo $BR > $bl/brightness
+ done
+}
+
vbetool=$(type -p vbetool)
vbe() {
if [ -z "$vbetool" ]; then
@@ -35,7 +46,7 @@
fi
# We might need to do one or many of these quirks
if [ "${DISPLAY_QUIRK_VBE_POST}" == "true" ]; then
- vbe post
To: pm-utils@lists.freedesktop.org
Subject: [Pm-utils] [PATCH] Fix config loading
This fixes a typo in which was keeping multiple files from loading
from config.d directory.
-Jim
Index: pm/functions
===================================================================
RCS file: /cvs/pm-utils/pm-utils/pm/functions,v
retrieving revision 1.45
diff -u -r1.45 functions
--- pm/functions 15 May 2007 14:57:02 -0000 1.45
+++ pm/functions 6 Jul 2007 23:16:59 -0000
@@ -22,7 +22,7 @@
{
cfgs="/etc/pm/config.d/*[^~]"
for cfg in $cfgs ; do
- [ -f $cfgs ] || continue
+ [ -f $cfg ] || continue
set -a
. $cfg
set +a
_______________________________________________
Pm-utils mailing list
Pm-utils@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pm-utils
++++++ pm-utils-suse-20070404.tar.gz -> pm-utils-suse-20070724.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/23dock new/pm-utils-suse/hooks/23dock
--- old/pm-utils-suse/hooks/23dock 2006-11-06 18:37:53.000000000 +0100
+++ new/pm-utils-suse/hooks/23dock 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- hibernate|suspend)
- [ -x /usr/sbin/docker ] && /usr/sbin/docker undock
- ;;
- thaw|resume)
- [ -x /usr/sbin/docker ] && /usr/sbin/docker dock
- ;;
- *)
- ;;
-esac
-
-exit $?
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org