From 4e6ce51e7afeb7924573c40796910cd003850949 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini
Date: Mon, 22 Sep 2014 03:42:32 -0400
Subject: [PATCH] Imported Upstream version 1.1.2
---
AUTHORS | 21 +-
Makefile.am | 2 +
Makefile.in | 350 +--
NEWS | 47 +
NEWS.html | 187 +-
README | 40 +-
README.html | 89 +-
aclocal.m4 | 3239 ++++---------------------
config.h.in | 52 +-
configure | 2286 +++++++----------
configure.ac | 57 +-
doc/Makefile.am | 9 +-
doc/Makefile.in | 139 +-
doc/TODO.html | 420 ++++
doc/TODO.txt | 13 +
doc/faq.html | 99 +-
doc/faq.txt | 62 +-
icons/hicolor/14x14/Makefile.in | 129 +-
icons/hicolor/16x16/Makefile.in | 129 +-
icons/hicolor/22x22/Makefile.in | 129 +-
icons/hicolor/24x24/Makefile.in | 129 +-
icons/hicolor/32x32/Makefile.in | 129 +-
icons/hicolor/48x48/Makefile.in | 129 +-
icons/hicolor/64x64/Makefile.in | 129 +-
icons/hicolor/scalable/Makefile.in | 129 +-
icons/ubuntu-mono-dark/apps/22/Makefile.in | 129 +-
icons/ubuntu-mono-dark/status/22/Makefile.in | 129 +-
icons/ubuntu-mono-light/status/22/Makefile.in | 129 +-
m4/gettext.m4 | 417 ++++
m4/iconv.m4 | 101 +
m4/lib-ld.m4 | 110 +
m4/lib-link.m4 | 644 +++++
m4/lib-prefix.m4 | 185 ++
m4/nls.m4 | 31 +
m4/po.m4 | 428 ++++
m4/progtest.m4 | 92 +
po/LINGUAS | 1 +
po/POTFILES.in | 3 +-
po/de.gmo | Bin 11455 -> 10944 bytes
po/de.po | 550 +++--
po/es.gmo | Bin 11375 -> 10909 bytes
po/es.po | 553 +++--
po/fr.gmo | Bin 11795 -> 11233 bytes
po/fr.po | 542 +++--
po/hr.gmo | Bin 0 -> 13725 bytes
po/hr.po | 786 ++++++
po/hu.gmo | Bin 11439 -> 12447 bytes
po/hu.po | 595 +++--
po/it.gmo | Bin 11234 -> 11239 bytes
po/it.po | 580 +++--
po/lv.gmo | Bin 10410 -> 10667 bytes
po/lv.po | 576 +++--
po/nl.gmo | Bin 11397 -> 10681 bytes
po/nl.po | 549 +++--
po/psensor.pot | 473 ++--
po/pt_BR.gmo | Bin 7976 -> 8114 bytes
po/pt_BR.po | 531 ++--
po/ru.gmo | Bin 11998 -> 11487 bytes
po/ru.po | 533 ++--
po/sl.gmo | Bin 487 -> 649 bytes
po/sl.po | 484 ++--
po/sr.gmo | Bin 1642 -> 1700 bytes
po/sr.po | 489 ++--
po/sv.gmo | Bin 11834 -> 11397 bytes
po/sv.po | 543 +++--
po/tr.gmo | Bin 11783 -> 11682 bytes
po/tr.po | 569 +++--
po/uk.gmo | Bin 8767 -> 8293 bytes
po/uk.po | 526 ++--
po/zh_CN.gmo | Bin 10066 -> 9389 bytes
po/zh_CN.po | 533 ++--
src/Makefile.am | 28 +-
src/Makefile.in | 432 ++--
src/cfg.c | 929 ++++---
src/cfg.h | 61 +-
src/glade/Makefile.in | 128 +-
src/glade/psensor-pref.glade | 632 ++++-
src/glade/psensor.glade | 76 +-
src/glade/sensor-edit.glade | 888 ++++---
src/graph.c | 455 +++-
src/graph.h | 13 +-
src/lib/Makefile.am | 34 +-
src/lib/Makefile.in | 282 ++-
src/lib/amd.c | 36 +-
src/lib/amd.h | 12 +-
src/lib/bool.h | 2 +
src/lib/color.c | 32 +-
src/lib/color.h | 31 +-
src/lib/cpu.c | 112 -
src/lib/cpu.h | 34 -
src/lib/hdd.h | 10 +-
src/lib/hdd_atasmart.c | 64 +-
src/lib/hdd_hddtemp.c | 116 +-
src/lib/lmsensor.c | 130 +-
src/lib/lmsensor.h | 12 +-
src/lib/nvidia.c | 349 ++-
src/lib/nvidia.h | 14 +-
src/lib/pgtop2.c | 146 ++
src/lib/pgtop2.h | 31 +
src/lib/pio.c | 1 +
src/lib/plog.c | 8 +-
src/lib/pmutex.c | 63 +
src/lib/pmutex.h | 28 +
src/lib/psensor.c | 191 +-
src/lib/psensor.h | 55 +-
src/lib/psensor_json.h | 2 +-
src/lib/ptime.c | 18 +-
src/lib/pudisks2.c | 216 ++
src/lib/pudisks2.h | 27 +
src/lib/slog.c | 24 +-
src/lib/temperature.c | 34 +
src/lib/temperature.h | 26 +
src/main.c | 179 +-
src/psensor.1 | 6 +-
src/psensor.gschema.xml | 211 ++
src/psensor.schemas | 274 ---
src/pxdg.c | 15 +-
src/rsensor.c | 6 +-
src/server/Makefile.in | 247 +-
src/server/psensor-server.1 | 2 +-
src/server/server.c | 46 +-
src/ui.c | 16 +-
src/ui_appindicator.c | 6 +-
src/ui_color.c | 2 +-
src/ui_graph.c | 11 +
src/ui_notify.c | 6 +-
src/ui_pref.c | 147 +-
src/ui_pref.h | 2 +-
src/ui_sensorlist.c | 199 +-
src/ui_sensorpref.c | 91 +-
src/ui_status.c | 2 +-
src/ui_unity.c | 3 +-
test-driver | 139 ++
tests/Makefile.am | 4 +-
tests/Makefile.in | 764 ++++--
tests/checkpatch.pl | 2229 ++++++++++++++---
tests/test_psensor_type_to_unit_str.c | 2 +-
www/Makefile.in | 129 +-
138 files changed, 18944 insertions(+), 11531 deletions(-)
create mode 100644 doc/TODO.html
create mode 100644 doc/TODO.txt
create mode 100644 m4/gettext.m4
create mode 100644 m4/iconv.m4
create mode 100644 m4/lib-ld.m4
create mode 100644 m4/lib-link.m4
create mode 100644 m4/lib-prefix.m4
create mode 100644 m4/nls.m4
create mode 100644 m4/po.m4
create mode 100644 m4/progtest.m4
create mode 100644 po/hr.gmo
create mode 100644 po/hr.po
delete mode 100644 src/lib/cpu.c
delete mode 100644 src/lib/cpu.h
create mode 100644 src/lib/pgtop2.c
create mode 100644 src/lib/pgtop2.h
create mode 100644 src/lib/pmutex.c
create mode 100644 src/lib/pmutex.h
create mode 100644 src/lib/pudisks2.c
create mode 100644 src/lib/pudisks2.h
create mode 100644 src/lib/temperature.c
create mode 100644 src/lib/temperature.h
create mode 100644 src/psensor.gschema.xml
delete mode 100644 src/psensor.schemas
create mode 100755 test-driver
diff --git a/AUTHORS b/AUTHORS
index 8695c29..54c9ec6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,17 @@
-Authors of psensor.
+Authors of psensor:
-jeanfi@gmail.com all files.
-linux.dabao@gmail.com,royclarck po/zh_CN.po
-thgreasi@gmail.com src/lib/amd.h src/lib/amd.h
-Christoph Buchner (bilderbuchi) icons/ubuntu-mono-light/status/22/*svg icons/ubuntu-mono-dark/status/22/*svg
\ No newline at end of file
+jeanfi@gmail.com all files.
+MestreLion,thgreasi@gmail.com,jeanfi@gmail.com src/lib/amd.h src/lib/amd.h
+Christoph Buchner(bilderbuchi) icons/ubuntu-mono-light/status/22/*svg icons/ubuntu-mono-dark/status/22/*svg
+
+Include files from other open source softwares:
+
+jqPlot:
+Chris Leonello www/jqplot.dateAxisRenderer.js
+Chris Leonello,Ash Searle www/jqplot.js
+
+jQuery:
+jQuery Foundation www/jquery.js
+
+Linux Kernel:
+Dave Jones,Joel Schopp,Andy Whitcroft tests/checkpatch.pl
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index e199b72..df37f0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,10 @@ desktop_DATA = psensor.desktop
EXTRA_DIST = $(desktop_DATA) $(autostart_DATA)
+if ASCIIDOC
README.html: README www/style.css
asciidoc --theme style -a themedir=`pwd`/www -n -a toc README
NEWS.html: NEWS www/style.css
asciidoc --theme style -a themedir=`pwd`/www NEWS
+endif
diff --git a/Makefile.in b/Makefile.in
index 74ac73c..e387bb1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,14 +79,18 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
- AUTHORS COPYING ChangeLog INSTALL NEWS ar-lib compile \
- config.guess config.rpath config.sub depcomp install-sh \
- missing
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in ABOUT-NLS $(dist_doc_DATA) COPYING \
+ ar-lib compile config.guess config.rpath config.sub depcomp \
+ install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -68,15 +99,28 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -113,11 +157,33 @@ am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"
DATA = $(desktop_DATA) $(dist_doc_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+ $(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -128,6 +194,7 @@ am__remove_distdir = \
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -155,15 +222,18 @@ am__relativize = \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
@@ -185,15 +255,11 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
@@ -220,6 +286,8 @@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LIBUDISKS2_CFLAGS = @LIBUDISKS2_CFLAGS@
+LIBUDISKS2_LIBS = @LIBUDISKS2_LIBS@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
@@ -245,7 +313,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -260,7 +327,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -285,6 +351,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -381,8 +448,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -438,22 +505,25 @@ uninstall-dist_docDATA:
dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -468,57 +538,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -534,12 +559,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -551,15 +571,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -568,9 +584,31 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -638,40 +676,42 @@ distdir: $(DISTFILES)
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-tarZ: distdir
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-shar: distdir
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -682,8 +722,6 @@ distcheck: dist
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.lz*) \
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
@@ -695,18 +733,19 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && ../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -729,7 +768,7 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -866,13 +905,12 @@ ps-am:
uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-cscope clean-generic \
+ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+ dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
distcheck distclean distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
@@ -883,15 +921,15 @@ uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-desktopDATA uninstall-dist_docDATA
-README.html: README www/style.css
- asciidoc --theme style -a themedir=`pwd`/www -n -a toc README
+@ASCIIDOC_TRUE@README.html: README www/style.css
+@ASCIIDOC_TRUE@ asciidoc --theme style -a themedir=`pwd`/www -n -a toc README
-NEWS.html: NEWS www/style.css
- asciidoc --theme style -a themedir=`pwd`/www NEWS
+@ASCIIDOC_TRUE@NEWS.html: NEWS www/style.css
+@ASCIIDOC_TRUE@ asciidoc --theme style -a themedir=`pwd`/www NEWS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/NEWS b/NEWS
index 6283b5c..b918701 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,53 @@
Psensor NEWS
============
+v1.1.2
+------
+
+* Fixed missing description in psensor manpage.
+* All mouse buttons can be used to raise color settings in the list of
+ sensors.
+* All mouse buttons can be used to popup menu in the list of sensors.
+* List of sensors UI defined in glade file instead of code.
+* Fixed graph enabled setting not saved when toggle in the list of
+ sensors.
+* Added NVidia GPU graphics, memory, PCIe and video usage.
+* Fixed message when the configuration file is missing.
+* Added NVidia fan support.
+* Added 'Hide' menu item in the contextual menu of the list of
+ sensors.
+* Added free memory support.
+* Added alarm support of sensors expressed as percent.
+* Smoother curves (using Bezier algo).
+* Added translator credits in the about dialog.
+* Added Croatian translation from LP (gogo).
+* Merged all translations from LP.
+* Included the full list of contributors from LP, available throw the
+ about dialog.
+* Support of disk temperature using udisks2.
+* Fixed small UI layout/padding issues.
+* Splitted sensor preferences using a tab panel.
+* New preferences to enable/disable each sensor provider.
+* psensor: removed option +--use-libatasmart+.
+* Changed default color for the curves (copied from the default
+ colors of the gtk color chooser widget).
+
+v1.1.1
+------
+
+* Sensor properties stored in +$HOME/.psensor/psensor.cfg+ instead of
+ GConf.
+* psensor settings stored with dconf, removed dependency to gconf2.
+* Fixed check of sensors/error.h.
+* Made asciidoc optional.
+* Hide/show sensors in the main window.
+* Added TODO in the source tarball.
+* Merged Hungarian translation from LP (Richard Somlói).
+* Merged Italian translation from LP (Gabriele).
+* Merged Latvian translation from LP (tuxmaniack).
+* Merged Swedish translation from LP (Josef Andersson).
+* Meged Turkish translation from LP (Ä°brahim Ãelik).
+
v1.0.4
------
diff --git a/NEWS.html b/NEWS.html
index 985b0b4..48e7c55 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -381,6 +381,191 @@ asciidoc.install();
+
v1.1.2
+
+
+-
+
+Fixed missing description in psensor manpage.
+
+
+-
+
+All mouse buttons can be used to raise color settings in the list of
+ sensors.
+
+
+-
+
+All mouse buttons can be used to popup menu in the list of sensors.
+
+
+-
+
+List of sensors UI defined in glade file instead of code.
+
+
+-
+
+Fixed graph enabled setting not saved when toggle in the list of
+ sensors.
+
+
+-
+
+Added NVidia GPU graphics, memory, PCIe and video usage.
+
+
+-
+
+Fixed message when the configuration file is missing.
+
+
+-
+
+Added NVidia fan support.
+
+
+-
+
+Added Hide menu item in the contextual menu of the list of
+ sensors.
+
+
+-
+
+Added free memory support.
+
+
+-
+
+Added alarm support of sensors expressed as percent.
+
+
+-
+
+Smoother curves (using Bezier algo).
+
+
+-
+
+Added translator credits in the about dialog.
+
+
+-
+
+Added Croatian translation from LP (gogo).
+
+
+-
+
+Merged all translations from LP.
+
+
+-
+
+Included the full list of contributors from LP, available throw the
+ about dialog.
+
+
+-
+
+Support of disk temperature using udisks2.
+
+
+-
+
+Fixed small UI layout/padding issues.
+
+
+-
+
+Splitted sensor preferences using a tab panel.
+
+
+-
+
+New preferences to enable/disable each sensor provider.
+
+
+-
+
+psensor: removed option --use-libatasmart
.
+
+
+-
+
+Changed default color for the curves (copied from the default
+ colors of the gtk color chooser widget).
+
+
+
+
+
+
+
v1.1.1
+
+
+-
+
+Sensor properties stored in $HOME/.psensor/psensor.cfg
instead of
+ GConf.
+
+
+-
+
+psensor settings stored with dconf, removed dependency to gconf2.
+
+
+-
+
+Fixed check of sensors/error.h.
+
+
+-
+
+Made asciidoc optional.
+
+
+-
+
+Hide/show sensors in the main window.
+
+
+-
+
+Added TODO in the source tarball.
+
+
+-
+
+Merged Hungarian translation from LP (Richard Somlói).
+
+
+-
+
+Merged Italian translation from LP (Gabriele).
+
+
+-
+
+Merged Latvian translation from LP (tuxmaniack).
+
+
+-
+
+Merged Swedish translation from LP (Josef Andersson).
+
+
+-
+
+Meged Turkish translation from LP (Ä°brahim Ãelik).
+
+
+
+
+
+
v1.0.4
@@ -2666,7 +2851,7 @@ Fixed BR1: crash when no temperature sensor is available
+
+
+
+
+
+
+-
+
+Play a sound when a sensor alert is raised. Note that
+ it can actually be done by using the script support.
+
+
+-
+
+Use max/crit temperature information provided by
+ lm-sensor.
+
+
+-
+
+Include help/faq directly in psensor UI.
+
+
+
+
+
+
+
+
+
diff --git a/README b/README
index 43123c8..c1d3c70 100644
--- a/README
+++ b/README
@@ -11,10 +11,12 @@ It draws realtime charts and raises alerts about:
* the temperature of the motherboard and CPU sensors (using
lm-sensors).
* the temperature of the NVidia GPUs (using XNVCtrl).
- * the temperature of the Hard Disk Drives (using hddtemp or libatasmart).
- * the rotation speed of the fans (using lm-sensors).
+ * the temperature of ATI GPUs (using ATI ADL SDK).
+ * the temperature of the Hard Disk Drives (using hddtemp, libatasmart
+ or udisks2).
+ * the rotation speed of the fans.
* the temperature of a remote computer.
- * the cpu load.
+ * the CPU load.
Alerts are using Desktop Notification and a specific GTK+ status icon.
@@ -114,7 +116,6 @@ The compilation of +psensor+ requires:
* lm-sensors
* library sensors4
* library gtk3 >=3.4
- * library gconf2
* help2man
* asciidoc (optional, required to produce the html version of the
faq)
@@ -122,41 +123,17 @@ The compilation of +psensor+ requires:
* library libnotify (optional)
* library libappindicator (optional)
* library libXNVCtrl (optional)
- * library json0 and curl (optional, required for remote monitoring)
+ * library json-c >= 0.11.99 and curl (optional, required for remote monitoring)
* library unity (>=v3.4.2, optional)
* library gtop2 (optional, required for CPU usage)
* library atasmart (optional, for disk monitoring)
+ * library udisk2 (optional, for disk monitoring)
The specific requirements for +psensor-server+:
* library libmicrohttpd
* library json0
-For Debian 7.0:
------------------------------------------------------------------
-sudo apt-get install asciidoc cppcheck gcc gettext libgtk-3-dev
-libgconf2-dev libnotify-dev libsensors4-dev help2man
-libcurl4-openssl-dev libjson0-dev libmicrohttpd-dev libgtop2-dev
-libatasmart-dev make
------------------------------------------------------------------
-
-For Fedora 17:
------------------------------------------------------------------------
-sudo yum install gcc gtk3-devel GConf2-devel lm_sensors-devel cppcheck
-libatasmart-devel libcurl-devel json-c-devel libmicrohttpd-devel
-help2man libnotify-devel libgtop2-devel make
------------------------------------------------------------------------
-
-For Ubuntu 12.10:
--------------------------------------------------------------------------
-sudo apt-get install asciidoc autoconf automake autopoint
-debhelper (>= 9) cppcheck gettext help2man libappindicator3-dev
-libatasmart-dev libcurl4-gnutls-dev libgconf2-dev libgtk-3-dev
-libgtop2-dev libjson0-dev libmicrohttpd-dev libnotify-dev
-libsensors4-dev libunity-dev nvidia-settings perl
-
--------------------------------------------------------------------------
-
Compilation and Installation Steps
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -167,8 +144,7 @@ Compilation and Installation Steps
5. Start the sensor detection script: +sensors-detect+ and follows the
instructions. Reboot or activate the kernel modules which have
been found.
-6. To monitor HDDs, the +hddtemp+ daemon must be installed and running.
-7. Run: +psensor+
+6. Run: +psensor+
ATI/AMD GPU Support
~~~~~~~~~~~~~~~~~~~
diff --git a/README.html b/README.html
index 7b1b294..a1942e9 100644
--- a/README.html
+++ b/README.html
@@ -3,7 +3,7 @@