Hello community,
here is the log from the commit of package powersave
checked in at Wed Apr 4 21:30:56 CEST 2007.
--------
--- powersave/powersave.changes 2007-03-28 12:04:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/powersave/powersave.changes 2007-04-03 12:54:29.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Apr 3 12:52:37 CEST 2007 - hmacht@suse.de
+
+- remove check for s2ram from initscript
+- fix installation to expand $prefix at make time (patch by
+ Michael Biebl)
+- r2910
+
+-------------------------------------------------------------------
Old:
----
powersave-0.15.11.tar.bz2
New:
----
powersave-0.15.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powersave.spec ++++++
--- /var/tmp/diff_new_pack.W11285/_old 2007-04-04 21:00:55.000000000 +0200
+++ /var/tmp/diff_new_pack.W11285/_new 2007-04-04 21:00:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package powersave (Version 0.15.11)
+# spec file for package powersave (Version 0.15.12)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,7 +14,7 @@
BuildRequires: dbus-1-glib-devel gcc-c++ liblazy lynx pkgconfig
URL: http://powersave.sourceforge.net/
Summary: General Powermanagement daemon supporting APM and ACPI and CPU frequency scaling
-Version: 0.15.11
+Version: 0.15.12
Release: 1
License: GNU General Public License (GPL)
Group: System/Daemons
@@ -87,7 +87,7 @@
autoreconf -fi
./configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS -fno-exceptions" \
--prefix=/usr --enable-buildenv --enable-dbus --libdir=%_libdir \
- --enable-docs --mandir=%_mandir --sysconfdir=%_sysconfdir \
+ --enable-docs --docdir=%_docdir/%{name} --mandir=%_mandir --sysconfdir=%_sysconfdir \
--libexecdir=/usr/lib
make
@@ -167,6 +167,11 @@
%_libdir/lib*.so*
%changelog
+* Tue Apr 03 2007 - hmacht@suse.de
+- remove check for s2ram from initscript
+- fix installation to expand $prefix at make time (patch by
+ Michael Biebl)
+- r2910
* Tue Mar 27 2007 - hmacht@suse.de
- wait for reply from HAL when setting CPUFreq policy with cmd line client
- remove disk settings, provided by pm-utils
++++++ powersave-0.15.11.tar.bz2 -> powersave-0.15.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/config_files/Makefile.in new/powersave-0.15.12/config_files/Makefile.in
--- old/powersave-0.15.11/config_files/Makefile.in 2007-03-27 13:54:03.000000000 +0200
+++ new/powersave-0.15.12/config_files/Makefile.in 2007-04-03 12:49:59.000000000 +0200
@@ -85,12 +85,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/config.h.in new/powersave-0.15.12/config.h.in
--- old/powersave-0.15.11/config.h.in 2007-03-27 13:53:59.000000000 +0200
+++ new/powersave-0.15.12/config.h.in 2007-04-03 12:49:55.000000000 +0200
@@ -1,20 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-/* default bindir */
-#undef BIN_DIR
-
/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
-/* directory for configuration files */
-#undef CONFIG_DIR
-
-/* dbus system bus socket path */
-#undef DBUS_SYSTEM_BUS_SOCKET
-
-/* gnome bindir */
-#undef GNOME_BINDIR
-
/* Define to 1 if you have the header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
@@ -146,9 +134,6 @@
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
-/* kde bindir */
-#undef KDE_BINDIR
-
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
@@ -179,15 +164,9 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* directory for scripts */
-#undef PUB_SCRIPT_DIR
-
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
-/* directory for scripts */
-#undef SCRIPT_DIR
-
/* Define to the type of arg 1 for `select'. */
#undef SELECT_TYPE_ARG1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/configure new/powersave-0.15.12/configure
--- old/powersave-0.15.11/configure 2007-03-27 13:53:56.000000000 +0200
+++ new/powersave-0.15.12/configure 2007-04-03 12:49:52.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for powersave 0.15.11.
+# Generated by GNU Autoconf 2.59 for powersave 0.15.12.
#
# Report bugs to .
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='powersave'
PACKAGE_TARNAME='powersave'
-PACKAGE_VERSION='0.15.11'
-PACKAGE_STRING='powersave 0.15.11'
+PACKAGE_VERSION='0.15.12'
+PACKAGE_STRING='powersave 0.15.12'
PACKAGE_BUGREPORT='hmacht@suse.de'
ac_unique_file="daemon/powersaved.cpp"
@@ -465,7 +465,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HAVE_MAKEINFO HAVE_LYNX DOCS_ENABLED_TRUE DOCS_ENABLED_FALSE PKG_CONFIG ac_pt_PKG_CONFIG DBUS_CFLAGS DBUS_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS LIBLAZY_CFLAGS LIBLAZY_LIBS DOXYGEN configdir scriptdir pubscriptdir docdir BUILD_ENVIRONMENT DEBUG_SCHEMES WARNINGS USE_SYSLOG POWERSAVE_DEBUG LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HAVE_MAKEINFO HAVE_LYNX DOCS_ENABLED_TRUE DOCS_ENABLED_FALSE PKG_CONFIG ac_pt_PKG_CONFIG DBUS_CFLAGS DBUS_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS LIBLAZY_CFLAGS LIBLAZY_LIBS DOXYGEN configdir scriptdir pubscriptdir docdir KDE_BINDIR GNOME_BINDIR BUILD_ENVIRONMENT DEBUG_SCHEMES WARNINGS USE_SYSLOG POWERSAVE_DEBUG LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -982,7 +982,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 powersave 0.15.11 to adapt to many kinds of systems.
+\`configure' configures powersave 0.15.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1048,7 +1048,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of powersave 0.15.11:";;
+ short | recursive ) echo "Configuration of powersave 0.15.12:";;
esac
cat <<\_ACEOF
@@ -1065,8 +1065,6 @@
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-docs Create and install documentation
- --enable-doc-dir=DIR Path to where documentation will be installed (also
- needs --enable-docs flag)
--enable-buildenv Enable the use of a build environment
--enable-warnings-are-errors
Compile with -Werror
@@ -1210,7 +1208,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-powersave configure 0.15.11
+powersave configure 0.15.12
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1224,7 +1222,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by powersave $as_me 0.15.11, which was
+It was created by powersave $as_me 0.15.12, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1867,7 +1865,7 @@
# Define the identity of the package.
PACKAGE='powersave'
- VERSION='0.15.11'
+ VERSION='0.15.12'
cat >>confdefs.h <<_ACEOF
@@ -4298,7 +4296,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4301 "configure"' > conftest.$ac_ext
+ echo '#line 4299 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5433,7 +5431,7 @@
# Provide some information about the compiler.
-echo "$as_me:5436:" \
+echo "$as_me:5434:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6496,11 +6494,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6499: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6497: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6503: \$? = $ac_status" >&5
+ echo "$as_me:6501: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6764,11 +6762,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6767: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6765: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6771: \$? = $ac_status" >&5
+ echo "$as_me:6769: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6868,11 +6866,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6871: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6869: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6875: \$? = $ac_status" >&5
+ echo "$as_me:6873: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9213,7 +9211,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11654: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11660: \$? = $ac_status" >&5
+ echo "$as_me:11658: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11757,11 +11755,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11760: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11758: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11764: \$? = $ac_status" >&5
+ echo "$as_me:11762: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13327,11 +13325,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13330: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13328: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13334: \$? = $ac_status" >&5
+ echo "$as_me:13332: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13431,11 +13429,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13434: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13432: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13438: \$? = $ac_status" >&5
+ echo "$as_me:13436: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15634,11 +15632,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15637: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15635: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15641: \$? = $ac_status" >&5
+ echo "$as_me:15639: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15902,11 +15900,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15905: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15903: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15909: \$? = $ac_status" >&5
+ echo "$as_me:15907: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16006,11 +16004,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16009: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16007: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16013: \$? = $ac_status" >&5
+ echo "$as_me:16011: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -22336,16 +22334,6 @@
fi
-# Check whether --enable-doc-dir or --disable-doc-dir was given.
-if test "${enable_doc_dir+set}" = set; then
- enableval="$enable_doc_dir"
-
-fi;
-if test -z "$enable_doc_dir" ; then
- docdir=\${prefix}/share/doc/packages/powersave
-else
- docdir="$enable_doc_dir"
-fi
# add check for buildenvironment
BUILD_ENVIRONMENT="no"
@@ -22874,41 +22862,6 @@
fi;
-cat >>confdefs.h <<_ACEOF
-#define CONFIG_DIR "$sysconfdir/powersave"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCRIPT_DIR "$libexecdir/powersave"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PUB_SCRIPT_DIR "$libexecdir/powersave/scripts"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define BIN_DIR "$bindir"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define KDE_BINDIR "$KDE_BINDIR"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define GNOME_BINDIR "$GNOME_BINDIR"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DBUS_SYSTEM_BUS_SOCKET "$DBUS_SYSTEM_BUS_SOCKET"
-_ACEOF
-
-
configdir=$sysconfdir/powersave
scriptdir=$libexecdir/powersave
@@ -22926,6 +22879,8 @@
+
+
# these two variables are not included in config.h. You have to explicitly
# define whether you wan to use the powersave debugging macros
# ($(POWERSAVE_DEBUG)) and if you want to use syslog ($(SYSLOG_H)) or
@@ -22937,7 +22892,7 @@
# Do not create Makefile for docs directory if
# user has not explicitly enabled docs
- ac_config_files="$ac_config_files Makefile libpower/powersave.pc daemon/Makefile libpower/Makefile user_binary/Makefile scripts/Makefile config_files/Makefile translations/Makefile docs/Makefile docs/autodocs/Makefile contrib/Makefile scripts/rcpowersaved testsuite/Makefile testsuite/linktests/Makefile testsuite/testclient/Makefile scripts/setDefaultTrippoints.sh helpertools/Makefile docs/powersave.8 docs/powersaved.8"
+ ac_config_files="$ac_config_files Makefile libpower/powersave.pc daemon/Makefile libpower/Makefile user_binary/Makefile scripts/Makefile config_files/Makefile translations/Makefile docs/Makefile docs/autodocs/Makefile contrib/Makefile testsuite/Makefile testsuite/linktests/Makefile testsuite/testclient/Makefile helpertools/Makefile"
cat >confcache <<\_ACEOF
@@ -23330,7 +23285,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by powersave $as_me 0.15.11, which was
+This file was extended by powersave $as_me 0.15.12, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23393,7 +23348,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-powersave config.status 0.15.11
+powersave config.status 0.15.12
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -23514,14 +23469,10 @@
"docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
"docs/autodocs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/autodocs/Makefile" ;;
"contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
- "scripts/rcpowersaved" ) CONFIG_FILES="$CONFIG_FILES scripts/rcpowersaved" ;;
"testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
"testsuite/linktests/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/linktests/Makefile" ;;
"testsuite/testclient/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/testclient/Makefile" ;;
- "scripts/setDefaultTrippoints.sh" ) CONFIG_FILES="$CONFIG_FILES scripts/setDefaultTrippoints.sh" ;;
"helpertools/Makefile" ) CONFIG_FILES="$CONFIG_FILES helpertools/Makefile" ;;
- "docs/powersave.8" ) CONFIG_FILES="$CONFIG_FILES docs/powersave.8" ;;
- "docs/powersaved.8" ) CONFIG_FILES="$CONFIG_FILES docs/powersaved.8" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -23692,6 +23643,8 @@
s,@scriptdir@,$scriptdir,;t t
s,@pubscriptdir@,$pubscriptdir,;t t
s,@docdir@,$docdir,;t t
+s,@KDE_BINDIR@,$KDE_BINDIR,;t t
+s,@GNOME_BINDIR@,$GNOME_BINDIR,;t t
s,@BUILD_ENVIRONMENT@,$BUILD_ENVIRONMENT,;t t
s,@DEBUG_SCHEMES@,$DEBUG_SCHEMES,;t t
s,@WARNINGS@,$WARNINGS,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/configure.ac new/powersave-0.15.12/configure.ac
--- old/powersave-0.15.11/configure.ac 2007-03-27 13:53:39.000000000 +0200
+++ new/powersave-0.15.12/configure.ac 2007-04-03 12:49:36.000000000 +0200
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
-AC_INIT(powersave, 0.15.11, hmacht@suse.de)
+AC_INIT(powersave, 0.15.12, hmacht@suse.de)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([daemon/powersaved.cpp])
AM_CONFIG_HEADER(config.h)
@@ -66,12 +66,6 @@
esac],[docs=false])
AM_CONDITIONAL(DOCS_ENABLED, test x$docs = xtrue)
-AC_ARG_ENABLE(doc-dir, AC_HELP_STRING([--enable-doc-dir=DIR],[Path to where documentation will be installed (also needs --enable-docs flag)]))
-if test -z "$enable_doc_dir" ; then
- docdir=\${prefix}/share/doc/packages/powersave
-else
- docdir="$enable_doc_dir"
-fi
# add check for buildenvironment
BUILD_ENVIRONMENT="no"
@@ -119,20 +113,14 @@
GNOME_BINDIR=$withval,
GNOME_BINDIR=[/opt/gnome/bin])
-AC_DEFINE_UNQUOTED(CONFIG_DIR, ["$sysconfdir/powersave"], [directory for configuration files])
-AC_DEFINE_UNQUOTED(SCRIPT_DIR, ["$libexecdir/powersave"], [directory for scripts])
-AC_DEFINE_UNQUOTED(PUB_SCRIPT_DIR, ["$libexecdir/powersave/scripts"], [directory for scripts])
-AC_DEFINE_UNQUOTED(BIN_DIR, ["$bindir"], [default bindir])
-AC_DEFINE_UNQUOTED(KDE_BINDIR, ["$KDE_BINDIR"], [kde bindir])
-AC_DEFINE_UNQUOTED(GNOME_BINDIR, ["$GNOME_BINDIR"], [gnome bindir])
-AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_SOCKET, ["$DBUS_SYSTEM_BUS_SOCKET"],
- [dbus system bus socket path])
AC_SUBST([configdir],$sysconfdir/powersave)
AC_SUBST([scriptdir],$libexecdir/powersave)
AC_SUBST([bindir],$bindir)
AC_SUBST([pubscriptdir],$libexecdir/powersave/scripts)
AC_SUBST([docdir])
+AC_SUBST([KDE_BINDIR])
+AC_SUBST([GNOME_BINDIR])
AC_SUBST([BUILD_ENVIRONMENT])
AC_SUBST([DEBUG_SCHEMES])
AC_SUBST([DBUS_LIBS])
@@ -162,14 +150,10 @@
docs/Makefile
docs/autodocs/Makefile
contrib/Makefile
- scripts/rcpowersaved
testsuite/Makefile
testsuite/linktests/Makefile
testsuite/testclient/Makefile
- scripts/setDefaultTrippoints.sh
- helpertools/Makefile
- docs/powersave.8
- docs/powersaved.8])
+ helpertools/Makefile])
AC_OUTPUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/contrib/Makefile.in new/powersave-0.15.12/contrib/Makefile.in
--- old/powersave-0.15.11/contrib/Makefile.in 2007-03-27 13:54:03.000000000 +0200
+++ new/powersave-0.15.12/contrib/Makefile.in 2007-04-03 12:49:59.000000000 +0200
@@ -89,12 +89,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/daemon/general_config.cpp new/powersave-0.15.12/daemon/general_config.cpp
--- old/powersave-0.15.11/daemon/general_config.cpp 2007-03-27 13:53:38.000000000 +0200
+++ new/powersave-0.15.12/daemon/general_config.cpp 2007-04-03 12:49:35.000000000 +0200
@@ -29,7 +29,7 @@
#include "config.h"
#include <list>
-const string GeneralConfig::config_files[] = { "common", "thermal", "cpufreq", "battery", "sleep", "events" };
+const string GeneralConfig::config_files[] = { "common", "thermal", "cpufreq", "battery", "events" };
GeneralConfig::GeneralConfig()
: current_scheme(NULL), AC_scheme(NULL), Battery_scheme(NULL), disable_CPU_freq(false), scheme_configs(NULL)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/daemon/Makefile.am new/powersave-0.15.12/daemon/Makefile.am
--- old/powersave-0.15.11/daemon/Makefile.am 2007-03-27 13:53:38.000000000 +0200
+++ new/powersave-0.15.12/daemon/Makefile.am 2007-04-03 12:49:35.000000000 +0200
@@ -1,6 +1,15 @@
sbin_PROGRAMS = powersaved
-INCLUDES= -I$(top_srcdir)/libpower $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS)
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/libpower \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ -DBIN_DIR=\""$(bindir)"\" \
+ -DCONFIG_DIR=\""$(configdir)"\" \
+ -DSCRIPT_DIR=\""$(scriptdir)"\" \
+ -DPUB_SCRIPT_DIR=\""$(pubscriptdir)"\" \
+ -DKDE_BINDIR=\""$(KDE_BINDIR)"\" \
+ -DGNOME_BINDIR=\""$(GNOME_BINDIR)"\"
powersaved_LDADD = $(top_builddir)/libpower/libpowersave.la \
$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(LIBLAZY_LIBS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/daemon/Makefile.in new/powersave-0.15.12/daemon/Makefile.in
--- old/powersave-0.15.11/daemon/Makefile.in 2007-03-27 13:54:03.000000000 +0200
+++ new/powersave-0.15.12/daemon/Makefile.in 2007-04-03 12:49:59.000000000 +0200
@@ -124,12 +124,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
@@ -204,7 +206,17 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-INCLUDES = -I$(top_srcdir)/libpower $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS)
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/libpower \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ -DBIN_DIR=\""$(bindir)"\" \
+ -DCONFIG_DIR=\""$(configdir)"\" \
+ -DSCRIPT_DIR=\""$(scriptdir)"\" \
+ -DPUB_SCRIPT_DIR=\""$(pubscriptdir)"\" \
+ -DKDE_BINDIR=\""$(KDE_BINDIR)"\" \
+ -DGNOME_BINDIR=\""$(GNOME_BINDIR)"\"
+
powersaved_LDADD = $(top_builddir)/libpower/libpowersave.la \
$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(LIBLAZY_LIBS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/docs/autodocs/Makefile.in new/powersave-0.15.12/docs/autodocs/Makefile.in
--- old/powersave-0.15.11/docs/autodocs/Makefile.in 2007-03-27 13:54:04.000000000 +0200
+++ new/powersave-0.15.12/docs/autodocs/Makefile.in 2007-04-03 12:50:00.000000000 +0200
@@ -85,12 +85,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/docs/Makefile.am new/powersave-0.15.12/docs/Makefile.am
--- old/powersave-0.15.11/docs/Makefile.am 2007-03-27 13:53:37.000000000 +0200
+++ new/powersave-0.15.12/docs/Makefile.am 2007-04-03 12:49:34.000000000 +0200
@@ -1,7 +1,16 @@
SUBDIRS = autodocs
-man_MANS = powersave.8 \
- powersaved.8
+MAN_IN_FILES = powersave.8.in powersaved.8.in
+man_MANS = $(MAN_IN_FILES:.in=)
+
+%: %.in Makefile
+ $(edit) $< >$@
+
+edit = sed \
+ -e 's|@pubscriptdir[@]|$(pubscriptdir)|g' \
+ -e 's|@scriptdir[@]|$(scriptdir)|g' \
+ -e 's|@configdir[@]|$(configdir)|g' \
+ -e 's|@docdir[@]|$(docdir)|g'
READMES = \
README.battery \
@@ -31,8 +40,11 @@
EXTRA_DIST = $(man_MANS) \
$(READMES) \
+ $(MAN_IN_FILES) \
powersave.tex
+CLEANFILES = $(man_MANS)
+
if DOCS_ENABLED
all:
@@ -51,7 +63,7 @@
# $(INSTALL_PROGRAM) -m 644 -D -d $(docdir)/$(docdir)/powersave
# $(INSTALL_PROGRAM) -m 644 -D $(top_builddir)/docs/powersave/* $(DESTDIR)/$(docdir)/powersave
-CLEANFILES = powersave_manual.txt powersave.html html/*
+CLEANFILES += powersave_manual.txt powersave.html html/*
uninstall-local:
rm $(DESTDIR)/$(docdir)/powersave_manual.txt
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/docs/Makefile.in new/powersave-0.15.12/docs/Makefile.in
--- old/powersave-0.15.11/docs/Makefile.in 2007-03-27 13:54:03.000000000 +0200
+++ new/powersave-0.15.12/docs/Makefile.in 2007-04-03 12:49:59.000000000 +0200
@@ -35,16 +35,21 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+# The one big html manual file should be enough.
+# Splitted html files are generated (first makeinfo line above), but are only for
+# upload to sourceforge powersave docu homepage
+# $(INSTALL_PROGRAM) -m 644 -D -d $(docdir)/$(docdir)/powersave
+# $(INSTALL_PROGRAM) -m 644 -D $(top_builddir)/docs/powersave/* $(DESTDIR)/$(docdir)/powersave
+@DOCS_ENABLED_TRUE@am__append_1 = powersave_manual.txt powersave.html html/*
subdir = docs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/powersave.8.in $(srcdir)/powersaved.8.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = powersave.8 powersaved.8
+CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -99,12 +104,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
@@ -180,8 +187,13 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = autodocs
-man_MANS = powersave.8 \
- powersaved.8
+MAN_IN_FILES = powersave.8.in powersaved.8.in
+man_MANS = $(MAN_IN_FILES:.in=)
+edit = sed \
+ -e 's|@pubscriptdir[@]|$(pubscriptdir)|g' \
+ -e 's|@scriptdir[@]|$(scriptdir)|g' \
+ -e 's|@configdir[@]|$(configdir)|g' \
+ -e 's|@docdir[@]|$(docdir)|g'
READMES = \
README.battery \
@@ -211,14 +223,10 @@
EXTRA_DIST = $(man_MANS) \
$(READMES) \
+ $(MAN_IN_FILES) \
powersave.tex
-# The one big html manual file should be enough.
-# Splitted html files are generated (first makeinfo line above), but are only for
-# upload to sourceforge powersave docu homepage
-# $(INSTALL_PROGRAM) -m 644 -D -d $(docdir)/$(docdir)/powersave
-# $(INSTALL_PROGRAM) -m 644 -D $(top_builddir)/docs/powersave/* $(DESTDIR)/$(docdir)/powersave
-@DOCS_ENABLED_TRUE@CLEANFILES = powersave_manual.txt powersave.html html/*
+CLEANFILES = $(man_MANS) $(am__append_1)
all: all-recursive
.SUFFIXES:
@@ -251,10 +259,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-powersave.8: $(top_builddir)/config.status $(srcdir)/powersave.8.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-powersaved.8: $(top_builddir)/config.status $(srcdir)/powersaved.8.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-rm -f *.lo
@@ -588,6 +592,9 @@
uninstall-local uninstall-man uninstall-man8
+%: %.in Makefile
+ $(edit) $< >$@
+
@DOCS_ENABLED_TRUE@all:
@DOCS_ENABLED_TRUE@ LANG=en_US makeinfo --html -o$(top_builddir)/docs/html $(srcdir)/powersave.tex; \
@DOCS_ENABLED_TRUE@ LANG=en_US makeinfo --html --no-split -o$(top_builddir)/docs/powersave.html $(srcdir)/powersave.tex
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/docs/powersave.8 new/powersave-0.15.12/docs/powersave.8
--- old/powersave-0.15.11/docs/powersave.8 2007-03-27 13:54:20.000000000 +0200
+++ new/powersave-0.15.12/docs/powersave.8 2007-04-03 12:50:17.000000000 +0200
@@ -131,7 +131,7 @@
List all power schemes. Also shows which one is the current active one
and which are activated if power source changes to AC or battery power.
Configuration files for schemes are by default
-located in ${prefix}/etc/powersave/scheme_*. A scheme
+located in /usr/local/etc/powersave/scheme_*. A scheme
changes the power save policy of the powersave daemon. Changing the
power source (AC/Battery) normally switches the power policy/scheme. Use -e option
to switch between schemes manually.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/docs/powersaved.8 new/powersave-0.15.12/docs/powersaved.8
--- old/powersave-0.15.11/docs/powersaved.8 2007-03-27 13:54:20.000000000 +0200
+++ new/powersave-0.15.12/docs/powersaved.8 2007-04-03 12:50:17.000000000 +0200
@@ -29,12 +29,12 @@
.TP
.I -x
Set the path to executables that will be executed depending on the
-events configuration file (default: ${exec_prefix}/libexec/powersave/scripts)
+events configuration file (default: /usr/local/libexec/powersave/scripts)
.TP
.I -y
Set the path to executables that will be executed for internal events
-and by the event scripts (default: ${exec_prefix}/libexec/powersave)
+and by the event scripts (default: /usr/local/libexec/powersave)
.TP
.I -d
@@ -50,7 +50,7 @@
.TP
.I -c DIR
-Sets the configuration directory (default ${prefix}/etc/powersave).
+Sets the configuration directory (default /usr/local/etc/powersave).
General configuration files are:
battery
common
@@ -63,7 +63,7 @@
.TP
.I -s DIR
Sets the directory for Scheme configuration files (new ones could be
-added and switched to, default is ${prefix}/etc/powersave):
+added and switched to, default is /usr/local/etc/powersave):
scheme_performance (default scheme when working on AC power)
scheme_powersave (default scheme when working on battery power)
@@ -109,7 +109,7 @@
developers who helped to create this software.
.SH SEE ALSO
.B powersave(8)
-.B ${prefix}/etc/powersave/*
-.B ${prefix}/share/doc/packages/powersave
+.B /usr/local/etc/powersave/*
+.B
.B http://powersave.sourceforge.net
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/helpertools/Makefile.in new/powersave-0.15.12/helpertools/Makefile.in
--- old/powersave-0.15.11/helpertools/Makefile.in 2007-03-27 13:54:04.000000000 +0200
+++ new/powersave-0.15.12/helpertools/Makefile.in 2007-04-03 12:50:00.000000000 +0200
@@ -106,12 +106,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/libpower/Makefile.in new/powersave-0.15.12/libpower/Makefile.in
--- old/powersave-0.15.11/libpower/Makefile.in 2007-03-27 13:54:04.000000000 +0200
+++ new/powersave-0.15.12/libpower/Makefile.in 2007-04-03 12:50:00.000000000 +0200
@@ -120,12 +120,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/Makefile.in new/powersave-0.15.12/Makefile.in
--- old/powersave-0.15.11/Makefile.in 2007-03-27 13:54:05.000000000 +0200
+++ new/powersave-0.15.12/Makefile.in 2007-04-03 12:50:01.000000000 +0200
@@ -110,12 +110,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
@@ -403,7 +405,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/docs $(distdir)/libpower $(distdir)/scripts
+ $(mkdir_p) $(distdir)/libpower
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/scripts/Makefile.am new/powersave-0.15.12/scripts/Makefile.am
--- old/powersave-0.15.11/scripts/Makefile.am 2007-03-27 13:53:36.000000000 +0200
+++ new/powersave-0.15.12/scripts/Makefile.am 2007-04-03 12:49:34.000000000 +0200
@@ -1,3 +1,5 @@
+SCRIPT_IN_FILES = rcpowersaved.in setDefaultTrippoints.sh.in
+
pubscript_SCRIPTS = \
helper_functions \
x_helper_functions \
@@ -18,6 +20,7 @@
do_x_notification \
wttyhx \
setDefaultTrippoints.sh \
+ rcpowersaved \
powersave-notify
doc_SCRIPTS = powersave_logs \
@@ -31,19 +34,19 @@
EXTRA_DIST = $(pubscript_SCRIPTS) \
$(script_SCRIPTS) \
$(doc_SCRIPTS) \
+ $(SCRIPT_IN_FILES) \
rcpowersaved \
rcpowersaved.redhat
+%: %.in Makefile
+ $(edit) $< >$@
+
edit = sed \
- -e 's,@bindir\@,$(bindir),g' \
- -e 's,@sbindir\@,$(sbindir),g'
+ -e 's|@bindir[@]|$(bindir)|g' \
+ -e 's|@sbindir[@]|$(sbindir)|g' \
+ -e 's|@configdir[@]|$(configdir)|g'
-#rcfile: Makefile powersaved.init.in
-# rm -f powersaved.init powersaved.init.tmp
-# chmod +w powersaved.init.in
-# $(edit) powersaved.init.in >powersaved.init.tmp
-# chmod +x powersaved.init.tmp
-# mv powersaved.init.tmp powersaved.init
+CLEANFILES = rcpowersaved setDefaultTrippoints.sh
install-exec-hook:
$(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/scripts/Makefile.in new/powersave-0.15.12/scripts/Makefile.in
--- old/powersave-0.15.11/scripts/Makefile.in 2007-03-27 13:54:04.000000000 +0200
+++ new/powersave-0.15.12/scripts/Makefile.in 2007-04-03 12:50:00.000000000 +0200
@@ -37,15 +37,14 @@
build_triplet = @build@
host_triplet = @host@
subdir = scripts
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/rcpowersaved.in $(srcdir)/setDefaultTrippoints.sh.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = rcpowersaved setDefaultTrippoints.sh
+CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pubscriptdir)" \
"$(DESTDIR)$(scriptdir)"
docSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -93,12 +92,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
@@ -173,6 +174,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+SCRIPT_IN_FILES = rcpowersaved.in setDefaultTrippoints.sh.in
pubscript_SCRIPTS = \
helper_functions \
x_helper_functions \
@@ -193,6 +195,7 @@
do_x_notification \
wttyhx \
setDefaultTrippoints.sh \
+ rcpowersaved \
powersave-notify
doc_SCRIPTS = powersave_logs \
@@ -204,13 +207,16 @@
EXTRA_DIST = $(pubscript_SCRIPTS) \
$(script_SCRIPTS) \
$(doc_SCRIPTS) \
+ $(SCRIPT_IN_FILES) \
rcpowersaved \
rcpowersaved.redhat
edit = sed \
- -e 's,@bindir\@,$(bindir),g' \
- -e 's,@sbindir\@,$(sbindir),g'
+ -e 's|@bindir[@]|$(bindir)|g' \
+ -e 's|@sbindir[@]|$(sbindir)|g' \
+ -e 's|@configdir[@]|$(configdir)|g'
+CLEANFILES = rcpowersaved setDefaultTrippoints.sh
all: all-am
.SUFFIXES:
@@ -243,10 +249,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-rcpowersaved: $(top_builddir)/config.status $(srcdir)/rcpowersaved.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-setDefaultTrippoints.sh: $(top_builddir)/config.status $(srcdir)/setDefaultTrippoints.sh.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-docSCRIPTS: $(doc_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
@@ -372,6 +374,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -443,12 +446,8 @@
uninstall-scriptSCRIPTS
-#rcfile: Makefile powersaved.init.in
-# rm -f powersaved.init powersaved.init.tmp
-# chmod +w powersaved.init.in
-# $(edit) powersaved.init.in >powersaved.init.tmp
-# chmod +x powersaved.init.tmp
-# mv powersaved.init.tmp powersaved.init
+%: %.in Makefile
+ $(edit) $< >$@
install-exec-hook:
$(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/scripts/rcpowersaved new/powersave-0.15.12/scripts/rcpowersaved
--- old/powersave-0.15.11/scripts/rcpowersaved 2007-03-27 13:54:20.000000000 +0200
+++ new/powersave-0.15.12/scripts/rcpowersaved 2007-04-03 12:50:16.000000000 +0200
@@ -53,8 +53,8 @@
### END INIT INFO
# Check for missing binaries (stale symlinks should not happen)
-powersaved_BIN=/usr/sbin/powersaved
-powersave_BIN=${exec_prefix}/bin/powersave
+powersaved_BIN=/usr/local/sbin/powersaved
+powersave_BIN=/usr/local/bin/powersave
ACPID_BIN=/sbin/acpid
S2RAM_BIN=/usr/sbin/s2ram
# this is the default set of acpi modules loaded if nothing is configured
@@ -63,7 +63,7 @@
test -x $powersaved_BIN || exit 5
# Check for existence of needed config file and read it
-CONFIG=${prefix}/etc/powersave
+CONFIG=/usr/local/etc/powersave
# create symlink to /etc where powersave expects configuration files.
# this is an evil hack and is only needed when updating from powersave
@@ -160,24 +160,6 @@
echo -n "This machine supports APM "
fi
- #### is s2ram installed? If yes, use it to determine suspend to ram capability
- if [ -x "$S2RAM_BIN" ]; then
- . $CONFIG/sleep
- if [ "$SUSPEND2RAM_FORCE" != yes ]; then
- $S2RAM_BIN -n > /dev/null 2>&1
- RET=$?
- if [ $RET -eq 0 ]; then
- $LOGGER "s2ram identified your machine as being capable of suspend to RAM. See 's2ram -n' for details."
- else
- $LOGGER "s2ram does not know your machine. See 's2ram -i' for details. ($RET)"
- $LOGGER "Use SUSPEND2RAM_FORCE=yes to override this detection."
- fi
- else
- $LOGGER "SUSPEND2RAM_FORCE is set to yes."
- fi
- else
- $LOGGER "s2ram not installed."
- fi
OPTS="$OPTS -v ${DEBUG:-3}"
startproc -e $powersaved_BIN -d ${ACPI_EVENT_FILE:+-f "$ACPI_EVENT_FILE"} $OPTS
rc_status -v
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/scripts/rcpowersaved.in new/powersave-0.15.12/scripts/rcpowersaved.in
--- old/powersave-0.15.11/scripts/rcpowersaved.in 2007-03-27 13:53:36.000000000 +0200
+++ new/powersave-0.15.12/scripts/rcpowersaved.in 2007-04-03 12:49:34.000000000 +0200
@@ -53,7 +53,7 @@
### END INIT INFO
# Check for missing binaries (stale symlinks should not happen)
-powersaved_BIN=/usr/sbin/powersaved
+powersaved_BIN=@sbindir@/powersaved
powersave_BIN=@bindir@/powersave
ACPID_BIN=/sbin/acpid
S2RAM_BIN=/usr/sbin/s2ram
@@ -160,24 +160,6 @@
echo -n "This machine supports APM "
fi
- #### is s2ram installed? If yes, use it to determine suspend to ram capability
- if [ -x "$S2RAM_BIN" ]; then
- . $CONFIG/sleep
- if [ "$SUSPEND2RAM_FORCE" != yes ]; then
- $S2RAM_BIN -n > /dev/null 2>&1
- RET=$?
- if [ $RET -eq 0 ]; then
- $LOGGER "s2ram identified your machine as being capable of suspend to RAM. See 's2ram -n' for details."
- else
- $LOGGER "s2ram does not know your machine. See 's2ram -i' for details. ($RET)"
- $LOGGER "Use SUSPEND2RAM_FORCE=yes to override this detection."
- fi
- else
- $LOGGER "SUSPEND2RAM_FORCE is set to yes."
- fi
- else
- $LOGGER "s2ram not installed."
- fi
OPTS="$OPTS -v ${DEBUG:-3}"
startproc -e $powersaved_BIN -d ${ACPI_EVENT_FILE:+-f "$ACPI_EVENT_FILE"} $OPTS
rc_status -v
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/scripts/setDefaultTrippoints.sh new/powersave-0.15.12/scripts/setDefaultTrippoints.sh
--- old/powersave-0.15.11/scripts/setDefaultTrippoints.sh 2007-03-27 13:54:20.000000000 +0200
+++ new/powersave-0.15.12/scripts/setDefaultTrippoints.sh 2007-04-03 12:50:16.000000000 +0200
@@ -66,13 +66,13 @@
if [ -d /dev/shm ] && [ -w /dev/shm ] && [ -x /dev/shm ];then
THERMAL_TRIPPOINTS_FILE="/dev/shm/thermal_trippoints_file"
- ${exec_prefix}/bin/powersave -T > $THERMAL_TRIPPOINTS_FILE
+ /usr/local/bin/powersave -T > $THERMAL_TRIPPOINTS_FILE
if [ $? != 0 ];then
exit 1
fi
elif [ -d /tmp ] && [ -w /tmp ] && [ -x /tmp ];then
THERMAL_TRIPPOINTS_FILE="/tmp/thermal_trippoints_file"
- ${exec_prefix}/bin/powersave -T > $THERMAL_TRIPPOINTS_FILE
+ /usr/local/bin/powersave -T > $THERMAL_TRIPPOINTS_FILE
if [ $? != 0 ];then
exit 1
fi
@@ -82,7 +82,7 @@
fi
if [ "$CONFIG_FILE" = "" ];then
- for y in ${prefix}/etc/powersave/scheme_*; do
+ for y in /usr/local/etc/powersave/scheme_*; do
if [ ! -w "$y" ];then
echo "Cannot access config file $y"
exit 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/testsuite/linktests/Makefile.in new/powersave-0.15.12/testsuite/linktests/Makefile.in
--- old/powersave-0.15.11/testsuite/linktests/Makefile.in 2007-03-27 13:54:04.000000000 +0200
+++ new/powersave-0.15.12/testsuite/linktests/Makefile.in 2007-04-03 12:50:00.000000000 +0200
@@ -107,12 +107,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/testsuite/Makefile.in new/powersave-0.15.12/testsuite/Makefile.in
--- old/powersave-0.15.11/testsuite/Makefile.in 2007-03-27 13:54:04.000000000 +0200
+++ new/powersave-0.15.12/testsuite/Makefile.in 2007-04-03 12:50:00.000000000 +0200
@@ -94,12 +94,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/testsuite/testclient/Makefile.in new/powersave-0.15.12/testsuite/testclient/Makefile.in
--- old/powersave-0.15.11/testsuite/testclient/Makefile.in 2007-03-27 13:54:05.000000000 +0200
+++ new/powersave-0.15.12/testsuite/testclient/Makefile.in 2007-04-03 12:50:00.000000000 +0200
@@ -104,12 +104,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/translations/Makefile.in new/powersave-0.15.12/translations/Makefile.in
--- old/powersave-0.15.11/translations/Makefile.in 2007-03-27 13:54:05.000000000 +0200
+++ new/powersave-0.15.12/translations/Makefile.in 2007-04-03 12:50:01.000000000 +0200
@@ -85,12 +85,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.15.11/user_binary/Makefile.in new/powersave-0.15.12/user_binary/Makefile.in
--- old/powersave-0.15.11/user_binary/Makefile.in 2007-03-27 13:54:05.000000000 +0200
+++ new/powersave-0.15.12/user_binary/Makefile.in 2007-04-03 12:50:01.000000000 +0200
@@ -108,12 +108,14 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GNOME_BINDIR = @GNOME_BINDIR@
HAVE_LYNX = @HAVE_LYNX@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDE_BINDIR = @KDE_BINDIR@
LDFLAGS = @LDFLAGS@
LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@
LIBLAZY_LIBS = @LIBLAZY_LIBS@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org