Hi, On Mon, Oct 26, 2015 at 04:46:36PM +0300, Dmitry Shachnev wrote: > sensors-applet FTBFS with gnome-common 3.18 from experimental: > > dh_autoreconf --as-needed ./autogen.sh -- --version > /usr/bin/gnome-autogen.sh > ... > automake: error: cannot open < gnome-doc-utils.make: No such file or > directory > autoreconf: automake failed with exit status: 1 > dh_autoreconf: ./autogen.sh --version returned exit code 1 > debian/rules:27: recipe for target 'override_dh_autoreconf' failed > > This was fixed upstream in this commit: > https://sourceforge.net/p/sensors-applet/code/ci/148c624f77106c14/
I intend to upload an NMU packaging the latest upstream snapshot, which will fix this bug. Attached is the debdiff, split into two parts (upstream source changes and packaging changes) for ease of reviewing. Since the DELAYED queue is not working today, I will just upload this on Monday if nobody objects. -- Dmitry Shachnev
diff -Nru sensors-applet-3.0.0+git5/configure.ac sensors-applet-3.0.0+git6/configure.ac --- sensors-applet-3.0.0+git5/configure.ac 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/configure.ac 2016-08-12 11:46:11.000000000 +0300 @@ -7,6 +7,7 @@ AC_CONFIG_SRCDIR([sensors-applet/main.c]) AM_CONFIG_HEADER([sensors-applet/config.h]) +AC_CONFIG_MACRO_DIRS([m4]) AM_INIT_AUTOMAKE([ -Wno-portability]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE @@ -253,8 +254,7 @@ GNOME_COMPILE_WARNINGS(maximum) -# ================ gnome-doc-utils stuff ============= # -GNOME_DOC_INIT +YELP_HELP_INIT # ==================== plugin stuff ================== # PLUGIN_LIBTOOL_FLAGS="-module -avoid-version" diff -Nru sensors-applet-3.0.0+git5/.gitignore sensors-applet-3.0.0+git6/.gitignore --- sensors-applet-3.0.0+git5/.gitignore 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/.gitignore 2016-08-12 11:46:11.000000000 +0300 @@ -15,6 +15,5 @@ intltool-update intltool-merge intltool-extract -gnome-doc-utils.make htdocs -*.tar.gz \ Kein Zeilenumbruch am Dateiende. +*.tar.gz diff -Nru sensors-applet-3.0.0+git5/help/C/index.docbook sensors-applet-3.0.0+git6/help/C/index.docbook --- sensors-applet-3.0.0+git5/help/C/index.docbook 1970-01-01 03:00:00.000000000 +0300 +++ sensors-applet-3.0.0+git6/help/C/index.docbook 2016-08-12 11:46:11.000000000 +0300 @@ -0,0 +1,733 @@ +<?xml version="1.0"?> +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" +"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [ + <!ENTITY legal SYSTEM "legal.xml"> + <!ENTITY appletversion "1.6"> + <!ENTITY manrevision "2.0"> + <!ENTITY date "January 2006"> + <!ENTITY applet "GNOME Sensors Applet"> + <!ENTITY author-name "Alex Murray"> + <!ENTITY author-email "murray.a...@gmail.com"> + <!ENTITY project-webpage "http://sensors-applet.sourceforge.net/";> + <!-- Information about the entities. + The legal.xml file contains legal information, there is no need to edit the file. + Use the appletversion entity to specify the version of the applet. + Use the manrevision entity to specify the revision number of this manual. + Use the date entity to specify the release date of this manual. + Use the applet entity to specify the name of the applet. --> + +]> +<!-- + (Do not remove this comment block.) + Maintained by the GNOME Documentation Project + http://developer.gnome.org/projects/gdp + Template version: 2.0 beta + Template last modified Feb 06, 2003 +--> +<!-- =============Document Header ============================= --> +<article id="index" lang="en"> + <!-- please do not change the id; for translations, change lang to --> + <!-- appropriate code --> + <articleinfo> + <title>&applet; Manual V&manrevision;</title> + <copyright> + <year>2006</year> + <holder>&author-name;</holder> + </copyright> + <abstract role="description"> + <para>&applet; displays readings from temperature, voltage and + fan sensors within the panel.</para> + </abstract> + + <!-- translators: uncomment this: + + <copyright> + <year>2002</year> + <holder>ME-THE-TRANSLATOR (Latin translation)</holder> + </copyright> + + --> + <!-- An address can be added to the publisher information. If a role is + not specified, the publisher/author is the same for all versions of the + document. + <publisher> + <publishername> GNOME Documentation Project </publishername> + </publisher> + --> + &legal; + <!-- This file contains link to license for the documentation (GNU FDL), and + other legal stuff such as "NO WARRANTY" statement. Please do not change + any of this. --> + + <authorgroup> + <author role="maintainer"> + <firstname>Alex</firstname> + <surname>Murray</surname> + <affiliation> + <!-- <orgname>GNOME Documentation + Project</orgname> --> + <!-- The email address of the author is optional and is commented out by default. + <address> <email>doc-writ...@gnome.org</email> </address> + --> + </affiliation> + </author> + <!-- This is appropriate place for other contributors: translators, + maintainers, etc. Commented out by default. + <othercredit role="translator"> + <firstname>Latin</firstname> + <surname>Translator 1</surname> + <affiliation> + <orgname>Latin Translation Team</orgname> + <address> <email>transla...@gnome.org</email> </address> + </affiliation> + <contrib>Latin translation</contrib> + </othercredit> + --> + </authorgroup> + <!-- According to GNU FDL, revision history is mandatory if you are --> + <!-- modifying/reusing someone else's document. If not, you can omit it. --> + <!-- Remember to remove the &manrevision; entity from the revision entries other + --> + <!-- than the current revision. --> + <!-- The revision numbering system for GNOME manuals is as follows: --> + <!-- * the revision number consists of two components --> + <!-- * the first component of the revision number reflects the release version of the GNOME desktop. --> + <!-- * the second component of the revision number is a decimal unit that is incremented with each revision of the manual. --> + <!-- For example, if the GNOME desktop release is V2.x, the first version of the manual that --> + <!-- is written in that desktop timeframe is V2.0, the second version of the manual is V2.1, etc. --> + <!-- When the desktop release version changes to V3.x, the revision number of the manual changes --> + <!-- to V3.0, and so on. --> + <revhistory> + <revision> + <revnumber>&applet; Manual V&manrevision;</revnumber> + <date>&date;</date> + <revdescription> + <para role="author">&author-name; + + <email>&author-email;</email> + </para> + <!-- <para role="publisher">GNOME Documentation Project</para> --> + </revdescription> + </revision> + </revhistory> + <releaseinfo> This manual describes version &appletversion; of &applet;. + </releaseinfo> + <legalnotice> + <title>Feedback</title> + <para> To report a bug or make a suggestion regarding &applet; or this + manual, follow the directions at the + <ulink url="&project-webpage;" + type="http">&applet; Project Homepage</ulink>. </para> + + </legalnotice> + </articleinfo> + <indexterm zone="index"> + <primary>&applet;</primary> + </indexterm> + <!-- ============= Document Body ============================= --> + <!-- ============= Introduction ============================== --> + <sect1 id="sensors-applet-introduction"> + <title>Introduction</title> + <!-- ==== Figure ============================================= --> + <figure id="sensors-applet-fig"> + <title>&applet;</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="figures/applet_in_panel.png" format="PNG"/> + </imageobject> + <textobject> + <phrase>&applet; with 3 sensors enabled.</phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + <!-- ==== End of Figure ======================================= --> + <para> + <application>&applet;</application> provides a convenient way to + monitor the health of your computer in a simple display on your + desktop. + </para> + <para>A number of sensor interfaces are supported, which should be + configured before adding &applet; to the panel: + <itemizedlist> + <listitem> + <para>ACPI thermal zones, via the Linux kernel ACPI modules</para> + </listitem> + <listitem> + <!-- i2c modules --> + <para>Linux kernel i2c modules</para> + <itemizedlist> + <listitem> + <para>Via the sysfs filesystem and <ulink + url="http://secure.netroedge.com/~lm78/kernel26.html"; + type="http">i2c</ulink> modules distributed directly + with the kernel (kernel 2.6)</para> + </listitem> + <listitem> + <para>Via the proc filesystem and i2c modules from the + <ulink + url="http://secure.netroedge.com/~lm78/kernel26.html"; + type="http">lm_sensors and i2c</ulink> packages (kernel 2.4)</para> + </listitem> + <listitem> + <para>Via the libsensors library provided with the + <ulink + url="http://secure.netroedge.com/~lm78/kernel26.html"; + type="http">lm_sensors</ulink> package + </para> + </listitem> + </itemizedlist> + </listitem> + <!-- i8k module --> + <listitem> + <para>Linux kernel <ulink + url="http://people.debian.org/~dz/i8k/00-README"; + type="http">i8k</ulink> module (for Dell Inspiron Laptops).</para> + </listitem> + <!-- ibm-acpi module --> + <listitem> + <para>Linux kernel <ulink + url="http://ibm-acpi.sourceforge.net/"; + type="http">ibm-acpi</ulink> module (for IBM Laptops).</para> + </listitem> + <!-- therm_adt746x and therm_windtunnel --> + <listitem> + <para>Linux kernel PowerPC modules therm_adt746x and therm_windtunnel.</para> + </listitem> + <!-- iMac G5 Windfarm --> + <listitem> + <para>Linux kernel iMac G5 Windfarm module.</para> + </listitem> + <!-- hddtemp --> + <listitem> + <para><ulink url="http://www.guzu.net/linux/hddtemp.php"; + type="http">hddtemp</ulink> daemon for reading temperatures + from S.M.A.R.T. equipped disks.</para> + </listitem> + <!-- Omnibook --> + <listitem> + <para>Linux kernel <ulink + url="http://sourceforge.net/projects/omke";>Omnibook</ulink> + module. (for HP and Toshiba Satellite Laptops)</para> + </listitem> + <!-- NVCtrl --> + <listitem> + <para>NVIDIA graphics cards via libNVCtrl (provided with + <ulink + url="ftp://download.nvidia.com/XFree86/nvidia-settings/";> + nvidia-settings</ulink> + ). + </para> + </listitem> + </itemizedlist> + </para> + <para>To add <application>&applet;</application> to a panel right-click on the panel to open the + panel pop-up menu, then choose + <menuchoice> + <guimenu>Add to Panel</guimenu> + <guimenuitem>Hardware Sensors Monitor</guimenuitem> + </menuchoice>.</para> + </sect1> + <!-- ================ Usage ================================ --> + <!-- Use this section to describe how to use the applet to perform the tasks for + which the applet is designed. --> + <sect1 id="sensors-applet-usage"> + <title>Usage</title> + <para>When you add <application>&applet;</application> to a panel for the + first time, the applet will search for any available sensors to monitor, and will display a sensible default sensor if found (such as the temperature of the CPU). + </para> + <para>Most users will then want to customize the display to their + liking, which can be done via the + <menuchoice> + <guimenuitem>Preferences</guimenuitem> + </menuchoice> menu item + (see <xref linkend="sensors-applet-preferences" />). + </para> + </sect1> + <!-- ============= Preferences ============================= --> + <!-- Use this section to describe how to customize the applet. --> + <sect1 id="sensors-applet-preferences"> + <title>Preferences</title> + <para>To configure <application>&applet;</application>, + right-click on the applet, then choose + <menuchoice><guimenuitem>Preferences</guimenuitem></menuchoice> + from the pop-up menu.</para> + <para>The + <menuchoice><guimenuitem>Preferences</guimenuitem></menuchoice> + window contains the following tabbed sections: </para> + <itemizedlist> + <listitem> + <para> + <xref linkend="sensors-applet-general-options"/> + </para> + </listitem> + <listitem> + <para> + <xref linkend="sensors-applet-sensors"/> + </para> + </listitem> + </itemizedlist> + </sect1> + <!-- =============== Customization Subsection ================ --> + <!-- Use a new section to describe different tabbed sections on the Settings or Preferences + dialog. --> + <sect1 id="sensors-applet-general-options"> + <title>General Options</title> + <variablelist> + <varlistentry> + <term> + <guilabel>Display sensors in panel as</guilabel> + </term> + <listitem> + <para>This option selects whether to display sensors in + the panel with either their label or icon and their value, + or to have no identifier for each sensor and just display their + values, or simply to display the icon for each sensor. A graph can + also be displayed for each sensor, showing the progression of the + sensor value over time.</para> + <para>Default: icon with value.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Preferred position of sensor values</guilabel> + </term> + <listitem> + <para>Sensors can be display with either their value + beside their icon / label, or with the value shown below the icon + / label. </para> + <para>Default: beside labels / icons.</para> + + <note> + <para>If there is not enough room in the panel to use the + requested position, the best position to ensure all sensor + elements are visible will be used instead.</para> + </note> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Graph size (pixels)</guilabel> + </term> + <listitem> + <para>When displaying sensors as graphs, the size of the + graph sets either the width of the graph (when displayed on + either the top or bottom panel) or the height of the graph (when + displayed on the left or right panel).</para> + <para>Default: 42 pixels.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Temperature scale</guilabel> + </term> + <listitem> + <para>Which scale to use for temperature sensors (Kelvin, + Fahrenheit or Celsius are supported).</para> + <para>Default: Celsius.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Update interval</guilabel> + </term> + <listitem> + <para>How often to update the values of each sensor shown + within the panel.</para> + <para>Default: 2 seconds.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Display notifications</guilabel> + </term> + <listitem> + <para>If enabled, &applet; will display notifications to + the user when alarm conditions occur.</para> + <para>Default: Enabled.</para> + <note> + <para> +Alarms for individual sensors must also be enabled. + </para> + </note> + </listitem> + </varlistentry> + </variablelist> + </sect1> + <!-- ============= Customization Subsection ===================== --> + <!-- Another tabbed section on the Preferences dialog. --> + <sect1 id="sensors-applet-sensors"> + <title>Sensors</title> + <para>The Sensors tab within the preferences window provides the + options for configuring each individual sensor. Each sensor is + listed under its specific interface, along with: + <itemizedlist> + <listitem> + <para>A fixed ID to identify the sensor within its + interface.</para> + </listitem> + <listitem> + <para>A user selectable icon to identify the sensor within + the panel.</para> + </listitem> + + <listitem> + <para>A user editable label to identify the sensor within + the panel.</para> + </listitem> + + <listitem> + <para>A check-box to allow the user to enable / disable + monitoring and display of the sensor within the + panel.</para> + </listitem> + + </itemizedlist> + The <guibutton>Properties</guibutton> button allows a + specific sensor to be more finely configured, providing a + separate window box for this purpose. (see <xref + linkend="sensors-applet-sensor-config-dialog" />) + </para> + <sect2 id="sensors-applet-sensor-config-dialog"> + <title>Sensor Properties</title> + + <para>Each sensor can be configured with a number of options, + including the possibility to scale the sensor value, and to + execute an alarm if a certain low or high value is + reached. The sensor icon can also be selected if + required. The high and low values are used to scale the + graph display, as well as set the color for the thermometer + displayed within the icons of temperature sensors.</para> + + <para>The sensor value can be scaled in a linear + fashion by allowing the user to specify a multiplier + and offset for each sensor. As each sensor value is + read, it is first multiplied by the 'multiplier' and + summed with the 'offset' to produce the final + value.</para> + + <variablelist> + <varlistentry> + <term> + <guilabel>Sensor value multiplier</guilabel> + </term> + <listitem> + <para>This option allows the user to specify the + multiplier of the sensor value.</para> + <para>Default: 1.0</para> + </listitem> + </varlistentry> + + <varlistentry> + <term> + <guilabel>Sensor value offset</guilabel> + </term> + <listitem> + <para>This option allows the user to specify the offset + for the sensor value.</para> + <para>Default: 0.0</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Sensor low value</guilabel> + </term> + <listitem> + <para>The value at which to trigger an alarm if the + sensor drops below this value. This value is also used to + scale the display of the graph and temperature icons.</para> + <para>Default: dependent on sensor type</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Sensor high value</guilabel> + </term> + <listitem> + <para>The value at which to trigger an alarm if the + sensor rises above this value. This value is also used to + scale the display of the graph and temperature icons.</para> + <para>Default: dependent on sensor type</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Enable alarm</guilabel> + </term> + <listitem> + <para>This option allows the user to enable alarm + monitoring for this sensor. When the sensor value rises + above, or drops below it's high or low values, the alarm + condition will occur. This will display a notification + to the user (if enabled), and execute the appropriate + Alarm Command every Alarm repeat interval + seconds.</para> + <para>Default: disabled</para> + <note> + <para> + Alarms will only execute for active sensors + </para> + </note> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Alarm repeat interval (secs)</guilabel> + </term> + <listitem> + <para> + How often to execute the alarm command while the alarm + condition is met. A value of 0 specifies to execute the + alarm once only when the alarm condition occurs. + </para> + <para>Default: 0 seconds</para> + <note> + <para> + If notifications are also enabled, a notification will + be displayed each time the alarm is executed as well + to notify the user that the alarm condition has + occurred. + </para> + </note> + </listitem> + </varlistentry> + + <varlistentry> + <term> + <guilabel>High alarm command</guilabel> + </term> + <listitem> + <para>The command to be executed at each repeat interval + when the sensor value is equal to or above the upper limit. + </para> + <para>Default: none</para> + </listitem> + </varlistentry> + + <varlistentry> + <term> + <guilabel>Low alarm command</guilabel> + </term> + <listitem> + <para>The command to be executed at each repeat interval + when the sensor value is equal to or below the lower limit. + </para> + <para>Default: none</para> + <tip> + <variablelist> + <varlistentry> + <term> + <guilabel>Play a sound when the alarm occurs</guilabel> + </term> + <listitem> + <para>You can play a sound when the alarm occurs + by using the command + <command>esdplay</command> which should be + available as part of the standard GNOME + installation. (Note: If this does not work, + you could also try <command>aplay</command> + which is the default ALSA sound player). + + <!-- Make sure there is no extra whitespace + around these commands as it is a verbose + environment - preserves whitespace and + carriage returns etc --> + + <screen><userinput><command>esdplay /usr/share/sounds/gnibbles/gobble.wav</command></userinput></screen> + + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Pop-up a window to notify that the + alarm has occurred</guilabel> + </term> + <listitem> + <para> + The program <command>zenity</command> can be used to create + dialog boxes to be displayed on the users current + display, and can thus be used to create pop-up + style notifications that the alarm has + occurred. + + <screen><userinput><command>zenity --warning --title="Sensor Alarm" --text="Sensor Alarm occurred"</command></userinput></screen> + + For more information regarding Zenity please + consult the Zenity <ulink type="help" + url="help:zenity">documentation</ulink>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel> + Combine multiple commands into one alarm command + </guilabel> + </term> + <listitem> + <para> + Multiple commands can be executed one after the + other using the "&&" construct to separate + them. To play a sound and pop-up a dialog via + Zenity the follow command can be used: + + <screen><userinput><command>esdplay /usr/share/sounds/gnibbles/gobble.wav && zenity --warning --title="Sensor Alarm" --text="Sensor Alarm occurred"</command></userinput></screen> + + </para> + </listitem> + </varlistentry> + </variablelist> + </tip> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Sensor icon</guilabel> + </term> + <listitem> + <para>Provides a list of available icons to allow the + user to select one to represent this sensor.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <guilabel>Graph color</guilabel> + </term> + <listitem> + <para>The color to use to display the graph for the + sensor.</para> + <note> + <para>To accurately display graphs both the high + and low values for the sensor need to be set correctly. + </para> + </note> + </listitem> + </varlistentry> + </variablelist> + + </sect2> + </sect1> + <sect1> + <title>Advanced Options</title> + <para>There are a number of advanced options which can be set to + customize the display of sensors within the panel, which are set + using the GConf system.</para> + <variablelist> + <varlistentry> + <term><guilabel>Font Size</guilabel></term> + <listitem> + <para>The font size for labels and values is normally + derived from the standard Application Font size of the GNOME + Desktop, however this can be overridden. This is done by + setting the value of the parameter + + <emphasis>/apps/sensors-applet/font-size</emphasis> + + within the user's GConf database. This can be achieved by + the following command, where the font size is specified as + the last parameter, and in this case is set to + <emphasis>10</emphasis>: + + <!-- CAN"T HAVE ANY LINE BREAKS IN COMMAND --> + <screen><userinput><command>gconftool-2 -s /apps/sensors-applet/font-size -t int 10</command></userinput></screen> + </para> + + <note> + <para>To reset the value so that the default font size is + not overridden, a font size of <emphasis>0</emphasis> + should be set. + </para> + </note> + + </listitem> + </varlistentry> + <varlistentry> + <term><guilabel>Hide Units</guilabel></term> + <listitem> + <para>The units for sensor values can also be hidden if + desired by setting the boolean value + + <emphasis>/apps/sensors-applet/hide-units</emphasis> + + within the user's GConf database. This can be achieved by + the following command, where the value is specified as + either <emphasis>true</emphasis> or + <emphasis>false</emphasis> and is specified as the last + parameter. In this case is the units will be hidden (the + value is set to <emphasis>true</emphasis>): + <!-- CAN"T HAVE ANY LINE BREAKS IN COMMAND --> + <screen><userinput><command>gconftool-2 -s /apps/sensors-applet/hide-units -t bool true</command></userinput></screen> + </para> + </listitem> + </varlistentry> + </variablelist> + <note> + <para>These values can also be set using the <ulink type="help" + url="help:gconf-editor">Configuration Editor</ulink> + application. + </para> + </note> + </sect1> + <!-- ============= Bugs ================================== --> + <!-- This section is optional and is commented out by default. + You can use it to describe known bugs and limitations of the + program if there are any - please be frank and list all + problems you know of. + + <sect1 id="myapplet-bugs"> + <title>Known Bugs and Limitations</title> + <para> </para> + </sect1> + --> + <!-- ============= About ================================== --> + <!-- This section contains info about the program (not docs), such as + author's name(s), web page, license, feedback address. This + section is optional: primary place for this info is "About.." box of + the program. However, if you do wish to include this info in the + manual, this is the place to put it. Alternatively, you can put this + information in the title page.--> + + <sect1 id="myapplet-about"> + <title>About &applet;</title> + <para> + <application>&applet;</application> was written by Alex Murray + (<email>murray.a...@gmail.com</email>). To find more information about + <application>&applet;</application>, please visit the <ulink + url="&project-webpage;" type="http">&applet; Project + Homepage</ulink>. + </para> + <para> To report a bug or make a suggestion regarding &applet; or this + manual, follow the directions at the + <ulink url="&project-webpage;" + type="http">project homepage</ulink>. </para> + + <!-- For translations: uncomment this: + + <para> + Latin translation was done by ME + (<email>MYNAME@MYADDRESS</email>). Please send all comments and + suggestions regarding this translation to SOMEWHERE. + </para> + + --> + + <para> + This program is distributed 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. A copy of this license can be found at this <ulink + type="help" url="help:gpl">link</ulink>, or in the file COPYING + included with the source code of this program. + </para> + </sect1> + +</article> +<!-- OVERRIDE DICTIONARY SETTING SO THAT USE AMERICAN ENGLISH STYLE - --> +<!-- FROM GNOME HIG --> +<!-- Local IspellDict: english --> +<!-- LocalWords: hddtemp filesystem proc lm README Inspiron windtunnel --> +<!-- LocalWords: ibm ACPI sysfs PowerPC adt Omnibook NVIDIA --> +<!-- LocalWords: libNVCtrl libsensors nvidia esdplay aplay ALSA zenity --> +<!-- LocalWords: acpi iMac Windfarm nvidia gconftool GConf bool --> diff -Nru sensors-applet-3.0.0+git5/help/C/sensors-applet.xml sensors-applet-3.0.0+git6/help/C/sensors-applet.xml --- sensors-applet-3.0.0+git5/help/C/sensors-applet.xml 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/help/C/sensors-applet.xml 1970-01-01 03:00:00.000000000 +0300 @@ -1,733 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" -"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [ - <!ENTITY legal SYSTEM "legal.xml"> - <!ENTITY appletversion "1.6"> - <!ENTITY manrevision "2.0"> - <!ENTITY date "January 2006"> - <!ENTITY applet "GNOME Sensors Applet"> - <!ENTITY author-name "Alex Murray"> - <!ENTITY author-email "murray.a...@gmail.com"> - <!ENTITY project-webpage "http://sensors-applet.sourceforge.net/";> - <!-- Information about the entities. - The legal.xml file contains legal information, there is no need to edit the file. - Use the appletversion entity to specify the version of the applet. - Use the manrevision entity to specify the revision number of this manual. - Use the date entity to specify the release date of this manual. - Use the applet entity to specify the name of the applet. --> - -]> -<!-- - (Do not remove this comment block.) - Maintained by the GNOME Documentation Project - http://developer.gnome.org/projects/gdp - Template version: 2.0 beta - Template last modified Feb 06, 2003 ---> -<!-- =============Document Header ============================= --> -<article id="index" lang="en"> - <!-- please do not change the id; for translations, change lang to --> - <!-- appropriate code --> - <articleinfo> - <title>&applet; Manual V&manrevision;</title> - <copyright> - <year>2006</year> - <holder>&author-name;</holder> - </copyright> - <abstract role="description"> - <para>&applet; displays readings from temperature, voltage and - fan sensors within the panel.</para> - </abstract> - - <!-- translators: uncomment this: - - <copyright> - <year>2002</year> - <holder>ME-THE-TRANSLATOR (Latin translation)</holder> - </copyright> - - --> - <!-- An address can be added to the publisher information. If a role is - not specified, the publisher/author is the same for all versions of the - document. - <publisher> - <publishername> GNOME Documentation Project </publishername> - </publisher> - --> - &legal; - <!-- This file contains link to license for the documentation (GNU FDL), and - other legal stuff such as "NO WARRANTY" statement. Please do not change - any of this. --> - - <authorgroup> - <author role="maintainer"> - <firstname>Alex</firstname> - <surname>Murray</surname> - <affiliation> - <!-- <orgname>GNOME Documentation - Project</orgname> --> - <!-- The email address of the author is optional and is commented out by default. - <address> <email>doc-writ...@gnome.org</email> </address> - --> - </affiliation> - </author> - <!-- This is appropriate place for other contributors: translators, - maintainers, etc. Commented out by default. - <othercredit role="translator"> - <firstname>Latin</firstname> - <surname>Translator 1</surname> - <affiliation> - <orgname>Latin Translation Team</orgname> - <address> <email>transla...@gnome.org</email> </address> - </affiliation> - <contrib>Latin translation</contrib> - </othercredit> - --> - </authorgroup> - <!-- According to GNU FDL, revision history is mandatory if you are --> - <!-- modifying/reusing someone else's document. If not, you can omit it. --> - <!-- Remember to remove the &manrevision; entity from the revision entries other - --> - <!-- than the current revision. --> - <!-- The revision numbering system for GNOME manuals is as follows: --> - <!-- * the revision number consists of two components --> - <!-- * the first component of the revision number reflects the release version of the GNOME desktop. --> - <!-- * the second component of the revision number is a decimal unit that is incremented with each revision of the manual. --> - <!-- For example, if the GNOME desktop release is V2.x, the first version of the manual that --> - <!-- is written in that desktop timeframe is V2.0, the second version of the manual is V2.1, etc. --> - <!-- When the desktop release version changes to V3.x, the revision number of the manual changes --> - <!-- to V3.0, and so on. --> - <revhistory> - <revision> - <revnumber>&applet; Manual V&manrevision;</revnumber> - <date>&date;</date> - <revdescription> - <para role="author">&author-name; - - <email>&author-email;</email> - </para> - <!-- <para role="publisher">GNOME Documentation Project</para> --> - </revdescription> - </revision> - </revhistory> - <releaseinfo> This manual describes version &appletversion; of &applet;. - </releaseinfo> - <legalnotice> - <title>Feedback</title> - <para> To report a bug or make a suggestion regarding &applet; or this - manual, follow the directions at the - <ulink url="&project-webpage;" - type="http">&applet; Project Homepage</ulink>. </para> - - </legalnotice> - </articleinfo> - <indexterm zone="index"> - <primary>&applet;</primary> - </indexterm> - <!-- ============= Document Body ============================= --> - <!-- ============= Introduction ============================== --> - <sect1 id="sensors-applet-introduction"> - <title>Introduction</title> - <!-- ==== Figure ============================================= --> - <figure id="sensors-applet-fig"> - <title>&applet;</title> - <screenshot> - <mediaobject> - <imageobject> - <imagedata fileref="figures/applet_in_panel.png" format="PNG"/> - </imageobject> - <textobject> - <phrase>&applet; with 3 sensors enabled.</phrase> - </textobject> - </mediaobject> - </screenshot> - </figure> - <!-- ==== End of Figure ======================================= --> - <para> - <application>&applet;</application> provides a convenient way to - monitor the health of your computer in a simple display on your - desktop. - </para> - <para>A number of sensor interfaces are supported, which should be - configured before adding &applet; to the panel: - <itemizedlist> - <listitem> - <para>ACPI thermal zones, via the Linux kernel ACPI modules</para> - </listitem> - <listitem> - <!-- i2c modules --> - <para>Linux kernel i2c modules</para> - <itemizedlist> - <listitem> - <para>Via the sysfs filesystem and <ulink - url="http://secure.netroedge.com/~lm78/kernel26.html"; - type="http">i2c</ulink> modules distributed directly - with the kernel (kernel 2.6)</para> - </listitem> - <listitem> - <para>Via the proc filesystem and i2c modules from the - <ulink - url="http://secure.netroedge.com/~lm78/kernel26.html"; - type="http">lm_sensors and i2c</ulink> packages (kernel 2.4)</para> - </listitem> - <listitem> - <para>Via the libsensors library provided with the - <ulink - url="http://secure.netroedge.com/~lm78/kernel26.html"; - type="http">lm_sensors</ulink> package - </para> - </listitem> - </itemizedlist> - </listitem> - <!-- i8k module --> - <listitem> - <para>Linux kernel <ulink - url="http://people.debian.org/~dz/i8k/00-README"; - type="http">i8k</ulink> module (for Dell Inspiron Laptops).</para> - </listitem> - <!-- ibm-acpi module --> - <listitem> - <para>Linux kernel <ulink - url="http://ibm-acpi.sourceforge.net/"; - type="http">ibm-acpi</ulink> module (for IBM Laptops).</para> - </listitem> - <!-- therm_adt746x and therm_windtunnel --> - <listitem> - <para>Linux kernel PowerPC modules therm_adt746x and therm_windtunnel.</para> - </listitem> - <!-- iMac G5 Windfarm --> - <listitem> - <para>Linux kernel iMac G5 Windfarm module.</para> - </listitem> - <!-- hddtemp --> - <listitem> - <para><ulink url="http://www.guzu.net/linux/hddtemp.php"; - type="http">hddtemp</ulink> daemon for reading temperatures - from S.M.A.R.T. equipped disks.</para> - </listitem> - <!-- Omnibook --> - <listitem> - <para>Linux kernel <ulink - url="http://sourceforge.net/projects/omke";>Omnibook</ulink> - module. (for HP and Toshiba Satellite Laptops)</para> - </listitem> - <!-- NVCtrl --> - <listitem> - <para>NVIDIA graphics cards via libNVCtrl (provided with - <ulink - url="ftp://download.nvidia.com/XFree86/nvidia-settings/";> - nvidia-settings</ulink> - ). - </para> - </listitem> - </itemizedlist> - </para> - <para>To add <application>&applet;</application> to a panel right-click on the panel to open the - panel pop-up menu, then choose - <menuchoice> - <guimenu>Add to Panel</guimenu> - <guimenuitem>Hardware Sensors Monitor</guimenuitem> - </menuchoice>.</para> - </sect1> - <!-- ================ Usage ================================ --> - <!-- Use this section to describe how to use the applet to perform the tasks for - which the applet is designed. --> - <sect1 id="sensors-applet-usage"> - <title>Usage</title> - <para>When you add <application>&applet;</application> to a panel for the - first time, the applet will search for any available sensors to monitor, and will display a sensible default sensor if found (such as the temperature of the CPU). - </para> - <para>Most users will then want to customize the display to their - liking, which can be done via the - <menuchoice> - <guimenuitem>Preferences</guimenuitem> - </menuchoice> menu item - (see <xref linkend="sensors-applet-preferences" />). - </para> - </sect1> - <!-- ============= Preferences ============================= --> - <!-- Use this section to describe how to customize the applet. --> - <sect1 id="sensors-applet-preferences"> - <title>Preferences</title> - <para>To configure <application>&applet;</application>, - right-click on the applet, then choose - <menuchoice><guimenuitem>Preferences</guimenuitem></menuchoice> - from the pop-up menu.</para> - <para>The - <menuchoice><guimenuitem>Preferences</guimenuitem></menuchoice> - window contains the following tabbed sections: </para> - <itemizedlist> - <listitem> - <para> - <xref linkend="sensors-applet-general-options"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="sensors-applet-sensors"/> - </para> - </listitem> - </itemizedlist> - </sect1> - <!-- =============== Customization Subsection ================ --> - <!-- Use a new section to describe different tabbed sections on the Settings or Preferences - dialog. --> - <sect1 id="sensors-applet-general-options"> - <title>General Options</title> - <variablelist> - <varlistentry> - <term> - <guilabel>Display sensors in panel as</guilabel> - </term> - <listitem> - <para>This option selects whether to display sensors in - the panel with either their label or icon and their value, - or to have no identifier for each sensor and just display their - values, or simply to display the icon for each sensor. A graph can - also be displayed for each sensor, showing the progression of the - sensor value over time.</para> - <para>Default: icon with value.</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Preferred position of sensor values</guilabel> - </term> - <listitem> - <para>Sensors can be display with either their value - beside their icon / label, or with the value shown below the icon - / label. </para> - <para>Default: beside labels / icons.</para> - - <note> - <para>If there is not enough room in the panel to use the - requested position, the best position to ensure all sensor - elements are visible will be used instead.</para> - </note> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Graph size (pixels)</guilabel> - </term> - <listitem> - <para>When displaying sensors as graphs, the size of the - graph sets either the width of the graph (when displayed on - either the top or bottom panel) or the height of the graph (when - displayed on the left or right panel).</para> - <para>Default: 42 pixels.</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Temperature scale</guilabel> - </term> - <listitem> - <para>Which scale to use for temperature sensors (Kelvin, - Fahrenheit or Celsius are supported).</para> - <para>Default: Celsius.</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Update interval</guilabel> - </term> - <listitem> - <para>How often to update the values of each sensor shown - within the panel.</para> - <para>Default: 2 seconds.</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Display notifications</guilabel> - </term> - <listitem> - <para>If enabled, &applet; will display notifications to - the user when alarm conditions occur.</para> - <para>Default: Enabled.</para> - <note> - <para> -Alarms for individual sensors must also be enabled. - </para> - </note> - </listitem> - </varlistentry> - </variablelist> - </sect1> - <!-- ============= Customization Subsection ===================== --> - <!-- Another tabbed section on the Preferences dialog. --> - <sect1 id="sensors-applet-sensors"> - <title>Sensors</title> - <para>The Sensors tab within the preferences window provides the - options for configuring each individual sensor. Each sensor is - listed under its specific interface, along with: - <itemizedlist> - <listitem> - <para>A fixed ID to identify the sensor within its - interface.</para> - </listitem> - <listitem> - <para>A user selectable icon to identify the sensor within - the panel.</para> - </listitem> - - <listitem> - <para>A user editable label to identify the sensor within - the panel.</para> - </listitem> - - <listitem> - <para>A check-box to allow the user to enable / disable - monitoring and display of the sensor within the - panel.</para> - </listitem> - - </itemizedlist> - The <guibutton>Properties</guibutton> button allows a - specific sensor to be more finely configured, providing a - separate window box for this purpose. (see <xref - linkend="sensors-applet-sensor-config-dialog" />) - </para> - <sect2 id="sensors-applet-sensor-config-dialog"> - <title>Sensor Properties</title> - - <para>Each sensor can be configured with a number of options, - including the possibility to scale the sensor value, and to - execute an alarm if a certain low or high value is - reached. The sensor icon can also be selected if - required. The high and low values are used to scale the - graph display, as well as set the color for the thermometer - displayed within the icons of temperature sensors.</para> - - <para>The sensor value can be scaled in a linear - fashion by allowing the user to specify a multiplier - and offset for each sensor. As each sensor value is - read, it is first multiplied by the 'multiplier' and - summed with the 'offset' to produce the final - value.</para> - - <variablelist> - <varlistentry> - <term> - <guilabel>Sensor value multiplier</guilabel> - </term> - <listitem> - <para>This option allows the user to specify the - multiplier of the sensor value.</para> - <para>Default: 1.0</para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <guilabel>Sensor value offset</guilabel> - </term> - <listitem> - <para>This option allows the user to specify the offset - for the sensor value.</para> - <para>Default: 0.0</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Sensor low value</guilabel> - </term> - <listitem> - <para>The value at which to trigger an alarm if the - sensor drops below this value. This value is also used to - scale the display of the graph and temperature icons.</para> - <para>Default: dependent on sensor type</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Sensor high value</guilabel> - </term> - <listitem> - <para>The value at which to trigger an alarm if the - sensor rises above this value. This value is also used to - scale the display of the graph and temperature icons.</para> - <para>Default: dependent on sensor type</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Enable alarm</guilabel> - </term> - <listitem> - <para>This option allows the user to enable alarm - monitoring for this sensor. When the sensor value rises - above, or drops below it's high or low values, the alarm - condition will occur. This will display a notification - to the user (if enabled), and execute the appropriate - Alarm Command every Alarm repeat interval - seconds.</para> - <para>Default: disabled</para> - <note> - <para> - Alarms will only execute for active sensors - </para> - </note> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Alarm repeat interval (secs)</guilabel> - </term> - <listitem> - <para> - How often to execute the alarm command while the alarm - condition is met. A value of 0 specifies to execute the - alarm once only when the alarm condition occurs. - </para> - <para>Default: 0 seconds</para> - <note> - <para> - If notifications are also enabled, a notification will - be displayed each time the alarm is executed as well - to notify the user that the alarm condition has - occurred. - </para> - </note> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <guilabel>High alarm command</guilabel> - </term> - <listitem> - <para>The command to be executed at each repeat interval - when the sensor value is equal to or above the upper limit. - </para> - <para>Default: none</para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <guilabel>Low alarm command</guilabel> - </term> - <listitem> - <para>The command to be executed at each repeat interval - when the sensor value is equal to or below the lower limit. - </para> - <para>Default: none</para> - <tip> - <variablelist> - <varlistentry> - <term> - <guilabel>Play a sound when the alarm occurs</guilabel> - </term> - <listitem> - <para>You can play a sound when the alarm occurs - by using the command - <command>esdplay</command> which should be - available as part of the standard GNOME - installation. (Note: If this does not work, - you could also try <command>aplay</command> - which is the default ALSA sound player). - - <!-- Make sure there is no extra whitespace - around these commands as it is a verbose - environment - preserves whitespace and - carriage returns etc --> - - <screen><userinput><command>esdplay /usr/share/sounds/gnibbles/gobble.wav</command></userinput></screen> - - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Pop-up a window to notify that the - alarm has occurred</guilabel> - </term> - <listitem> - <para> - The program <command>zenity</command> can be used to create - dialog boxes to be displayed on the users current - display, and can thus be used to create pop-up - style notifications that the alarm has - occurred. - - <screen><userinput><command>zenity --warning --title="Sensor Alarm" --text="Sensor Alarm occurred"</command></userinput></screen> - - For more information regarding Zenity please - consult the Zenity <ulink type="help" - url="ghelp:zenity">documentation</ulink>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel> - Combine multiple commands into one alarm command - </guilabel> - </term> - <listitem> - <para> - Multiple commands can be executed one after the - other using the "&&" construct to separate - them. To play a sound and pop-up a dialog via - Zenity the follow command can be used: - - <screen><userinput><command>esdplay /usr/share/sounds/gnibbles/gobble.wav && zenity --warning --title="Sensor Alarm" --text="Sensor Alarm occurred"</command></userinput></screen> - - </para> - </listitem> - </varlistentry> - </variablelist> - </tip> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Sensor icon</guilabel> - </term> - <listitem> - <para>Provides a list of available icons to allow the - user to select one to represent this sensor.</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <guilabel>Graph color</guilabel> - </term> - <listitem> - <para>The color to use to display the graph for the - sensor.</para> - <note> - <para>To accurately display graphs both the high - and low values for the sensor need to be set correctly. - </para> - </note> - </listitem> - </varlistentry> - </variablelist> - - </sect2> - </sect1> - <sect1> - <title>Advanced Options</title> - <para>There are a number of advanced options which can be set to - customize the display of sensors within the panel, which are set - using the GConf system.</para> - <variablelist> - <varlistentry> - <term><guilabel>Font Size</guilabel></term> - <listitem> - <para>The font size for labels and values is normally - derived from the standard Application Font size of the GNOME - Desktop, however this can be overridden. This is done by - setting the value of the parameter - - <emphasis>/apps/sensors-applet/font-size</emphasis> - - within the user's GConf database. This can be achieved by - the following command, where the font size is specified as - the last parameter, and in this case is set to - <emphasis>10</emphasis>: - - <!-- CAN"T HAVE ANY LINE BREAKS IN COMMAND --> - <screen><userinput><command>gconftool-2 -s /apps/sensors-applet/font-size -t int 10</command></userinput></screen> - </para> - - <note> - <para>To reset the value so that the default font size is - not overridden, a font size of <emphasis>0</emphasis> - should be set. - </para> - </note> - - </listitem> - </varlistentry> - <varlistentry> - <term><guilabel>Hide Units</guilabel></term> - <listitem> - <para>The units for sensor values can also be hidden if - desired by setting the boolean value - - <emphasis>/apps/sensors-applet/hide-units</emphasis> - - within the user's GConf database. This can be achieved by - the following command, where the value is specified as - either <emphasis>true</emphasis> or - <emphasis>false</emphasis> and is specified as the last - parameter. In this case is the units will be hidden (the - value is set to <emphasis>true</emphasis>): - <!-- CAN"T HAVE ANY LINE BREAKS IN COMMAND --> - <screen><userinput><command>gconftool-2 -s /apps/sensors-applet/hide-units -t bool true</command></userinput></screen> - </para> - </listitem> - </varlistentry> - </variablelist> - <note> - <para>These values can also be set using the <ulink type="help" - url="ghelp:gconf-editor">Configuration Editor</ulink> - application. - </para> - </note> - </sect1> - <!-- ============= Bugs ================================== --> - <!-- This section is optional and is commented out by default. - You can use it to describe known bugs and limitations of the - program if there are any - please be frank and list all - problems you know of. - - <sect1 id="myapplet-bugs"> - <title>Known Bugs and Limitations</title> - <para> </para> - </sect1> - --> - <!-- ============= About ================================== --> - <!-- This section contains info about the program (not docs), such as - author's name(s), web page, license, feedback address. This - section is optional: primary place for this info is "About.." box of - the program. However, if you do wish to include this info in the - manual, this is the place to put it. Alternatively, you can put this - information in the title page.--> - - <sect1 id="myapplet-about"> - <title>About &applet;</title> - <para> - <application>&applet;</application> was written by Alex Murray - (<email>murray.a...@gmail.com</email>). To find more information about - <application>&applet;</application>, please visit the <ulink - url="&project-webpage;" type="http">&applet; Project - Homepage</ulink>. - </para> - <para> To report a bug or make a suggestion regarding &applet; or this - manual, follow the directions at the - <ulink url="&project-webpage;" - type="http">project homepage</ulink>. </para> - - <!-- For translations: uncomment this: - - <para> - Latin translation was done by ME - (<email>MYNAME@MYADDRESS</email>). Please send all comments and - suggestions regarding this translation to SOMEWHERE. - </para> - - --> - - <para> - This program is distributed 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. A copy of this license can be found at this <ulink - type="help" url="ghelp:gpl">link</ulink>, or in the file COPYING - included with the source code of this program. - </para> - </sect1> - -</article> -<!-- OVERRIDE DICTIONARY SETTING SO THAT USE AMERICAN ENGLISH STYLE - --> -<!-- FROM GNOME HIG --> -<!-- Local IspellDict: english --> -<!-- LocalWords: hddtemp filesystem proc lm README Inspiron windtunnel --> -<!-- LocalWords: ibm ACPI sysfs PowerPC adt Omnibook NVIDIA --> -<!-- LocalWords: libNVCtrl libsensors nvidia esdplay aplay ALSA zenity --> -<!-- LocalWords: acpi iMac Windfarm nvidia gconftool GConf bool --> diff -Nru sensors-applet-3.0.0+git5/help/Makefile.am sensors-applet-3.0.0+git6/help/Makefile.am --- sensors-applet-3.0.0+git5/help/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/help/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,8 +1,12 @@ -include $(top_srcdir)/gnome-doc-utils.make -dist-hook: doc-dist-hook +@YELP_HELP_RULES@ -DOC_MODULE = sensors-applet -DOC_ENTITIES = legal.xml -DOC_FIGURES = figures/applet_in_panel.png -DOC_INCLUDES = -DOC_LINGUAS = +HELP_ID = sensors-applet + +HELP_FILES = \ + index.docbook \ + legal.xml + +HELP_MEDIA = figures/applet_in_panel.png +HELP_LINGUAS = + +-include $(top_srcdir)/git.mk diff -Nru sensors-applet-3.0.0+git5/lib/Makefile.am sensors-applet-3.0.0+git6/lib/Makefile.am --- sensors-applet-3.0.0+git5/lib/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/lib/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +AM_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ @@ -16,4 +16,4 @@ lib_LTLIBRARIES = libsensors-applet-plugin.la libsensors_applet_plugin_la_SOURCES = sensors-applet-plugin.c -libsensors_applet_plugin_la_LDFLAGS = -export-dynamic \ Kein Zeilenumbruch am Dateiende. +libsensors_applet_plugin_la_LDFLAGS = -export-dynamic diff -Nru sensors-applet-3.0.0+git5/Makefile.am sensors-applet-3.0.0+git6/Makefile.am --- sensors-applet-3.0.0+git5/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,12 +1,16 @@ +ACLOCAL_AMFLAGS=-I m4 + SUBDIRS = sensors-applet lib plugins pixmaps po help appletdir = $(LIBPANEL_APPLET_DIR) applet_in_files = org.gnome.applets.SensorsApplet.panel-applet.in applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet) +APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libsensors-applet.so + $(applet_in_files): $(applet_in_files).in Makefile $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ $< > $@ @@ -17,25 +21,14 @@ %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache -servicedir = $(datadir)/dbus-1/services -service_in_files = org.gnome.panel.applet.SensorsAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.gnome.panel.applet.SensorsAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ - -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(schemas_DATA) +CLEANFILES = $(applet_DATA) $(applet_DATA).in $(schemas_DATA) EXTRA_DIST = $(ui_DATA) \ $(applet_in_files:.panel-applet.in=.panel-applet.in.in) \ $(service_in_files) \ - intltool-merge.in intltool-extract.in intltool-update.in \ - gnome-doc-utils.make + intltool-merge.in intltool-extract.in intltool-update.in -DISTCLEANFILES = gnome-doc-utils.make \ - intltool-extract \ +DISTCLEANFILES = intltool-extract \ intltool-merge \ intltool-update diff -Nru sensors-applet-3.0.0+git5/org.gnome.applets.SensorsApplet.panel-applet.in.in sensors-applet-3.0.0+git6/org.gnome.applets.SensorsApplet.panel-applet.in.in --- sensors-applet-3.0.0+git5/org.gnome.applets.SensorsApplet.panel-applet.in.in 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/org.gnome.applets.SensorsApplet.panel-applet.in.in 2016-08-12 11:46:11.000000000 +0300 @@ -1,6 +1,7 @@ [Applet Factory] Id=SensorsAppletFactory -Location=@LIBEXECDIR@/sensors-applet +Location=@APPLET_LOCATION@ +InProcess=true _Name=Sensors Applet Factory _Description=Sensors Applet Factory diff -Nru sensors-applet-3.0.0+git5/org.gnome.panel.applet.SensorsAppletFactory.service.in sensors-applet-3.0.0+git6/org.gnome.panel.applet.SensorsAppletFactory.service.in --- sensors-applet-3.0.0+git5/org.gnome.panel.applet.SensorsAppletFactory.service.in 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/org.gnome.panel.applet.SensorsAppletFactory.service.in 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.gnome.panel.applet.SensorsAppletFactory -Exec=@LIBEXECDIR@/sensors-applet diff -Nru sensors-applet-3.0.0+git5/plugins/acpi/Makefile.am sensors-applet-3.0.0+git6/plugins/acpi/Makefile.am --- sensors-applet-3.0.0+git5/plugins/acpi/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/acpi/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # ACPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libacpi_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/aticonfig/Makefile.am sensors-applet-3.0.0+git6/plugins/aticonfig/Makefile.am --- sensors-applet-3.0.0+git5/plugins/aticonfig/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/aticonfig/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # ATICONFIG plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libaticonfig_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/eee/Makefile.am sensors-applet-3.0.0+git6/plugins/eee/Makefile.am --- sensors-applet-3.0.0+git5/plugins/eee/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/eee/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # ACPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libeee_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/hddtemp/hddtemp-plugin.c sensors-applet-3.0.0+git6/plugins/hddtemp/hddtemp-plugin.c --- sensors-applet-3.0.0+git5/plugins/hddtemp/hddtemp-plugin.c 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/hddtemp/hddtemp-plugin.c 2016-08-12 11:46:11.000000000 +0300 @@ -150,9 +150,9 @@ pv = output_vector = g_strsplit(hddtemp_output, "|", -1); while(pv[1] != NULL) { - if (strcmp(pv[2], "") != 0 && - strcmp(pv[3], "") != 0 && - strcmp(pv[4], "") != 0 && + if (g_strcmp0(pv[2], "") != 0 && + g_strcmp0(pv[3], "") != 0 && + g_strcmp0(pv[4], "") != 0 && (!(g_ascii_strcasecmp(pv[2], "???") == 0 || g_ascii_strcasecmp(pv[3], "ERR") == 0 || g_ascii_strcasecmp(pv[4], "*") == 0))) { diff -Nru sensors-applet-3.0.0+git5/plugins/hddtemp/Makefile.am sensors-applet-3.0.0+git6/plugins/hddtemp/Makefile.am --- sensors-applet-3.0.0+git5/plugins/hddtemp/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/hddtemp/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # HDDTEMP plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libhddtemp_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/i2c-proc/Makefile.am sensors-applet-3.0.0+git6/plugins/i2c-proc/Makefile.am --- sensors-applet-3.0.0+git5/plugins/i2c-proc/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/i2c-proc/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # I2C-PROC plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libi2c_proc_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/i2c-sys/Makefile.am sensors-applet-3.0.0+git6/plugins/i2c-sys/Makefile.am --- sensors-applet-3.0.0+git5/plugins/i2c-sys/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/i2c-sys/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # I2C-SYS plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libi2c_sys_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/i8k/Makefile.am sensors-applet-3.0.0+git6/plugins/i8k/Makefile.am --- sensors-applet-3.0.0+git5/plugins/i8k/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/i8k/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # I8K plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libi8k_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/ibm-acpi/Makefile.am sensors-applet-3.0.0+git6/plugins/ibm-acpi/Makefile.am --- sensors-applet-3.0.0+git5/plugins/ibm-acpi/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/ibm-acpi/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # IBM-ACPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libibm_acpi_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/libsensors/Makefile.am sensors-applet-3.0.0+git6/plugins/libsensors/Makefile.am --- sensors-applet-3.0.0+git5/plugins/libsensors/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/libsensors/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ plugindir = $(libdir)/sensors-applet/plugins # libsensors plugin -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +liblibsensors_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/mbmon/Makefile.am sensors-applet-3.0.0+git6/plugins/mbmon/Makefile.am --- sensors-applet-3.0.0+git5/plugins/mbmon/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/mbmon/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # MBMON plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libmbmon_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/nvidia/Makefile.am sensors-applet-3.0.0+git6/plugins/nvidia/Makefile.am --- sensors-applet-3.0.0+git5/plugins/nvidia/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/nvidia/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # NVIDIA plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libnvidia_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/omnibook/Makefile.am sensors-applet-3.0.0+git6/plugins/omnibook/Makefile.am --- sensors-applet-3.0.0+git5/plugins/omnibook/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/omnibook/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # OMNIBOOK plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libomnibook_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/pmu-sys/Makefile.am sensors-applet-3.0.0+git6/plugins/pmu-sys/Makefile.am --- sensors-applet-3.0.0+git5/plugins/pmu-sys/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/pmu-sys/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # PMU-SYS plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libpmu_sys_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/smu-sys/Makefile.am sensors-applet-3.0.0+git6/plugins/smu-sys/Makefile.am --- sensors-applet-3.0.0+git5/plugins/smu-sys/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/smu-sys/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # SMU-SYS plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libsmu_sys_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/sonypi/Makefile.am sensors-applet-3.0.0+git6/plugins/sonypi/Makefile.am --- sensors-applet-3.0.0+git5/plugins/sonypi/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/sonypi/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # SONYPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libsonypi_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/plugins/udisks/Makefile.am sensors-applet-3.0.0+git6/plugins/udisks/Makefile.am --- sensors-applet-3.0.0+git5/plugins/udisks/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/plugins/udisks/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,7 +1,7 @@ # UDisks plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +libudisks_la_CPPFLAGS = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff -Nru sensors-applet-3.0.0+git5/sensors-applet/main.c sensors-applet-3.0.0+git6/sensors-applet/main.c --- sensors-applet-3.0.0+git5/sensors-applet/main.c 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/sensors-applet/main.c 2016-08-12 11:46:11.000000000 +0300 @@ -39,7 +39,7 @@ return retval; } -PANEL_APPLET_OUT_PROCESS_FACTORY ("SensorsAppletFactory", +PANEL_APPLET_IN_PROCESS_FACTORY ("SensorsAppletFactory", PANEL_TYPE_APPLET, sensors_applet_fill, NULL); diff -Nru sensors-applet-3.0.0+git5/sensors-applet/Makefile.am sensors-applet-3.0.0+git6/sensors-applet/Makefile.am --- sensors-applet-3.0.0+git5/sensors-applet/Makefile.am 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/sensors-applet/Makefile.am 2016-08-12 11:46:11.000000000 +0300 @@ -1,18 +1,26 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ + +sensors_applet_libdir=${pkglibdir}/${LIBPANEL_APPLET_API_VERSION} +sensors_applet_lib_LTLIBRARIES=libsensors-applet.la + +libsensors_applet_la_CPPFLAGS = \ + -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)/sensors-applet"\" \ -DLIBDIR=\""$(libdir)"\" \ -DUIDIR=\""$(pkgdatadir)/ui"\" \ -DSENSORS_APPLET_PLUGIN_DIR=\""$(libdir)/$(PACKAGE)/plugins/"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DPREFIX=\""$(prefix)"\" \ - -I$(top_srcdir) \ - $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(CAIRO_CFLAGS) $(LIBNOTIFY_CFLAGS) + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DPREFIX=\""$(prefix)"\" \ + -I$(top_srcdir) - -LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS) -ldl +libsensors_applet_la_CFLAGS = \ + $(GLIB_CFLAGS) \ + $(GTK_CFLAGS) \ + $(GNOME_CFLAGS) \ + $(CAIRO_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) if LIBNOTIFY libnotify_SRC = active-sensor-libnotify.c \ @@ -21,8 +29,7 @@ libnotify_SRC = endif -libexec_PROGRAMS = sensors-applet -sensors_applet_SOURCES = main.c \ +libsensors_applet_la_SOURCES = main.c \ about-dialog.c \ about-dialog.h \ active-sensor.c \ @@ -38,7 +45,14 @@ sensors-applet-plugins.h \ sensors-applet-conf.c \ sensors-applet-conf.h \ - $(libnotify_SRC) + $(libnotify_SRC) + +libsensors_applet_la_LIBADD = \ + $(GLIB_LIBS) \ + $(GTK_LIBS) \ + $(GNOME_LIBS) \ + $(CAIRO_LIBS) \ + $(LIBNOTIFY_LIBS) -ldl # install headers for plugins to use INST_H_FILES = sensors-applet-plugin.h sensors-applet-sensor.h diff -Nru sensors-applet-3.0.0+git5/sensors-applet/org.gnome.sensors-applet.gschema.xml.in.in sensors-applet-3.0.0+git6/sensors-applet/org.gnome.sensors-applet.gschema.xml.in.in --- sensors-applet-3.0.0+git5/sensors-applet/org.gnome.sensors-applet.gschema.xml.in.in 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/sensors-applet/org.gnome.sensors-applet.gschema.xml.in.in 2016-08-12 11:46:11.000000000 +0300 @@ -55,6 +55,76 @@ <summary></summary> <description></description> </key> + <key name="i8k" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="nvidia" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="pmu-sys" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="sonypi" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="udisks" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="eee" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="aticonfig" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="acpi" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="i2c-sys" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="ibm-acpi" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="omnibook" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="mbmon" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="smu-sys" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> + <key name="i2c-proc" type="b"> + <default>false</default> + <summary></summary> + <description></description> + </key> <key name="sensors-applet-version" type="s"> <default>""</default> <summary>Version of the configuration</summary> diff -Nru sensors-applet-3.0.0+git5/sensors-applet/prefs-dialog.c sensors-applet-3.0.0+git6/sensors-applet/prefs-dialog.c --- sensors-applet-3.0.0+git5/sensors-applet/prefs-dialog.c 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/sensors-applet/prefs-dialog.c 2016-08-12 11:46:11.000000000 +0300 @@ -67,7 +67,7 @@ case GTK_RESPONSE_HELP: g_debug("loading help in prefs"); current_page = gtk_notebook_get_current_page(sensors_applet->prefs_dialog->notebook); - uri = g_strdup_printf("ghelp:sensors-applet?%s", + uri = g_strdup_printf("help:sensors-applet?%s", ((current_page == 0) ? "sensors-applet-general-options" : ((current_page == 1) ? diff -Nru sensors-applet-3.0.0+git5/sensors-applet/sensor-config-dialog.c sensors-applet-3.0.0+git6/sensors-applet/sensor-config-dialog.c --- sensors-applet-3.0.0+git5/sensors-applet/sensor-config-dialog.c 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/sensors-applet/sensor-config-dialog.c 2016-08-12 11:46:11.000000000 +0300 @@ -74,7 +74,7 @@ case GTK_RESPONSE_HELP: g_debug("loading help in config dialog"); gtk_show_uri(NULL, - "ghelp:sensors-applet?sensors-applet-sensors", + "help:sensors-applet?sensors-applet-sensors", gtk_get_current_event_time(), &error); diff -Nru sensors-applet-3.0.0+git5/sensors-applet/sensors-applet.c sensors-applet-3.0.0+git6/sensors-applet/sensors-applet.c --- sensors-applet-3.0.0+git5/sensors-applet/sensors-applet.c 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/sensors-applet/sensors-applet.c 2016-08-12 11:46:11.000000000 +0300 @@ -80,7 +80,7 @@ gpointer data) { GError *error = NULL; - gtk_show_uri(NULL, "ghelp:sensors-applet", + gtk_show_uri(NULL, "help:sensors-applet", gtk_get_current_event_time(), &error); @@ -1361,7 +1361,7 @@ void sensors_applet_init(SensorsApplet *sensors_applet) { - GActionGroup *action_group; + GSimpleActionGroup *action_group; gchar *ui_path; g_assert(sensors_applet); @@ -1369,10 +1369,6 @@ sensors_applet->settings = panel_applet_settings_new (sensors_applet->applet, SENSORS_APPLET_SCHEMA); - /* Have our background automatically painted. */ - panel_applet_set_background_widget(PANEL_APPLET(sensors_applet->applet), - GTK_WIDGET(sensors_applet->applet)); - /* plugin functions are stored as name -> get_value_function pairs so * use standard string functions on hash table */ sensors_applet->plugins = g_hash_table_new(g_str_hash, g_str_equal); diff -Nru sensors-applet-3.0.0+git5/sensors-applet/sensors-applet-conf.h sensors-applet-3.0.0+git6/sensors-applet/sensors-applet-conf.h --- sensors-applet-3.0.0+git5/sensors-applet/sensors-applet-conf.h 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/sensors-applet/sensors-applet-conf.h 2016-08-12 11:46:11.000000000 +0300 @@ -85,8 +85,8 @@ * config * data */ -gboolean sensors_applet_gconf_save_sensors(SensorsApplet *sensors_applet); -gboolean sensors_applet_gconf_setup_sensors(SensorsApplet *sensors_applet); +gboolean sensors_applet_conf_save_sensors(SensorsApplet *sensors_applet); +gboolean sensors_applet_conf_setup_sensors(SensorsApplet *sensors_applet); void sensors_applet_conf_setup(SensorsApplet *sensors_applet); #endif /* SENSORS_APPLET_GCONF_H*/ diff -Nru sensors-applet-3.0.0+git5/sensors-applet/sensors-applet.h sensors-applet-3.0.0+git6/sensors-applet/sensors-applet.h --- sensors-applet-3.0.0+git5/sensors-applet/sensors-applet.h 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/sensors-applet/sensors-applet.h 2016-08-12 11:46:11.000000000 +0300 @@ -165,6 +165,24 @@ void sensors_applet_update_sensor(SensorsApplet *sensors_applet, GtkTreePath *path); +gboolean sensors_applet_add_sensor(SensorsApplet *sensors_applet, + const gchar *path, + const gchar *id, + const gchar *label, + const gchar *interface, + SensorType type, + gboolean enable, + gdouble low_value, + gdouble high_value, + gboolean alarm_enable, + const gchar *low_alarm_command, + const gchar *high_alarm_command, + gint alarm_timeout, + gdouble multiplier, + gdouble offset, + IconType icon_type, + const gchar *graph_color); + void sensors_applet_display_layout_changed(SensorsApplet *sensors_applet); void sensors_applet_reorder_sensors(SensorsApplet *sensors_applet); gdouble sensors_applet_convert_temperature(gdouble value, diff -Nru sensors-applet-3.0.0+git5/sensors-applet/sensors-applet-plugins.c sensors-applet-3.0.0+git6/sensors-applet/sensors-applet-plugins.c --- sensors-applet-3.0.0+git5/sensors-applet/sensors-applet-plugins.c 2015-06-18 01:13:32.000000000 +0300 +++ sensors-applet-3.0.0+git6/sensors-applet/sensors-applet-plugins.c 2016-08-12 11:46:11.000000000 +0300 @@ -24,6 +24,7 @@ #include <dlfcn.h> #endif /* HAVE_DLFCN_H */ +#include "sensors-applet.h" #include "sensors-applet-plugins.h" #include "sensors-applet-sensor.h"
diff -Nru sensors-applet-3.0.0+git5/debian/changelog sensors-applet-3.0.0+git6/debian/changelog --- sensors-applet-3.0.0+git5/debian/changelog 2015-06-24 20:39:56.000000000 +0300 +++ sensors-applet-3.0.0+git6/debian/changelog 2016-10-22 22:52:08.776499447 +0300 @@ -1,3 +1,15 @@ +sensors-applet (3.0.0+git6-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * New snapshot from upstream Git repository. + - Ported to new documentation system (closes: #803059). + - Applet ported to in-process for compatibility with libpanel-applet2. + * Build-depend on yelp-tools. + * Bump libgtk-3-dev build-dependency to 3.4.0, following configure.ac. + * Update debian/sensors-applet.install for the in-process switch. + + -- Dmitry Shachnev <mity...@debian.org> Sat, 22 Oct 2016 22:52:06 +0300 + sensors-applet (3.0.0+git5-0.1) unstable; urgency=medium * Non-maintainer upload, with maintainer's permission. diff -Nru sensors-applet-3.0.0+git5/debian/control sensors-applet-3.0.0+git6/debian/control --- sensors-applet-3.0.0+git5/debian/control 2015-06-24 20:39:05.000000000 +0300 +++ sensors-applet-3.0.0+git6/debian/control 2016-10-22 15:36:43.000000000 +0300 @@ -14,14 +14,15 @@ libcairo2-dev (>= 1.0.4), libdbus-glib-1-dev (>= 0.80), libglib2.0-dev (>= 2.22.0), - libgtk-3-dev (>= 3.0.0), + libgtk-3-dev (>= 3.4.0), libnotify-dev (>= 0.7.0), libpanel-applet-dev (>= 3.0.0), libsensors4-dev, libx11-dev, libtool, scrollkeeper, - xsltproc + xsltproc, + yelp-tools Standards-Version: 3.7.3 Homepage: http://sensors-applet.sourceforge.net/ diff -Nru sensors-applet-3.0.0+git5/debian/patches/enable-deprecated.patch sensors-applet-3.0.0+git6/debian/patches/enable-deprecated.patch --- sensors-applet-3.0.0+git5/debian/patches/enable-deprecated.patch 2014-03-17 23:36:51.000000000 +0400 +++ sensors-applet-3.0.0+git6/debian/patches/enable-deprecated.patch 2016-10-22 15:34:35.000000000 +0300 @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -28,7 +28,6 @@ +@@ -29,7 +29,6 @@ AC_PROG_INTLTOOL # ========== export compiler / linker options ======== # diff -Nru sensors-applet-3.0.0+git5/debian/sensors-applet.install sensors-applet-3.0.0+git6/debian/sensors-applet.install --- sensors-applet-3.0.0+git5/debian/sensors-applet.install 2013-06-22 22:57:17.000000000 +0400 +++ sensors-applet-3.0.0+git6/debian/sensors-applet.install 2016-10-22 15:36:43.000000000 +0300 @@ -1,3 +1,4 @@ -usr/lib/*/sensors-applet/sensors-applet +usr/lib/*/sensors-applet/libsensors-applet.so +usr/lib/*/sensors-applet/libsensors-applet.so.0.0.0 usr/lib/*/sensors-applet/plugins/*.so usr/share
signature.asc
Description: PGP signature
