diff options
| author | Monsta <[email protected]> | 2015-04-28 15:18:46 +0300 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2015-05-04 17:45:26 +0200 |
| commit | c005217966cbe610fe25639dd9faa5a6e0a2cea2 (patch) | |
| tree | d669cd23d3d47c7fce6c778854c1a5fbfbdb03c5 | |
| parent | 405bec23c0a1cf97e39171fabc6596c9ab7f7a5e (diff) | |
| download | mate-power-manager-c005217966cbe610fe25639dd9faa5a6e0a2cea2.tar.bz2 mate-power-manager-c005217966cbe610fe25639dd9faa5a6e0a2cea2.tar.xz | |
dropped HAL-based bugreport script, corrected README
HAL is from stone age, so that script doesn't work now anyway
Cloeses https://github.com/mate-desktop/mate-power-manager/pull/145
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | README | 14 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | tools/Makefile.am | 6 | ||||
| -rwxr-xr-x | tools/mate-power-manager-bugreport | 90 |
5 files changed, 7 insertions, 107 deletions
diff --git a/Makefile.am b/Makefile.am index 0b84d37..17017f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,8 +8,7 @@ SUBDIRS = \ man \ data \ help \ - policy \ - tools + policy if HAVE_APPLETS SUBDIRS += applets @@ -1,9 +1,9 @@ MATE Power Manager A Power Manager for MATE -MATE Power Manager is a MATE session daemon that acts as a policy agent on top of -UPower, which requires fairly new versions of the kernel and udev. -MATE Power Manager listens for system events and responds with user-configurable actions. +MATE Power Manager is a MATE session daemon that acts as a policy agent on +top of UPower. It listens to system events and responds with user-configurable +actions. MATE Power Manager comes in three main parts: @@ -20,14 +20,12 @@ To build, MATE Power Manager requires - libnotify (0.7.0 or later) - Cairo (1.0.0 or later) - Unique (0.9.4 or later) - - libpanel (2.0.0 or later) + - libmate-panel-applet (1.5.0 or later) - xrandr (1.2.0 or later) - Canberra (0.10 or later) - - UPower (0.9.1 or later) - - HAL (0.5.8 or later) + - UPower (0.9.5 or later) -To work properly, mate-power-manager requires udevd, upowerd and -udisks-daemon to be running. +To work properly, mate-power-manager requires udevd and upowerd to be running. MATE Power Manager is a fork of GNOME Power Manager. diff --git a/configure.ac b/configure.ac index ebf7fe9..830f991 100644 --- a/configure.ac +++ b/configure.ac @@ -349,7 +349,6 @@ docs/Makefile man/Makefile help/Makefile po/Makefile.in -tools/Makefile policy/Makefile data/Makefile data/mate-power-manager.desktop.in diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index b4889ae..0000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -script_SCRIPTS = \ - mate-power-manager-bugreport - -EXTRA_DIST=$(script_SCRIPTS) - -scriptdir = $(bindir) diff --git a/tools/mate-power-manager-bugreport b/tools/mate-power-manager-bugreport deleted file mode 100755 index c6c4ce7..0000000 --- a/tools/mate-power-manager-bugreport +++ /dev/null @@ -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 |