From e248180cc4ebc258fdd5778a26c08287089165b1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 2 Jun 2014 22:02:16 +0200 Subject: [PATCH] Imported Upstream version 1.0.1 --- INSTALL | 12 +- Makefile.am | 3 - Makefile.in | 54 +- NEWS | 30 +- NEWS.html | 183 +++++- aclocal.m4 | 374 +++++++----- ar-lib | 2 +- compile | 10 +- config.guess | 184 +++--- config.h.in | 4 +- config.sub | 97 +-- configure | 287 ++++++--- configure.ac | 4 +- depcomp | 455 ++++++++------ doc/Makefile.in | 1 + doc/faq.html | 118 ++-- doc/faq.txt | 112 +++- icons/hicolor/14x14/Makefile.in | 1 + icons/hicolor/16x16/Makefile.in | 1 + icons/hicolor/22x22/Makefile.in | 1 + icons/hicolor/24x24/Makefile.in | 1 + icons/hicolor/32x32/Makefile.in | 1 + icons/hicolor/48x48/Makefile.in | 1 + icons/hicolor/64x64/Makefile.in | 1 + icons/hicolor/scalable/Makefile.in | 1 + icons/hicolor/scalable/psensor_hot.svg | 55 +- icons/hicolor/scalable/psensor_normal.svg | 53 +- icons/ubuntu-mono-dark/apps/22/Makefile.in | 1 + icons/ubuntu-mono-dark/status/22/Makefile.in | 1 + icons/ubuntu-mono-dark/status/22/psensor_hot.svg | 16 +- .../ubuntu-mono-dark/status/22/psensor_normal.svg | 53 +- icons/ubuntu-mono-light/status/22/Makefile.in | 1 + icons/ubuntu-mono-light/status/22/psensor_hot.svg | 16 +- .../ubuntu-mono-light/status/22/psensor_normal.svg | 12 +- install-sh | 14 +- missing | 414 +++++-------- po/LINGUAS | 1 + po/POTFILES.in | 2 +- po/de.gmo | Bin 12187 -> 11455 bytes po/de.po | 324 +++++----- po/es.gmo | Bin 11796 -> 11375 bytes po/es.po | 367 ++++++------ po/fr.gmo | Bin 11986 -> 11795 bytes po/fr.po | 324 +++++----- po/hu.gmo | Bin 12052 -> 11439 bytes po/hu.po | 338 +++++------ po/it.gmo | Bin 11576 -> 11234 bytes po/it.po | 340 +++++------ po/lv.gmo | Bin 10491 -> 10410 bytes po/lv.po | 309 +++++----- po/nl.gmo | Bin 12054 -> 11397 bytes po/nl.po | 313 +++++----- po/psensor.pot | 263 ++++---- po/pt_BR.gmo | Bin 8548 -> 7976 bytes po/pt_BR.po | 320 +++++----- po/ru.gmo | Bin 11932 -> 11998 bytes po/ru.po | 314 +++++----- po/sl.gmo | Bin 473 -> 487 bytes po/sl.po | 265 ++++---- po/sr.gmo | Bin 1642 -> 1642 bytes po/sr.po | 263 ++++---- po/sv.gmo | Bin 0 -> 11836 bytes po/sv.po | 666 +++++++++++++++++++++ po/tr.gmo | Bin 12265 -> 11783 bytes po/tr.po | 316 +++++----- po/uk.gmo | Bin 8810 -> 8767 bytes po/uk.po | 319 +++++----- po/zh_CN.gmo | Bin 10600 -> 10066 bytes po/zh_CN.po | 351 ++++++----- src/Makefile.am | 7 +- src/Makefile.in | 28 +- src/cfg.c | 26 +- src/cfg.h | 5 +- src/glade/Makefile.in | 1 + src/glade/psensor-pref.glade | 378 +++++++----- src/glade/psensor.glade | 74 +-- src/glade/sensor-edit.glade | 516 ++++++++-------- src/graph.c | 6 +- src/lib/Makefile.am | 4 +- src/lib/Makefile.in | 9 +- src/lib/amd.c | 4 +- src/lib/cpu.c | 6 +- src/lib/hdd_atasmart.c | 4 +- src/lib/hdd_hddtemp.c | 2 +- src/lib/lmsensor.c | 8 +- src/lib/log.c | 157 ----- src/lib/log.h | 42 -- src/lib/nvidia.c | 14 +- src/lib/pio.c | 257 +++++++- src/lib/pio.h | 86 ++- src/lib/plog.c | 173 ++++++ src/lib/plog.h | 49 ++ src/lib/psensor.c | 32 +- src/lib/psensor.h | 12 +- src/lib/psensor_json.c | 6 +- src/lib/ptime.c | 84 ++- src/lib/ptime.h | 11 +- src/lib/slog.c | 20 +- src/main.c | 6 +- src/notify_cmd.c | 21 +- src/psensor.1 | 6 +- src/psensor.schemas | 2 +- src/pxdg.c | 186 ++++++ src/pxdg.h | 31 + src/server/Makefile.in | 1 + src/server/description.txt | 2 +- src/server/psensor-server.1 | 6 +- src/server/server.c | 2 +- src/ui_appindicator.c | 73 ++- src/ui_notify.c | 10 +- src/ui_pref.c | 9 +- src/ui_sensorlist.c | 10 +- src/ui_sensorpref.c | 97 ++- src/ui_status.c | 2 +- src/ui_unity.c | 9 +- src/ui_unity.h | 4 +- tests/Makefile.am | 4 +- tests/Makefile.in | 50 +- tests/test_psensor_type_to_unit_str.c | 4 +- tests/test_psensor_value_to_str.c | 12 +- www/Makefile.in | 1 + 121 files changed, 6375 insertions(+), 4163 deletions(-) create mode 100644 po/sv.gmo create mode 100644 po/sv.po delete mode 100644 src/lib/log.c delete mode 100644 src/lib/log.h create mode 100644 src/lib/plog.c create mode 100644 src/lib/plog.h create mode 100644 src/pxdg.c create mode 100644 src/pxdg.h diff --git a/INSTALL b/INSTALL index a1e89e1..2099840 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ operates. `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff --git a/Makefile.am b/Makefile.am index c4e3e53..e199b72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,9 +23,6 @@ dist_doc_DATA = AUTHORS \ README \ README.html -autostartdir = $(sysconfdir)/xdg/autostart -autostart_DATA = psensor.desktop - desktopdir = $(datadir)/applications desktop_DATA = psensor.desktop diff --git a/Makefile.in b/Makefile.in index 9101fde..74ac73c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -109,9 +109,8 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(autostartdir)" \ - "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)" -DATA = $(autostart_DATA) $(desktop_DATA) $(dist_doc_DATA) +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=) \ @@ -246,6 +245,7 @@ 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@ @@ -338,8 +338,6 @@ dist_doc_DATA = AUTHORS \ README \ README.html -autostartdir = $(sysconfdir)/xdg/autostart -autostart_DATA = psensor.desktop desktopdir = $(datadir)/applications desktop_DATA = psensor.desktop EXTRA_DIST = $(desktop_DATA) $(autostart_DATA) @@ -396,27 +394,6 @@ $(srcdir)/config.h.in: $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -install-autostartDATA: $(autostart_DATA) - @$(NORMAL_INSTALL) - @list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(autostartdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(autostartdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(autostartdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(autostartdir)" || exit $$?; \ - done - -uninstall-autostartDATA: - @$(NORMAL_UNINSTALL) - @list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(autostartdir)'; $(am__uninstall_files_from_dir) install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ @@ -787,7 +764,7 @@ check: check-recursive all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"; do \ + for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -841,8 +818,7 @@ info: info-recursive info-am: -install-data-am: install-autostartDATA install-desktopDATA \ - install-dist_docDATA +install-data-am: install-desktopDATA install-dist_docDATA install-dvi: install-dvi-recursive @@ -888,8 +864,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-autostartDATA uninstall-desktopDATA \ - uninstall-dist_docDATA +uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ ctags-recursive install-am install-strip tags-recursive @@ -901,15 +876,14 @@ uninstall-am: uninstall-autostartDATA uninstall-desktopDATA \ distcheck distclean distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ - install-autostartDATA install-data install-data-am \ - install-desktopDATA install-dist_docDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am 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 uninstall-autostartDATA \ + install-data install-data-am install-desktopDATA \ + install-dist_docDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + 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 \ uninstall-desktopDATA uninstall-dist_docDATA diff --git a/NEWS b/NEWS index 75ffc7f..6b32544 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,32 @@ Psensor NEWS ============ +v1.0.1 +------ + +* Smaller and more consistent with ubuntu themes appindicator icons. +* Sensors displayed directly in the top bar (experimental). +* Improved status icon in hicolor theme to fit well with white + background. (LP: #1310323). +* Psensor not autostarted by default. +* Added a setting to launch psensor on session startup. (Closes: + #728754) +* Fixed minor GUI bugs (widget alignments, padding, layout policy, + etc). +* Fixed missing translatable strings. +* Fixed FTBFS due to deprecation of json_object_object_get. (Closes: + #746145) +* Fixed typo (Celcius/Celsius). +* Merged german translation from LP. +* Merged turkish translation from LP (İbrahim Çelik). +* Merged chinese translation from LP. +* Merged hungarian translation from LP. +* Merged russian translation from LP (Dmitry Serov). +* Added support of swedish translation (Josef Andersson). +* Fixed NVIDIA strings. +* Fixed default sensor color which was always black. +* Fixed compilation on ppc64. (Closes: #749110) + v0.8.0.6 -------- @@ -153,7 +179,7 @@ v0.7.0.1 * psensor: used the foreground color defined by the theme for the font of the graph legend. * psensor: used tab layout for psensor preferences. -* psensor: temperature unit choice (celcius/fahrenheit). +* psensor: temperature unit choice (celsius/fahrenheit). * +psensor-server+: fixed --wdir option. * +psensor-server+: added log level to -d option. * +psensor-server+: added --log-file option. @@ -194,7 +220,7 @@ v0.6.2.19 v0.6.2.18 --------- -* added degree sign for celcius (Closes LP: #1021900). +* added degree sign for celsius (Closes LP: #1021900). * added russian, brazilian, hungarian, serbian, slovenian, italian, ukrainian and german translation files. * merged translations from LP. diff --git a/NEWS.html b/NEWS.html index ba5f0c6..7714441 100644 --- a/NEWS.html +++ b/NEWS.html @@ -3,7 +3,7 @@ - + Psensor NEWS