Hello community,
here is the log from the commit of package mate-power-manager for
openSUSE:Factory checked in at 2014-10-05 20:31:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-power-manager (Old)
and /work/SRC/openSUSE:Factory/.mate-power-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-power-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-power-manager/mate-power-manager.changes
2014-04-26 10:06:21.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mate-power-manager.new/mate-power-manager.changes
2014-10-05 20:33:30.000000000 +0200
@@ -1,0 +2,15 @@
+Fri Oct 3 15:05:42 UTC 2014 - [email protected]
+
+- Update to version 1.8.1
+ + Fixed "levels is 0" warning if no kbd backlight present
+ + Added support for upower-0.99 API
+ + Added keywords key to .desktop file
+ + Removed "battery recall" logic
+- Remove upstreamed patches
+ + mate-power-manager-avoid-levels_is_0-warning.patch
+ + mate-power-manager-port-to-upower-0.99_API.patch
+ + mate-power-manager-remove-battery-recall-logic.patch
+ + mate-power-manager-fixes-for-upower1-api-changes.patch
+ + mate-power-manager-improve-upower1-support.patch
+
+-------------------------------------------------------------------
Old:
----
mate-power-manager-1.8.0.tar.xz
mate-power-manager-avoid-levels_is_0-warning.patch
mate-power-manager-fixes-for-upower1-api-changes.patch
mate-power-manager-improve-upower1-support.patch
mate-power-manager-port-to-upower-0.99_API.patch
mate-power-manager-remove-battery-recall-logic.patch
New:
----
mate-power-manager-1.8.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.FdhVA1/_old 2014-10-05 20:33:31.000000000 +0200
+++ /var/tmp/diff_new_pack.FdhVA1/_new 2014-10-05 20:33:31.000000000 +0200
@@ -16,7 +16,7 @@
#
Name: mate-power-manager
-Version: 1.8.0
+Version: 1.8.1
Release: 0
Summary: MATE Desktop UPower policy management
License: GPL-2.0
@@ -26,18 +26,6 @@
# PATCH-FIX-UPSTREAM
mate-power-manager_dbus_interface_keyboard_backlight_controls.patch --fix
gsettings schema
# to fix keyboard backlight support
Patch0:
mate-power-manager_dbus_interface_keyboard_backlight_controls.patch
-# PATCH-FIX-UPSTREAM mate-power-manager-avoid-levels_is_0-warning.patch
--avoid "levels is 0" warning if no
-# kbd backlight present
-Patch1: mate-power-manager-avoid-levels_is_0-warning.patch
-# PATCH-FIX-UPSTREAM mate-power-manager-port-to-upower-0.99_API.patch --fix
mate-power-manager for current upower versions
-Patch2: mate-power-manager-port-to-upower-0.99_API.patch
-# PATCH-FIX-UPSTREAM mate-power-manager-remove-battery-recall-logic.patch
--the database is outdated several years
-# now and the whole interface is removed from current UPower release
-Patch3: mate-power-manager-remove-battery-recall-logic.patch
-# PATCH-FIX-UPSTREAM mate-power-manager-fixes-for-upower1-api-changes.patch
--adapt upstream code to API changes
-Patch4: mate-power-manager-fixes-for-upower1-api-changes.patch
-# PATCH-FIX-UPSTREAM mate-power-manager-improve-upower1-support.patch --fix
support of devices for upower >=1.0
-Patch5: mate-power-manager-improve-upower1-support.patch
Requires: upower
Recommends: %{name}-lang
%glib2_gsettings_schema_requires
@@ -68,11 +56,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%patch2 -p1
-%patch5 -p1
-%patch4 -p1
%build
autoreconf -fiv
@@ -105,8 +88,8 @@
%doc AUTHORS README COPYING
%dir %{_datadir}/mate-2.0
%{_sysconfdir}/xdg/autostart/mate-power-manager.desktop
-%{_bindir}/mate-power-bugreport.sh
%{_bindir}/mate-power-manager
+%{_bindir}/mate-power-manager-bugreport
%{_bindir}/mate-power-preferences
%{_bindir}/mate-power-statistics
%{_sbindir}/mate-power-backlight-helper
++++++ mate-power-manager-1.8.0.tar.xz -> mate-power-manager-1.8.1.tar.xz ++++++
++++ 3062 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/ChangeLog new/mate-power-manager-1.8.1/ChangeLog
--- old/mate-power-manager-1.8.0/ChangeLog 2014-03-01 17:54:49.000000000
+0100
+++ new/mate-power-manager-1.8.1/ChangeLog 2014-09-29 21:45:34.000000000
+0200
@@ -1,5 +1,139 @@
# Generated by Makefile. Do not edit.
+commit 170a95ae62dbf72bbffc99fc5796cb22dc418131
+Author: infirit <[email protected]>
+Date: Sun Sep 28 21:33:32 2014 +0200
+
+ Bump version to 1.8.1
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 1e08af4d0414173d13e0ffea225e24389e9b3e04
+Author: infirit <[email protected]>
+Date: Sun Sep 28 21:33:14 2014 +0200
+
+ Update NEWS for 1.8.1
+
+ NEWS | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit a8d1e0e1df27b074c7b64141b34a6d668cb3757c
+Author: infirit <[email protected]>
+Date: Sun May 11 21:29:10 2014 +0200
+
+ Fix typo in Makefile.am
+
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 051ab600d9bd485d756f53c220b07df2450e1fc2
+Author: infirit <[email protected]>
+Date: Wed Apr 30 20:02:31 2014 +0200
+
+ Update vendor_url in policy file
+
+ policy/org.mate.power.policy.in2 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 928131e0eb2fc199663adb21b276ac0128ac4852
+Author: Mike Gabriel <[email protected]>
+Date: Thu Apr 24 22:27:48 2014 +0200
+
+ Add keywords key to .desktop file
+
+ Closes https://github.com/mate-desktop/mate-power-manager/issues/100
+
+ data/mate-power-preferences.desktop.in.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit d7e65732bc37970ad2f6f31b087077563df6b10f
+Author: Stefano Karapetsas <[email protected]>
+Date: Thu Apr 24 20:33:44 2014 +0200
+
+ Rename mate-power-bugreport.sh -> tools/mate-power-manager-bugreport
+
+ Closes https://github.com/mate-desktop/mate-power-manager/issues/101
+
+ tools/Makefile.am | 2 +-
+ tools/mate-power-bugreport.sh | 90 --------------------------------------
+ tools/mate-power-manager-bugreport | 90 ++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 91 insertions(+), 91 deletions(-)
+
+commit 55e46db47c6ebef7cc942fa3d8ad4f42e6885847
+Author: Stefano Karapetsas <[email protected]>
+Date: Thu Apr 24 20:25:35 2014 +0200
+
+ Remove autogenerated file
+
+ Closes https://github.com/mate-desktop/mate-power-manager/issues/103
+
+ m4/ltsugar.m4 | 123 ----------------------------------------------------------
+ 1 file changed, 123 deletions(-)
+
+commit 546c2de75769328028c6acca38ddfd30533855e3
+Author: Stefano Karapetsas <[email protected]>
+Date: Thu Apr 24 20:19:01 2014 +0200
+
+ Other round of fixes for UPower 0.99 API changes
+
+ src/gpm-engine.c | 85 ++++++++++++++++++++++++++++++++++++++++++-------------
+ src/gpm-manager.c | 4 ++-
+ 2 files changed, 68 insertions(+), 21 deletions(-)
+
+commit 4ce6c0b93a2f57cfa2cf418eda42cdeaab39b09a
+Author: Stefano Karapetsas <[email protected]>
+Date: Thu Apr 24 18:17:35 2014 +0200
+
+ Improve UPower1 support
+
+ src/gpm-engine.c | 32 +++++++++++++++++++++++---------
+ 1 file changed, 23 insertions(+), 9 deletions(-)
+
+commit b0df99fa2eb1d7c9eed7e1424bffd6848382a79c
+Author: Stefan Seyfried <[email protected]>
+Date: Wed Apr 9 15:12:17 2014 +0200
+
+ port mate-power-manager to upower-0.99 API
+
+ fix mate-power-manager for current upower versions
+
+ src/gpm-backlight.c | 9 ++++++++
+ src/gpm-button.c | 10 ++++++++-
+ src/gpm-control.c | 6 ++++--
+ src/gpm-engine.c | 55 +++++++++++++++++++++++++++++++++++++++++++++----
+ src/gpm-kbd-backlight.c | 8 +++++++
+ src/gpm-manager.c | 9 ++++++++
+ src/gpm-prefs-core.c | 8 +++++--
+ src/gpm-statistics.c | 17 +++++++++++++--
+ 8 files changed, 111 insertions(+), 11 deletions(-)
+
+commit 5d70266e4ee075f001a0827ef4060eb8abf882ba
+Author: Stefan Seyfried <[email protected]>
+Date: Wed Apr 9 14:58:29 2014 +0200
+
+ remove "battery recall" logic
+
+ the database is outdated several years now and the whole interface is
+ removed from current UPower release anyway, so let's get rid of it in
+ m-p-m, too
+
+ data/org.mate.power-manager.gschema.xml.in | 5 --
+ src/gpm-common.h | 1 -
+ src/gpm-engine.c | 47 -------------
+ src/gpm-engine.h | 4 --
+ src/gpm-manager.c | 108 -----------------------------
+ 5 files changed, 165 deletions(-)
+
+commit ae55a4276c29ba7377fbb79a0e451eb9365f6f37
+Author: Stefan Seyfried <[email protected]>
+Date: Wed Apr 9 14:43:44 2014 +0200
+
+ avoid "levels is 0" warning if no kbd backlight present
+
+ src/gpm-kbd-backlight.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
commit 079471200ad1b05952ea1bef5c65979f552134b6
Author: Stefano Karapetsas <[email protected]>
Date: Sat Mar 1 12:41:07 2014 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/Makefile.am
new/mate-power-manager-1.8.1/Makefile.am
--- old/mate-power-manager-1.8.0/Makefile.am 2014-02-18 21:46:04.000000000
+0100
+++ new/mate-power-manager-1.8.1/Makefile.am 2014-05-11 21:28:36.000000000
+0200
@@ -1,5 +1,5 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAG}
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = \
src \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/NEWS new/mate-power-manager-1.8.1/NEWS
--- old/mate-power-manager-1.8.0/NEWS 2014-03-01 12:41:02.000000000 +0100
+++ new/mate-power-manager-1.8.1/NEWS 2014-09-28 21:33:11.000000000 +0200
@@ -1,3 +1,15 @@
+Version 1.8.1
+~~~~~~~~~~~~~
+Released 2014-09-28
+
+* News
+ - Port mate-power-manager to upower-0.99 API
+
+* Bug fixes
+ - Avoid "levels is 0" warning if no kbd backlight present
+ - Remove "battery recall" logic
+ - Add keywords key to .desktop file
+
Version 1.8.0
~~~~~~~~~~~~~
Released: 2014-03-01
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/configure.ac
new/mate-power-manager-1.8.1/configure.ac
--- old/mate-power-manager-1.8.0/configure.ac 2014-03-01 12:40:51.000000000
+0100
+++ new/mate-power-manager-1.8.1/configure.ac 2014-09-28 21:33:26.000000000
+0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.63)
-AC_INIT([mate-power-manager], [1.8.0], [http://www.mate-desktop.org/])
+AC_INIT([mate-power-manager], [1.8.1], [http://www.mate-desktop.org/])
AC_CONFIG_SRCDIR(src)
AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz check-news tar-ustar])
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/data/mate-power-manager.desktop.in
new/mate-power-manager-1.8.1/data/mate-power-manager.desktop.in
--- old/mate-power-manager-1.8.0/data/mate-power-manager.desktop.in
2014-03-01 17:54:13.000000000 +0100
+++ new/mate-power-manager-1.8.1/data/mate-power-manager.desktop.in
2014-09-29 21:44:30.000000000 +0200
@@ -10,7 +10,7 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=mate-power-manager
X-MATE-Bugzilla-Component=mate-power-manager
-X-MATE-Bugzilla-Version=1.8.0
+X-MATE-Bugzilla-Version=1.8.1
X-MATE-Bugzilla-ExtraInfoScript=mate-power-bugreport.sh
#X-MATE-AutoRestart=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/data/mate-power-preferences.desktop.in
new/mate-power-manager-1.8.1/data/mate-power-preferences.desktop.in
--- old/mate-power-manager-1.8.0/data/mate-power-preferences.desktop.in
2014-03-01 17:54:13.000000000 +0100
+++ new/mate-power-manager-1.8.1/data/mate-power-preferences.desktop.in
2014-09-29 21:44:30.000000000 +0200
@@ -6,10 +6,11 @@
Terminal=false
Type=Application
Categories=Settings;HardwareSettings;
+Keywords=MATE;power;management;preferences;settings;
OnlyShowIn=MATE;
StartupNotify=true
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=mate-power-manager
X-MATE-Bugzilla-Component=mate-power-preferences
-X-MATE-Bugzilla-Version=1.8.0
+X-MATE-Bugzilla-Version=1.8.1
X-MATE-Bugzilla-ExtraInfoScript=mate-power-bugreport.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/data/mate-power-preferences.desktop.in.in
new/mate-power-manager-1.8.1/data/mate-power-preferences.desktop.in.in
--- old/mate-power-manager-1.8.0/data/mate-power-preferences.desktop.in.in
2013-03-15 21:03:43.000000000 +0100
+++ new/mate-power-manager-1.8.1/data/mate-power-preferences.desktop.in.in
2014-04-30 20:01:53.000000000 +0200
@@ -6,6 +6,7 @@
Terminal=false
Type=Application
Categories=Settings;HardwareSettings;
+Keywords=MATE;power;management;preferences;settings;
OnlyShowIn=MATE;
StartupNotify=true
X-MATE-Bugzilla-Bugzilla=MATE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/data/mate-power-statistics.desktop.in
new/mate-power-manager-1.8.1/data/mate-power-statistics.desktop.in
--- old/mate-power-manager-1.8.0/data/mate-power-statistics.desktop.in
2014-03-01 17:54:13.000000000 +0100
+++ new/mate-power-manager-1.8.1/data/mate-power-statistics.desktop.in
2014-09-29 21:44:30.000000000 +0200
@@ -12,5 +12,5 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=mate-power-manager
X-MATE-Bugzilla-Component=mate-power-statistics
-X-MATE-Bugzilla-Version=1.8.0
+X-MATE-Bugzilla-Version=1.8.1
X-Desktop-File-Install-Version=0.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/data/org.mate.power-manager.gschema.xml
new/mate-power-manager-1.8.1/data/org.mate.power-manager.gschema.xml
--- old/mate-power-manager-1.8.0/data/org.mate.power-manager.gschema.xml
2014-03-01 17:54:25.000000000 +0100
+++ new/mate-power-manager-1.8.1/data/org.mate.power-manager.gschema.xml
2014-05-15 00:27:54.000000000 +0200
@@ -212,11 +212,6 @@
<summary>Seconds of inactivity to spin down when on battery</summary>
<description>The number of seconds of inactivity to spin down the disks
when on battery power.</description>
</key>
- <key type="b" name="notify-perhaps-recall">
- <default>true</default>
- <summary>If we should show the recalled battery warning for a broken
battery</summary>
- <description>If we should show the recalled battery warning for a broken
battery. Set this to false only if you know your battery is okay.</description>
- </key>
<key type="b" name="notify-low-capacity">
<default>true</default>
<summary>If we should show the low capacity warning for a broken
battery</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/data/org.mate.power-manager.gschema.xml.in
new/mate-power-manager-1.8.1/data/org.mate.power-manager.gschema.xml.in
--- old/mate-power-manager-1.8.0/data/org.mate.power-manager.gschema.xml.in
2014-01-20 19:40:23.000000000 +0100
+++ new/mate-power-manager-1.8.1/data/org.mate.power-manager.gschema.xml.in
2014-04-30 20:01:53.000000000 +0200
@@ -211,11 +211,6 @@
<_summary>Seconds of inactivity to spin down when on battery</_summary>
<_description>The number of seconds of inactivity to spin down the disks
when on battery power.</_description>
</key>
- <key name="notify-perhaps-recall" type="b">
- <default>true</default>
- <_summary>If we should show the recalled battery warning for a broken
battery</_summary>
- <_description>If we should show the recalled battery warning for a
broken battery. Set this to false only if you know your battery is
okay.</_description>
- </key>
<key name="notify-low-capacity" type="b">
<default>true</default>
<_summary>If we should show the low capacity warning for a broken
battery</_summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/m4/intltool.m4
new/mate-power-manager-1.8.1/m4/intltool.m4
--- old/mate-power-manager-1.8.0/m4/intltool.m4 2014-03-01 17:53:58.000000000
+0100
+++ new/mate-power-manager-1.8.1/m4/intltool.m4 2014-09-29 21:44:16.000000000
+0200
@@ -155,31 +155,6 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]],
- [[extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr]])],
- [DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share
- dnl in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [DATADIRNAME=share], [DATADIRNAME=lib])
- ;;
- *)
- [DATADIRNAME=lib]
- ;;
- esac])
-fi
-AC_SUBST(DATADIRNAME)
-
IT_PO_SUBDIR([po])
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/m4/libtool.m4
new/mate-power-manager-1.8.1/m4/libtool.m4
--- old/mate-power-manager-1.8.0/m4/libtool.m4 2014-03-01 17:54:02.000000000
+0100
+++ new/mate-power-manager-1.8.1/m4/libtool.m4 2014-09-29 21:44:20.000000000
+0200
@@ -1312,7 +1312,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1324,19 +1324,9 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
+ LD="${LD-ld} -m elf_i386"
;;
- powerpc64-*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1355,10 +1345,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
+ ppc*-*linux*|powerpc*-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -1701,8 +1688,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -2493,7 +2479,14 @@
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -2504,6 +2497,12 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix
$libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -2526,6 +2525,17 @@
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -2642,7 +2652,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -2687,18 +2697,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3258,6 +3256,10 @@
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3296,11 +3298,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern
/lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4048,7 +4050,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4112,7 +4114,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4347,7 +4349,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4589,9 +4591,6 @@
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience |
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4654,9 +4653,6 @@
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4878,7 +4874,7 @@
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs
$linker_flags -o $lib'
wlarc=
@@ -5055,7 +5051,6 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5360,7 +5355,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags' # a.out
else
@@ -6240,6 +6235,9 @@
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
+ gnu*)
+ ;;
+
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6401,7 +6399,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/po/Makefile.in.in
new/mate-power-manager-1.8.1/po/Makefile.in.in
--- old/mate-power-manager-1.8.0/po/Makefile.in.in 2014-03-01
17:53:58.000000000 +0100
+++ new/mate-power-manager-1.8.1/po/Makefile.in.in 2014-09-29
21:44:16.000000000 +0200
@@ -33,8 +33,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.
@@ -108,7 +107,7 @@
install-data-yes: all
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
if test -r $$lang.gmo; then \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- rm -f
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/policy/org.mate.power.policy.in2
new/mate-power-manager-1.8.1/policy/org.mate.power.policy.in2
--- old/mate-power-manager-1.8.0/policy/org.mate.power.policy.in2
2013-03-15 21:03:43.000000000 +0100
+++ new/mate-power-manager-1.8.1/policy/org.mate.power.policy.in2
2014-04-30 20:01:25.000000000 +0200
@@ -10,7 +10,7 @@
-->
<vendor>MATE Power Manager</vendor>
- <vendor_url>http://www.mate.org/projects/mate-power-manager/</vendor_url>
+ <vendor_url>http://www.mate-desktop.org</vendor_url>
<icon_name>battery</icon_name>
<action id="org.mate.power.backlight-helper">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/src/gpm-backlight.c
new/mate-power-manager-1.8.1/src/gpm-backlight.c
--- old/mate-power-manager-1.8.0/src/gpm-backlight.c 2014-01-20
19:40:30.000000000 +0100
+++ new/mate-power-manager-1.8.1/src/gpm-backlight.c 2014-04-30
20:01:53.000000000 +0200
@@ -410,7 +410,11 @@
* Does the actions when the ac power source is inserted/removed.
**/
static void
+#if UP_CHECK_VERSION(0, 99, 0)
+gpm_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec,
GpmBacklight *backlight)
+#else
gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight)
+#endif
{
gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE);
}
@@ -727,8 +731,13 @@
/* we use up_client for the ac-adapter-changed signal */
backlight->priv->client = up_client_new ();
+#if UP_CHECK_VERSION(0, 99, 0)
+ g_signal_connect (backlight->priv->client, "notify",
+ G_CALLBACK (gpm_backlight_client_changed_cb),
backlight);
+#else
g_signal_connect (backlight->priv->client, "changed",
G_CALLBACK (gpm_backlight_client_changed_cb),
backlight);
+#endif
/* gets caps */
backlight->priv->can_dim = gpm_brightness_has_hw
(backlight->priv->brightness);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/src/gpm-button.c
new/mate-power-manager-1.8.1/src/gpm-button.c
--- old/mate-power-manager-1.8.0/src/gpm-button.c 2013-08-02
01:00:42.000000000 +0200
+++ new/mate-power-manager-1.8.1/src/gpm-button.c 2014-04-30
20:01:53.000000000 +0200
@@ -324,7 +324,11 @@
* gpm_button_client_changed_cb
**/
static void
+#if UP_CHECK_VERSION(0, 99, 0)
+gpm_button_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmButton
*button)
+#else
gpm_button_client_changed_cb (UpClient *client, GpmButton *button)
+#endif
{
gboolean lid_is_closed;
@@ -363,9 +367,13 @@
button->priv->client = up_client_new ();
button->priv->lid_is_closed = up_client_get_lid_is_closed
(button->priv->client);
+#if UP_CHECK_VERSION(0, 99, 0)
+ g_signal_connect (button->priv->client, "notify",
+ G_CALLBACK (gpm_button_client_changed_cb), button);
+#else
g_signal_connect (button->priv->client, "changed",
G_CALLBACK (gpm_button_client_changed_cb), button);
-
+#endif
/* register the brightness keys */
gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER);
#ifdef HAVE_XF86XK_SUSPEND
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/src/gpm-common.h
new/mate-power-manager-1.8.1/src/gpm-common.h
--- old/mate-power-manager-1.8.0/src/gpm-common.h 2013-08-02
01:00:42.000000000 +0200
+++ new/mate-power-manager-1.8.1/src/gpm-common.h 2014-09-28
21:29:21.000000000 +0200
@@ -97,7 +97,6 @@
#define GPM_SETTINGS_SPINDOWN_TIMEOUT_BATT
"spindown-timeout-battery"
/* notify */
-#define GPM_SETTINGS_NOTIFY_PERHAPS_RECALL "notify-perhaps-recall"
#define GPM_SETTINGS_NOTIFY_LOW_CAPACITY "notify-low-capacity"
#define GPM_SETTINGS_NOTIFY_DISCHARGING
"notify-discharging"
#define GPM_SETTINGS_NOTIFY_FULLY_CHARGED "notify-fully-charged"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/src/gpm-control.c
new/mate-power-manager-1.8.1/src/gpm-control.c
--- old/mate-power-manager-1.8.0/src/gpm-control.c 2014-03-01
12:40:24.000000000 +0100
+++ new/mate-power-manager-1.8.1/src/gpm-control.c 2014-04-30
20:01:53.000000000 +0200
@@ -289,10 +289,11 @@
}
g_object_unref(proxy);
}
+#if !UP_CHECK_VERSION(0, 99, 0)
else {
ret = up_client_suspend_sync (control->priv->client, NULL,
error);
}
-
+#endif
egg_debug ("emitting resume");
g_signal_emit (control, signals [RESUME], 0,
GPM_CONTROL_ACTION_SUSPEND);
@@ -399,10 +400,11 @@
ret = TRUE;
}
}
+#if !UP_CHECK_VERSION(0, 99, 0)
else {
ret = up_client_hibernate_sync (control->priv->client, NULL,
error);
}
-
+#endif
egg_debug ("emitting resume");
g_signal_emit (control, signals [RESUME], 0,
GPM_CONTROL_ACTION_HIBERNATE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/src/gpm-engine.c
new/mate-power-manager-1.8.1/src/gpm-engine.c
--- old/mate-power-manager-1.8.0/src/gpm-engine.c 2013-03-15
21:03:43.000000000 +0100
+++ new/mate-power-manager-1.8.1/src/gpm-engine.c 2014-04-30
20:01:53.000000000 +0200
@@ -72,7 +72,6 @@
CHARGE_ACTION,
DISCHARGING,
LOW_CAPACITY,
- PERHAPS_RECALL,
LAST_SIGNAL
};
@@ -83,6 +82,31 @@
static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice
*original_device);
static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine,
UpDevice *original_device);
+#if UP_CHECK_VERSION (0, 99, 0)
+static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec,
GpmEngine *engine);
+
+#define GPM_ENGINE_WARNING_NONE UP_DEVICE_LEVEL_NONE
+#define GPM_ENGINE_WARNING_DISCHARGING UP_DEVICE_LEVEL_DISCHARGING
+#define GPM_ENGINE_WARNING_LOW UP_DEVICE_LEVEL_LOW
+#define GPM_ENGINE_WARNING_CRITICAL UP_DEVICE_LEVEL_CRITICAL
+#define GPM_ENGINE_WARNING_ACTION UP_DEVICE_LEVEL_ACTION
+
+/**
+ * gpm_engine_get_warning:
+ *
+ * This gets the possible engine state for the device according to the
+ * policy, which could be per-percent, or per-time.
+ *
+ * Return value: A GpmEngine state, e.g. GPM_ENGINE_WARNING_DISCHARGING
+ **/
+static UpDeviceLevel
+gpm_engine_get_warning (GpmEngine *engine, UpDevice *device)
+{
+ UpDeviceLevel warning;
+ g_object_get (device, "warning-level", &warning, NULL);
+ return warning;
+}
+#else
typedef enum {
GPM_ENGINE_WARNING_NONE = 0,
@@ -224,6 +248,7 @@
out:
return warning_type;
}
+#endif
/**
* gpm_engine_get_summary:
@@ -280,12 +305,20 @@
* Returns the icon
**/
static gchar *
+#if UP_CHECK_VERSION (0, 99, 0)
+gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind,
UpDeviceLevel warning, gboolean use_state)
+#else
gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind,
GpmEngineWarning warning, gboolean use_state)
+#endif
{
guint i;
GPtrArray *array;
UpDevice *device;
+#if UP_CHECK_VERSION (0, 99, 0)
+ UpDeviceLevel warning_temp;
+#else
GpmEngineWarning warning_temp;
+#endif
UpDeviceKind kind;
UpDeviceState state;
gboolean is_present;
@@ -570,6 +603,9 @@
static UpDevice *
gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device)
{
+#if UP_CHECK_VERSION (0, 99, 0)
+ return engine->priv->battery_composite;
+#else
guint battery_devices = 0;
GPtrArray *array;
UpDevice *device;
@@ -599,6 +635,7 @@
out:
/* return composite device or original device */
return device;
+#endif
}
/**
@@ -607,6 +644,18 @@
static UpDevice *
gpm_engine_update_composite_device (GpmEngine *engine, UpDevice
*original_device)
{
+#if UP_CHECK_VERSION (0, 99, 0)
+ gchar *text;
+
+ text = up_device_to_text (engine->priv->battery_composite);
+ egg_debug ("composite:\n%s", text);
+ g_free (text);
+
+ /* force update of icon */
+ gpm_engine_recalculate_state_icon (engine);
+
+ return engine->priv->battery_composite;
+#else
guint i;
gdouble percentage = 0.0;
gdouble energy = 0.0;
@@ -718,6 +767,7 @@
out:
/* return composite device or original device */
return device;
+#endif
}
/**
@@ -726,7 +776,11 @@
static void
gpm_engine_device_add (GpmEngine *engine, UpDevice *device)
{
+#if UP_CHECK_VERSION (0, 99, 0)
+ UpDeviceLevel warning;
+#else
GpmEngineWarning warning;
+#endif
UpDeviceState state;
UpDeviceKind kind;
UpDevice *composite;
@@ -758,42 +812,13 @@
g_object_get (composite, "state", &state, NULL);
g_object_set_data (G_OBJECT(composite), "engine-state-old",
GUINT_TO_POINTER(state));
}
-}
-/**
- * gpm_engine_check_recall:
- **/
-static gboolean
-gpm_engine_check_recall (GpmEngine *engine, UpDevice *device)
-{
- UpDeviceKind kind;
- gboolean recall_notice = FALSE;
- gchar *recall_vendor = NULL;
- gchar *recall_url = NULL;
-
- /* get device properties */
- g_object_get (device,
- "kind", &kind,
- "recall-notice", &recall_notice,
- "recall-vendor", &recall_vendor,
- "recall-url", &recall_url,
- NULL);
-
- /* not battery */
- if (kind != UP_DEVICE_KIND_BATTERY)
- goto out;
-
- /* no recall data */
- if (!recall_notice)
- goto out;
+#if UP_CHECK_VERSION (0, 99, 0)
+ g_signal_connect (device, "notify", G_CALLBACK
(gpm_engine_device_changed_cb), engine);
+ g_ptr_array_add (engine->priv->array, g_object_ref (device));
+ gpm_engine_recalculate_state (engine);
+#endif
- /* emit signal for manager */
- egg_debug ("** EMIT: perhaps-recall");
- g_signal_emit (engine, signals [PERHAPS_RECALL], 0, device,
recall_vendor, recall_url);
-out:
- g_free (recall_vendor);
- g_free (recall_url);
- return recall_notice;
}
/**
@@ -805,12 +830,14 @@
guint i;
GPtrArray *array = NULL;
UpDevice *device;
+#if !UP_CHECK_VERSION(0, 99, 0)
gboolean ret;
GError *error = NULL;
+#endif
g_return_val_if_fail (engine != NULL, FALSE);
g_return_val_if_fail (GPM_IS_ENGINE (engine), FALSE);
-
+#if !UP_CHECK_VERSION(0, 99, 0)
/* get devices from UPower */
ret = up_client_enumerate_devices_sync (engine->priv->client, NULL,
&error);
if (!ret) {
@@ -818,7 +845,7 @@
g_error_free (error);
goto out;
}
-
+#endif
/* connected mobile phones */
gpm_phone_coldplug (engine->priv->phone);
@@ -829,9 +856,10 @@
for (i=0;i<array->len;i++) {
device = g_ptr_array_index (array, i);
gpm_engine_device_add (engine, device);
- gpm_engine_check_recall (engine, device);
}
+#if !UP_CHECK_VERSION(0, 99, 0)
out:
+#endif
if (array != NULL)
g_ptr_array_unref (array);
/* never repeat */
@@ -844,17 +872,36 @@
static void
gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine
*engine)
{
+#if UP_CHECK_VERSION (0, 99, 0)
+ gpm_engine_device_add (engine, device);
+#else
/* add to list */
g_ptr_array_add (engine->priv->array, g_object_ref (device));
- gpm_engine_check_recall (engine, device);
gpm_engine_recalculate_state (engine);
+#endif
}
/**
* gpm_engine_device_removed_cb:
**/
static void
+#if UP_CHECK_VERSION(0, 99, 0)
+gpm_engine_device_removed_cb (UpClient *client, const char *object_path,
GpmEngine *engine)
+{
+ guint i;
+
+ for (i = 0; i < engine->priv->array->len; i++) {
+ UpDevice *device = g_ptr_array_index (engine->priv->array, i);
+
+ if (g_strcmp0 (object_path, up_device_get_object_path (device))
== 0) {
+ g_ptr_array_remove_index (engine->priv->array, i);
+ break;
+ }
+ }
+ gpm_engine_recalculate_state (engine);
+}
+#else
gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine
*engine)
{
gboolean ret;
@@ -863,19 +910,28 @@
return;
gpm_engine_recalculate_state (engine);
}
-
+#endif
/**
* gpm_engine_device_changed_cb:
**/
static void
+#if UP_CHECK_VERSION(0, 99, 0)
+gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine
*engine)
+#else
gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine
*engine)
+#endif
{
UpDeviceKind kind;
UpDeviceState state;
UpDeviceState state_old;
+#if UP_CHECK_VERSION(0, 99, 0)
+ UpDeviceLevel warning_old;
+ UpDeviceLevel warning;
+#else
GpmEngineWarning warning_old;
GpmEngineWarning warning;
+#endif
/* get device properties */
g_object_get (device,
@@ -1042,7 +1098,10 @@
static void
gpm_engine_init (GpmEngine *engine)
{
-
+#if UP_CHECK_VERSION(0, 99, 0)
+ GPtrArray *array = NULL;
+ guint i;
+#endif
engine->priv = GPM_ENGINE_GET_PRIVATE (engine);
engine->priv->array = g_ptr_array_new_with_free_func (g_object_unref);
@@ -1051,8 +1110,10 @@
G_CALLBACK (gpm_engine_device_added_cb), engine);
g_signal_connect (engine->priv->client, "device-removed",
G_CALLBACK (gpm_engine_device_removed_cb), engine);
+#if !UP_CHECK_VERSION(0, 99, 0)
g_signal_connect (engine->priv->client, "device-changed",
G_CALLBACK (gpm_engine_device_changed_cb), engine);
+#endif
engine->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
g_signal_connect (engine->priv->settings, "changed",
@@ -1067,6 +1128,11 @@
G_CALLBACK (phone_device_refresh_cb), engine);
/* create a fake virtual composite battery */
+#if UP_CHECK_VERSION(0, 99, 0)
+ engine->priv->battery_composite = up_client_get_display_device
(engine->priv->client);
+ g_signal_connect (engine->priv->battery_composite, "notify",
+ G_CALLBACK (gpm_engine_device_changed_cb), engine);
+#else
engine->priv->battery_composite = up_device_new ();
g_object_set (engine->priv->battery_composite,
"kind", UP_DEVICE_KIND_BATTERY,
@@ -1075,6 +1141,7 @@
"power-supply", TRUE,
"is-present", TRUE,
NULL);
+#endif
engine->priv->previous_icon = NULL;
engine->priv->previous_summary = NULL;
@@ -1134,14 +1201,6 @@
G_STRUCT_OFFSET (GpmEngineClass, low_capacity),
NULL, NULL, g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
- signals [PERHAPS_RECALL] =
- g_signal_new ("perhaps-recall",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GpmEngineClass, perhaps_recall),
- NULL, NULL,
gpm_marshal_VOID__POINTER_STRING_STRING,
- G_TYPE_NONE,
- 3, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING);
signals [FULLY_CHARGED] =
g_signal_new ("fully-charged",
G_TYPE_FROM_CLASS (object_class),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/src/gpm-engine.h
new/mate-power-manager-1.8.1/src/gpm-engine.h
--- old/mate-power-manager-1.8.0/src/gpm-engine.h 2013-03-15
21:03:43.000000000 +0100
+++ new/mate-power-manager-1.8.1/src/gpm-engine.h 2014-04-30
20:01:53.000000000 +0200
@@ -49,10 +49,6 @@
gchar *icon);
void (* summary_changed) (GpmEngine *engine,
gchar *status);
- void (* perhaps_recall) (GpmEngine *engine,
- UpDevice *device,
- const gchar *oem_vendor,
- const gchar *website);
void (* low_capacity) (GpmEngine *engine,
UpDevice *device);
void (* charge_low) (GpmEngine *engine,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/src/gpm-kbd-backlight.c
new/mate-power-manager-1.8.1/src/gpm-kbd-backlight.c
--- old/mate-power-manager-1.8.0/src/gpm-kbd-backlight.c 2014-01-20
19:40:30.000000000 +0100
+++ new/mate-power-manager-1.8.1/src/gpm-kbd-backlight.c 2014-09-28
21:29:21.000000000 +0200
@@ -128,6 +128,9 @@
guint goal;
g_return_val_if_fail (GPM_IS_KBD_BACKLIGHT (backlight), FALSE);
+ /* avoid warnings if no keyboard brightness is available */
+ if (backlight->priv->max_brightness < 1)
+ return FALSE;
/* if we're setting the same we are, don't bother */
//g_return_val_if_fail (backlight->priv->brightness_percent != percentage,
FALSE);
@@ -532,6 +535,9 @@
**/
static void
gpm_kbd_backlight_client_changed_cb (UpClient *client,
+#if UP_CHECK_VERSION(0, 99, 0)
+ GParamSpec *pspec,
+#endif
GpmKbdBacklight *backlight)
{
gpm_kbd_backlight_evaluate_power_source_and_set (backlight);
@@ -801,8 +807,13 @@
/* Use upower for ac changed signal */
backlight->priv->client = up_client_new ();
+#if UP_CHECK_VERSION(0, 99, 0)
+ g_signal_connect (backlight->priv->client, "notify",
+ G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight);
+#else
g_signal_connect (backlight->priv->client, "changed",
G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight);
+#endif
backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
//g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK
(gpm_settings_key_changed_cb), backlight);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/src/gpm-manager.c
new/mate-power-manager-1.8.1/src/gpm-manager.c
--- old/mate-power-manager-1.8.0/src/gpm-manager.c 2013-12-16
23:01:29.000000000 +0100
+++ new/mate-power-manager-1.8.1/src/gpm-manager.c 2014-09-28
21:29:21.000000000 +0200
@@ -67,7 +67,6 @@
static void gpm_manager_finalize (GObject *object);
#define GPM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GPM_TYPE_MANAGER, GpmManagerPrivate))
-#define GPM_MANAGER_RECALL_DELAY 30 /* seconds */
#define GPM_MANAGER_NOTIFY_TIMEOUT_NEVER 0 /* ms */
#define GPM_MANAGER_NOTIFY_TIMEOUT_SHORT 10 * 1000 /* ms */
#define GPM_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */
@@ -971,7 +970,11 @@
* gpm_manager_client_changed_cb:
**/
static void
+#if UP_CHECK_VERSION(0, 99, 0)
+gpm_manager_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmManager
*manager)
+#else
gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager)
+#endif
{
gboolean event_when_closed;
gint timeout;
@@ -1091,111 +1094,6 @@
}
/**
- * gpm_manager_perhaps_recall_response_cb:
- */
-static void
-gpm_manager_perhaps_recall_response_cb (GtkDialog *dialog, gint response_id,
GpmManager *manager)
-{
- GdkScreen *screen;
- GtkWidget *dialog_error;
- GError *error = NULL;
- gboolean ret;
- const gchar *website;
-
- /* don't show this again */
- if (response_id == GTK_RESPONSE_CANCEL) {
- g_settings_set_boolean (manager->priv->settings,
GPM_SETTINGS_NOTIFY_PERHAPS_RECALL, FALSE);
- goto out;
- }
-
- /* visit recall website */
- if (response_id == GTK_RESPONSE_OK) {
- screen = gdk_screen_get_default();
- website = (const gchar *) g_object_get_data (G_OBJECT
(manager), "recall-oem-website");
- ret = gtk_show_uri (screen, website, gtk_get_current_event_time
(), &error);
- if (!ret) {
- dialog_error = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
- "Failed to show
url %s", error->message);
- gtk_dialog_run (GTK_DIALOG (dialog_error));
- g_error_free (error);
- }
- goto out;
- }
-out:
- gtk_widget_destroy (GTK_WIDGET (dialog));
- return;
-}
-
-/**
- * gpm_manager_perhaps_recall_delay_cb:
- */
-static gboolean
-gpm_manager_perhaps_recall_delay_cb (GpmManager *manager)
-{
- const gchar *oem_vendor;
- gchar *title = NULL;
- gchar *message = NULL;
- GtkWidget *dialog;
-
- oem_vendor = (const gchar *) g_object_get_data (G_OBJECT (manager),
"recall-oem-vendor");
-
- /* TRANSLATORS: the battery may be recalled by it's vendor */
- title = g_strdup_printf ("%s: %s", GPM_NAME, _("Battery may be
recalled"));
- message = g_strdup_printf (_("A battery in your computer may have been "
- "recalled by %s and you may be at
risk.\n\n"
- "For more information visit the battery
recall website."), oem_vendor);
- dialog = gtk_message_dialog_new_with_markup (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE,
- "<span
size='larger'><b>%s</b></span>", title);
-
- gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG
(dialog), "%s", message);
-
- /* TRANSLATORS: button text, visit the manufacturers recall website */
- gtk_dialog_add_button (GTK_DIALOG (dialog), _("Visit recall website"),
GTK_RESPONSE_OK);
-
- /* TRANSLATORS: button text, do not show this bubble again */
- gtk_dialog_add_button (GTK_DIALOG (dialog), _("Do not show me this
again"), GTK_RESPONSE_CANCEL);
-
- /* wait async for response */
- gtk_widget_show (dialog);
- g_signal_connect (dialog, "response", G_CALLBACK
(gpm_manager_perhaps_recall_response_cb), manager);
-
- g_free (title);
- g_free (message);
-
- /* never repeat */
- return FALSE;
-}
-
-/**
- * gpm_manager_engine_perhaps_recall_cb:
- */
-static void
-gpm_manager_engine_perhaps_recall_cb (GpmEngine *engine, UpDevice *device,
gchar *oem_vendor, gchar *website, GpmManager *manager)
-{
- gboolean ret;
-
- /* don't show when running under GDM */
- if (g_getenv ("RUNNING_UNDER_GDM") != NULL) {
- egg_debug ("running under gdm, so no notification");
- return;
- }
-
- /* already shown, and dismissed */
- ret = g_settings_get_boolean (manager->priv->settings,
GPM_SETTINGS_NOTIFY_PERHAPS_RECALL);
- if (!ret) {
- egg_debug ("Gsettings prevents notification: %s",
GPM_SETTINGS_NOTIFY_PERHAPS_RECALL);
- return;
- }
-
- g_object_set_data_full (G_OBJECT (manager), "recall-oem-vendor",
(gpointer) g_strdup (oem_vendor), (GDestroyNotify) g_free);
- g_object_set_data_full (G_OBJECT (manager), "recall-oem-website",
(gpointer) g_strdup (website), (GDestroyNotify) g_free);
-
- /* delay by a few seconds so the panel can load */
- g_timeout_add_seconds (GPM_MANAGER_RECALL_DELAY, (GSourceFunc)
gpm_manager_perhaps_recall_delay_cb, manager);
-}
-
-/**
* gpm_manager_engine_icon_changed_cb:
*/
static void
@@ -1958,8 +1856,15 @@
g_signal_connect (manager->priv->settings, "changed",
G_CALLBACK (gpm_manager_settings_changed_cb),
manager);
manager->priv->client = up_client_new ();
+#if UP_CHECK_VERSION(0, 99, 0)
+ g_signal_connect (manager->priv->client, "notify::lid-is-closed",
+ G_CALLBACK (gpm_manager_client_changed_cb), manager);
+ g_signal_connect (manager->priv->client, "notify::on-battery",
+ G_CALLBACK (gpm_manager_client_changed_cb), manager);
+#else
g_signal_connect (manager->priv->client, "changed",
G_CALLBACK (gpm_manager_client_changed_cb), manager);
+#endif
/* use libmatenotify */
notify_init (GPM_NAME);
@@ -2020,8 +1925,6 @@
gpm_manager_sync_policy_sleep (manager);
manager->priv->engine = gpm_engine_new ();
- g_signal_connect (manager->priv->engine, "perhaps-recall",
- G_CALLBACK (gpm_manager_engine_perhaps_recall_cb),
manager);
g_signal_connect (manager->priv->engine, "low-capacity",
G_CALLBACK (gpm_manager_engine_low_capacity_cb),
manager);
g_signal_connect (manager->priv->engine, "icon-changed",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/src/gpm-prefs-core.c
new/mate-power-manager-1.8.1/src/gpm-prefs-core.c
--- old/mate-power-manager-1.8.0/src/gpm-prefs-core.c 2014-03-01
12:40:24.000000000 +0100
+++ new/mate-power-manager-1.8.1/src/gpm-prefs-core.c 2014-09-28
21:29:21.000000000 +0200
@@ -811,7 +811,9 @@
UpDevice *device;
UpDeviceKind kind;
GpmBrightness *brightness;
+#if !UP_CHECK_VERSION(0, 99, 0)
gboolean ret;
+#endif
guint i;
GDBusProxy *proxy;
@@ -897,9 +899,11 @@
else {
/* are we allowed to shutdown? */
egg_console_kit_can_stop (prefs->priv->console,
&prefs->priv->can_shutdown, NULL);
+#if !UP_CHECK_VERSION(0, 99, 0)
/* get values from UpClient */
prefs->priv->can_suspend = up_client_get_can_suspend
(prefs->priv->client);
prefs->priv->can_hibernate = up_client_get_can_hibernate
(prefs->priv->client);
+#endif
}
if (LOGIND_RUNNING()) {
@@ -953,14 +957,14 @@
brightness = gpm_brightness_new ();
prefs->priv->has_lcd = gpm_brightness_has_hw (brightness);
g_object_unref (brightness);
-
+#if !UP_CHECK_VERSION(0, 99, 0)
/* get device list */
ret = up_client_enumerate_devices_sync (prefs->priv->client, NULL,
&error);
if (!ret) {
egg_warning ("failed to get device list: %s", error->message);
g_error_free (error);
}
-
+#endif
devices = up_client_get_devices (prefs->priv->client);
for (i=0; i<devices->len; i++) {
device = g_ptr_array_index (devices, i);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/src/gpm-statistics.c
new/mate-power-manager-1.8.1/src/gpm-statistics.c
--- old/mate-power-manager-1.8.0/src/gpm-statistics.c 2013-08-02
01:00:42.000000000 +0200
+++ new/mate-power-manager-1.8.1/src/gpm-statistics.c 2014-09-28
21:29:21.000000000 +0200
@@ -1236,6 +1236,12 @@
* gpm_stats_device_changed_cb:
**/
static void
+#if UP_CHECK_VERSION(0, 99, 0)
+gpm_stats_device_changed_cb (UpClient *client, GParamSpec *pspec, gpointer
user_data)
+{
+ gpm_stats_button_update_ui();
+}
+#else
gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer
user_data)
{
const gchar *object_path;
@@ -1246,6 +1252,7 @@
if (g_strcmp0 (current_device, object_path) == 0)
gpm_stats_update_info_data (device);
}
+#endif
/**
* gpm_stats_device_removed_cb:
@@ -1794,11 +1801,12 @@
wakeups = up_wakeups_new ();
g_signal_connect (wakeups, "data-changed", G_CALLBACK
(gpm_stats_data_changed_cb), NULL);
-
+#if !UP_CHECK_VERSION(0, 99, 0)
/* coldplug */
ret = up_client_enumerate_devices_sync (client, NULL, NULL);
if (!ret)
goto out;
+#endif
devices = up_client_get_devices (client);
/* add devices in visually pleasing order */
@@ -1814,7 +1822,11 @@
/* connect now the coldplug is done */
g_signal_connect (client, "device-added", G_CALLBACK
(gpm_stats_device_added_cb), NULL);
g_signal_connect (client, "device-removed", G_CALLBACK
(gpm_stats_device_removed_cb), NULL);
+#if UP_CHECK_VERSION(0, 99, 0)
+ g_signal_connect (client, "notify", G_CALLBACK
(gpm_stats_device_changed_cb), NULL);
+#else
g_signal_connect (client, "device-changed", G_CALLBACK
(gpm_stats_device_changed_cb), NULL);
+#endif
/* set current device */
if (devices->len > 0) {
@@ -1854,8 +1866,9 @@
gtk_widget_show (widget);
gtk_main ();
-
+#if !UP_CHECK_VERSION(0, 99, 0)
out:
+#endif
g_object_unref (settings);
g_object_unref (client);
g_object_unref (wakeups);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/tools/Makefile.am
new/mate-power-manager-1.8.1/tools/Makefile.am
--- old/mate-power-manager-1.8.0/tools/Makefile.am 2013-03-15
21:03:43.000000000 +0100
+++ new/mate-power-manager-1.8.1/tools/Makefile.am 2014-04-30
20:01:53.000000000 +0200
@@ -1,5 +1,5 @@
script_SCRIPTS = \
- mate-power-bugreport.sh
+ mate-power-manager-bugreport
EXTRA_DIST=$(script_SCRIPTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/tools/mate-power-bugreport.sh
new/mate-power-manager-1.8.1/tools/mate-power-bugreport.sh
--- old/mate-power-manager-1.8.0/tools/mate-power-bugreport.sh 2013-03-15
21:03:43.000000000 +0100
+++ new/mate-power-manager-1.8.1/tools/mate-power-bugreport.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006-2007 Richard Hughes <[email protected]>
-#
-# Licensed under the GNU General Public License Version 2
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-#$1 = keyname
-print_hal_key ()
-{
- udi="/org/freedesktop/Hal/devices/computer"
- ret=`hal-get-property --udi $udi --key $1 2> /dev/null`
- if [ $? -eq 0 ]; then
- echo $ret
- else
- echo "missing"
- fi
-}
-
-#$1 = capability
-print_hal_capability ()
-{
- ret=`hal-find-by-capability --capability $1`
- if [ -n "$ret" ]; then
- echo "yes"
- else
- echo "no"
- fi
-}
-
-echo -n "Distro version: "
-cat /etc/*release | uniq
-
-echo -n "Kernel version: "
-uname -r
-
-echo -n "g-p-m version: "
-mate-power-manager --version | cut -f2 -d" "
-
-echo -n "HAL version: "
-lshal -V | cut -f3 -d" "
-
-echo -n "System manufacturer: "
-print_hal_key "smbios.system.manufacturer"
-echo -n "System version: "
-print_hal_key "smbios.system.version"
-echo -n "System product: "
-print_hal_key "smbios.system.product"
-
-echo -n "AC adapter present: "
-print_hal_capability "ac_adapter"
-
-echo -n "Battery present: "
-print_hal_capability "battery"
-
-echo -n "Laptop panel present: "
-print_hal_capability "laptop_panel"
-
-echo -n "CPU scaling present: "
-print_hal_capability "cpufreq_control"
-
-echo "Battery Information:"
-lshal | grep "battery\."
-
-OS=`uname -s`
-
-echo "UPower data:"
-upower --dump
-
-echo "MATE Power Manager Process Information:"
-if [ "$OS" = "SunOS" ]; then
- ptree -a `pgrep power`
-else
- ps aux --forest | grep mate-power | grep -v grep
-fi
-
-echo "HAL Process Information:"
-if [ "$OS" = "SunOS" ]; then
- ptree -a `pgrep hald`
-else
- ps aux --forest | grep hald | grep -v grep
-fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-power-manager-1.8.0/tools/mate-power-manager-bugreport
new/mate-power-manager-1.8.1/tools/mate-power-manager-bugreport
--- old/mate-power-manager-1.8.0/tools/mate-power-manager-bugreport
1970-01-01 01:00:00.000000000 +0100
+++ new/mate-power-manager-1.8.1/tools/mate-power-manager-bugreport
2014-04-30 20:01:53.000000000 +0200
@@ -0,0 +1,90 @@
+#! /bin/sh
+# Copyright (C) 2006-2007 Richard Hughes <[email protected]>
+#
+# Licensed under the GNU General Public License Version 2
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+#$1 = keyname
+print_hal_key ()
+{
+ udi="/org/freedesktop/Hal/devices/computer"
+ ret=`hal-get-property --udi $udi --key $1 2> /dev/null`
+ if [ $? -eq 0 ]; then
+ echo $ret
+ else
+ echo "missing"
+ fi
+}
+
+#$1 = capability
+print_hal_capability ()
+{
+ ret=`hal-find-by-capability --capability $1`
+ if [ -n "$ret" ]; then
+ echo "yes"
+ else
+ echo "no"
+ fi
+}
+
+echo -n "Distro version: "
+cat /etc/*release | uniq
+
+echo -n "Kernel version: "
+uname -r
+
+echo -n "g-p-m version: "
+mate-power-manager --version | cut -f2 -d" "
+
+echo -n "HAL version: "
+lshal -V | cut -f3 -d" "
+
+echo -n "System manufacturer: "
+print_hal_key "smbios.system.manufacturer"
+echo -n "System version: "
+print_hal_key "smbios.system.version"
+echo -n "System product: "
+print_hal_key "smbios.system.product"
+
+echo -n "AC adapter present: "
+print_hal_capability "ac_adapter"
+
+echo -n "Battery present: "
+print_hal_capability "battery"
+
+echo -n "Laptop panel present: "
+print_hal_capability "laptop_panel"
+
+echo -n "CPU scaling present: "
+print_hal_capability "cpufreq_control"
+
+echo "Battery Information:"
+lshal | grep "battery\."
+
+OS=`uname -s`
+
+echo "UPower data:"
+upower --dump
+
+echo "MATE Power Manager Process Information:"
+if [ "$OS" = "SunOS" ]; then
+ ptree -a `pgrep power`
+else
+ ps aux --forest | grep mate-power | grep -v grep
+fi
+
+echo "HAL Process Information:"
+if [ "$OS" = "SunOS" ]; then
+ ptree -a `pgrep hald`
+else
+ ps aux --forest | grep hald | grep -v grep
+fi
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
