From 4c50d430bea4b8462b0ae7ab70baf3f538f87718 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini
Date: Mon, 1 Sep 2014 14:30:44 +0200
Subject: [PATCH] Imported Upstream version 1.1.1
---
Makefile.am | 2 +
Makefile.in | 17 +-
NEWS | 16 +
NEWS.html | 65 +-
README | 28 +-
README.html | 89 +--
aclocal.m4 | 129 ++--
config.h.in | 7 +-
configure | 583 ++++++++---------
configure.ac | 24 +-
doc/Makefile.am | 9 +-
doc/Makefile.in | 18 +-
doc/TODO.html | 420 +++++++++++++
doc/TODO.txt | 13 +
doc/faq.html | 34 +-
doc/faq.txt | 34 +-
icons/hicolor/14x14/Makefile.in | 9 +-
icons/hicolor/16x16/Makefile.in | 9 +-
icons/hicolor/22x22/Makefile.in | 9 +-
icons/hicolor/24x24/Makefile.in | 9 +-
icons/hicolor/32x32/Makefile.in | 9 +-
icons/hicolor/48x48/Makefile.in | 9 +-
icons/hicolor/64x64/Makefile.in | 9 +-
icons/hicolor/scalable/Makefile.in | 9 +-
icons/ubuntu-mono-dark/apps/22/Makefile.in | 9 +-
icons/ubuntu-mono-dark/status/22/Makefile.in | 9 +-
icons/ubuntu-mono-light/status/22/Makefile.in | 9 +-
po/POTFILES.in | 1 +
po/de.gmo | Bin 11455 -> 11455 bytes
po/de.po | 136 ++--
po/es.gmo | Bin 11375 -> 11375 bytes
po/es.po | 137 ++--
po/fr.gmo | Bin 11795 -> 11795 bytes
po/fr.po | 137 ++--
po/hu.gmo | Bin 11439 -> 13010 bytes
po/hu.po | 195 +++---
po/it.gmo | Bin 11234 -> 11713 bytes
po/it.po | 175 +++---
po/lv.gmo | Bin 10410 -> 11429 bytes
po/lv.po | 181 +++---
po/nl.gmo | Bin 11397 -> 11397 bytes
po/nl.po | 137 ++--
po/psensor.pot | 135 ++--
po/pt_BR.gmo | Bin 7976 -> 7976 bytes
po/pt_BR.po | 136 ++--
po/ru.gmo | Bin 11998 -> 11998 bytes
po/ru.po | 137 ++--
po/sl.gmo | Bin 487 -> 487 bytes
po/sl.po | 135 ++--
po/sr.gmo | Bin 1642 -> 1642 bytes
po/sr.po | 135 ++--
po/sv.gmo | Bin 11834 -> 12256 bytes
po/sv.po | 145 +++--
po/tr.gmo | Bin 11783 -> 12288 bytes
po/tr.po | 163 +++--
po/uk.gmo | Bin 8767 -> 8767 bytes
po/uk.po | 136 ++--
po/zh_CN.gmo | Bin 10066 -> 10066 bytes
po/zh_CN.po | 137 ++--
src/Makefile.am | 20 +-
src/Makefile.in | 107 ++--
src/cfg.c | 865 ++++++++++++++------------
src/cfg.h | 35 +-
src/description.txt | 45 --
src/glade/Makefile.in | 9 +-
src/glade/psensor.glade | 6 +-
src/glade/sensor-edit.glade | 36 +-
src/graph.c | 20 +-
src/lib/Makefile.am | 22 +-
src/lib/Makefile.in | 35 +-
src/lib/color.c | 32 +-
src/lib/color.h | 31 +-
src/lib/pmutex.c | 63 ++
src/lib/pmutex.h | 28 +
src/lib/psensor.c | 17 +-
src/lib/psensor.h | 3 -
src/lib/slog.c | 7 +-
src/lib/temperature.c | 30 +
src/lib/temperature.h | 25 +
src/main.c | 65 +-
src/psensor.1 | 2 +-
src/psensor.gschema.xml | 155 +++++
src/psensor.schemas | 274 --------
src/pxdg.c | 4 +-
src/rsensor.c | 6 +-
src/server/Makefile.in | 9 +-
src/server/psensor-server.1 | 2 +-
src/server/server.c | 13 +-
src/ui.c | 5 +-
src/ui_color.c | 2 +-
src/ui_pref.c | 51 +-
src/ui_pref.h | 2 +-
src/ui_sensorlist.c | 74 ++-
src/ui_sensorpref.c | 64 +-
src/ui_unity.c | 3 +-
tests/Makefile.in | 9 +-
www/Makefile.in | 9 +-
97 files changed, 3572 insertions(+), 2558 deletions(-)
create mode 100644 doc/TODO.html
create mode 100644 doc/TODO.txt
delete mode 100644 src/description.txt
create mode 100644 src/lib/pmutex.c
create mode 100644 src/lib/pmutex.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
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..76f0766 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -164,6 +164,7 @@ AMTAR = @AMTAR@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
@@ -185,15 +186,12 @@ 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@
@@ -285,6 +283,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -887,11 +886,11 @@ uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA
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..182b4d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,22 @@
Psensor NEWS
============
+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..d801d1c 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -381,6 +381,69 @@ asciidoc.install();
+
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 +2729,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..00d93ab 100644
--- a/README
+++ b/README
@@ -114,7 +114,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,7 +121,7 @@ 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)
@@ -132,31 +131,6 @@ 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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/README.html b/README.html
index 7b1b294..a1942e9 100644
--- a/README.html
+++ b/README.html
@@ -3,7 +3,7 @@
-
+
Psensor README
+
+
+