Bug#681578: i8kutils: Corrected global configuration filename '/etc/i8kmon.conf'
Package: i8kutils
Followup-For: Bug #681578
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch
Dear Maintainer,
this release correct the global configuration filename ('/etc/i8kmon.conf') in the i8kmon manpage and in the i8kmon.conf example file itself. And also correct some lintian warnings. The actions are below in the changelog.
*** /tmp/tmpMiE5HK/bug_body
In Ubuntu, the attached patch was applied to achieve the following:
* Correct global configuration filename to '/etc/i8kmon.conf'. LP: #799144.
- Correct i8kmon.1 and i8kmon.conf.
* Correct lintian warnings.
- Update Standards-Version to 3.9.3
- Upgrade compat version to 8 and debhelper Build-Depends.
* QA (group) upload.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.5.0-30-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/changelog'
=== modified file 'debian/compat'
--- debian/compat 2009-04-10 19:08:53 +0000
+++ debian/compat 2013-05-18 18:21:25 +0000
@@ -1 +1 @@
-7
+8
=== modified file 'debian/control'
--- debian/control 2009-09-27 14:05:19 +0000
+++ debian/control 2013-05-18 18:21:20 +0000
@@ -2,12 +2,12 @@
Section: utils
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 8)
+Standards-Version: 3.9.3
Package: i8kutils
Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64
-Depends: ${shlibs:Depends}, tk8.4 | wish
+Depends: ${shlibs:Depends}, tk8.4 | wish, ${misc:Depends}
Conflicts: i8kfan
Replaces: i8kfan
Description: utilities for Dell Inspiron and Latitude laptops
=== modified file 'debian/i8kutils.i8kbuttons.init'
--- debian/i8kutils.i8kbuttons.init 2009-05-26 15:42:43 +0000
+++ debian/i8kutils.i8kbuttons.init 2013-05-18 18:20:43 +0000
@@ -2,8 +2,8 @@
#
### BEGIN INIT INFO
# Provides: i8kbuttons
-# Required-Start:
-# Required-Stop:
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
# Should-Start: $local_fs
# Should-Stop: $local_fs
# Default-Start: 2 3 4 5
=== modified file 'debian/i8kutils.i8kmon.init'
--- debian/i8kutils.i8kmon.init 2009-04-10 19:08:53 +0000
+++ debian/i8kutils.i8kmon.init 2013-05-18 18:20:31 +0000
@@ -2,8 +2,8 @@
### BEGIN INIT INFO
# Provides: i8kmon
-# Required-Start:
-# Required-Stop:
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
# Should-Start: $local_fs
# Should-Stop: $local_fs
# Default-Start: 2 3 4 5
=== modified file 'debian/rules'
--- debian/rules 2009-04-10 19:08:53 +0000
+++ debian/rules 2013-05-18 18:12:14 +0000
@@ -8,7 +8,9 @@
CFLAGS += -O2
endif
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
build-stamp:
dh_testdir
$(MAKE)
=== modified file 'i8kmon.1'
--- i8kmon.1 2009-04-10 19:08:53 +0000
+++ i8kmon.1 2013-05-18 12:22:04 +0000
@@ -1,18 +1,18 @@
.TH i8kmon 1 "17 June 2005" "Massimo Dal Zotto" Utilities
.SH "NAME"
-.LP
+.LP
I8kmon \- Monitor the cpu temperature and fan status on Dell
Inspiron laptops
.SH "SYNTAX"
-.LP
+.LP
i8kmon [\fI<options>\fP]
.SH "DESCRIPTION"
-.LP
+.LP
The i8kmon daemon can be used to monitor the cpu temperature
-and fan status on Dell Inspiron laptops.
+and fan status on Dell Inspiron laptops.
The program can be run in background as daemon or under X as
an applet which can be swallowed in the gnome panel.
-.LP
+.LP
By default the program monitors the cpu temperature but doesn't
do any automatic controls of the fan status accordingly to
user\-defined temperature thresholds because this may not be
@@ -23,11 +23,11 @@
The automatic fan control can also be turned on in the
control popup menu which is invoked by clicking with
the left mouse button on the temperature label.
-The control menu has three items: Auto, which controls the
+The control menu has three items: Auto, which controls the
automatic fan control, Verbose, which prints status on stdout,
and Suspend, which closes the /proc/i8kfan file and suspends
the daemon to allow unloading the kernel module.
-.LP
+.LP
The user interface reports the current cpu temperature in
the top box and in the two lower buttons the status of the
fans. On systems wiht only one fan the interface shows only
@@ -37,7 +37,7 @@
minimum expected speed and is probably stuck.
In this case proding it with a bent paper clip can often
cause it to become unstuck.
-.LP
+.LP
The fan buttons can also be used to manually control the
fan speeds.
Clicking on a fan button with the left mouse button will
@@ -48,41 +48,41 @@
own idea of what the fan speed should be and can sometimes
try to override the manual settings.
.SH "OPTIONS"
-.LP
+.LP
The program accepts the following command\-line options:
-.LP
-.TP
+.LP
+.TP
\fB\-a\fR, \fB\-\-auto\fR
Monitor cpu temperature and fan status and control
automatically the fans.
-.TP
+.TP
\fB\-na\fR, \fB\-\-noauto\fR
Monitor cpu temperature and fan status but don't control
automatically the fans. This is the default setting.
-.TP
+.TP
\fB\-d\fR, \fB\-\-daemon\fR
Run the program in daemon mode, i.e. without the user
interface.
-.TP
+.TP
\fB\-nd\fR, \fB\-\-nodaemon\fR
Don't run the program in daemon mode, i.e. open the user
interface. This is the default setting.
-.TP
+.TP
\fB\-nc\fR, \fB\-\-nouserconfig\fR
-Don't attempt to source the ~/.i8kmon configfile, only /etc/i8kmon.
-.TP
+Don't attempt to source the ~/.i8kmon configfile, only /etc/i8kmon.conf.
+.TP
\fB\-v\fR, \fB\-\-verbose\fR
Report hardware status and program actions on stdout.
-.TP
+.TP
\fB\-g\fR, \fB\-\-geometry\fR <\fIgeometry\fP>
Specifies the geometry of the applet window. Geometry should
be 24x24, 36x36 or 48x48 to fit the size of the gnome panel.
-.TP
+.TP
\fB\-t\fR, \fB\-\-timeout\fR <\fIseconds\fP>
Specifies the interval at which the daemon checks the
hardware status. Useful values are in the range of 1\-5
seconds. Default is 2 seconds.
-.TP
+.TP
\fB\-u\fR, \fB\-\-unit\fR C|F
Specifies the temperature display unit. Default is C (Celsius).
This option affects only the value shown in the applet. All other
@@ -95,7 +95,7 @@
The daemon defines 4 states with different fan speeds ({0 0}, {1 0}, {1 1},
{2 2}) and for each state are defined the temperature thresholds which cause
the switching to a higher or lower state. Furthermore each state can have
-different thresholds for operation on ac power or battery.
+different thresholds for operation on ac power or battery.
For example the following configuration:
.IP
set config(0) {{0 0} -1 60 -1 65}
@@ -110,7 +110,7 @@
battery) and low threshold -1, which is actually never reached since 0 is the
lowest state. When the high threshold is reached the program switches to state
1 (left low, right off) which has a high threshold of 70 degrees and a low
-threshold of 50 degrees. If the temperature drops below 50 the program will
+threshold of 50 degrees. If the temperature drops below 50 the program will
switch back to state 0, if it rises above 70 it will enter state 2, and so on.
For better operation the temperature ranges should be overlapping with an
hysteresis of at least 10 degrees, i.e. 1={50 70},2={60 80} is better than
@@ -121,7 +121,7 @@
speed of the missing fan, for example:
.IP
set config(2) {{1 -} 60 80 65 85}
-.LP
+.LP
This program can be used by normal users as Gnome panel applet or started as
daemon by an init script. Under Debian GNU/Linux it is possible to start the
daemon automatically by creating an /etc/default/i8kmon configfile containing
@@ -129,26 +129,26 @@
is not installed by the i8kutils package because the program is designed
to be run by normal users. If you want to use it as daemon you must create
the config file yourself. In this case, the \fB\-\-nouserconfig\fR option
-can sometimes also help by limiting it to sourcing /etc/i8kmon (and not
+can sometimes also help by limiting it to sourcing /etc/i8kmon.conf (and not
~/.i8kmon).
.SH "FILES"
-.LP
+.LP
\fI/proc/i8k\fP
-.br
+.br
\fI/etc/default/i8kmon\fP
-.br
+.br
\fI/$HOME/.i8kmon\fP
.SH "AUTHORS"
-.LP
+.LP
Massimo Dal Zotto <dz@debian.org>
.SH "COPYRIGHT"
-.LP
+.LP
i8kmon and all the i8kutils programs , scripts and other files are
distributed under the GNU General Public License (GPL).
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
.SH "BUGS"
-.LP
+.LP
On some Linux distributions i8kmon exits with an error like this:
.IP
can't find package Tk
@@ -164,5 +164,5 @@
wish /usr/bin/i8kmon -- [options...]
.LP
.SH "SEE ALSO"
-.LP
+.LP
i8kctl(1), i8kbuttons(1)
=== modified file 'i8kmon.conf'
--- i8kmon.conf 2005-06-17 11:26:26 +0000
+++ i8kmon.conf 2013-05-18 12:22:17 +0000
@@ -1,4 +1,4 @@
-# Sample i8kmon configuration file (/etc/i8kmon, ~/.i8kmon).
+# Sample i8kmon configuration file (/etc/i8kmon.conf, ~/.i8kmon).
# Kernel I8K status file
set config(proc_i8k) /proc/i8k
Reply to: