[Pkg-wmaker-commits] [wmgtemp] 04/45: Imported Debian patch 0.6-3
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 25 02:58:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmgtemp.
commit 4aed94d84d22288811004ce1c4e6e8575b49a19f
Merge: edd0653 84b6109
Author: Lenart Janos <ocsi at debian.org>
Date: Sun Mar 21 12:57:14 2004 +0100
Imported Debian patch 0.6-3
Artistic | 0
BUGS | 0
CREDITS | 3 +-
INSTALL | 0
Makefile | 0
README | 13 +--
TODO | 0
debian/README.Debian | 8 +-
debian/changelog | 51 +++++++++
debian/control | 19 ++--
debian/copyright | 4 +-
debian/local/wmgtemp.1 | 231 -----------------------------------------
debian/menu | 2 +-
debian/rules | 4 +-
examples/wmgtemprc | 0
src/.deps | 2 +-
src/Makefile | 4 +-
src/wmgeneral/list.c | 0
src/wmgeneral/list.h | 0
src/wmgeneral/misc.c | 0
src/wmgeneral/misc.h | 0
src/wmgeneral/wmgeneral.c | 0
src/wmgeneral/wmgeneral.h | 0
src/wmgtemp-interface-mask.xbm | 0
src/wmgtemp-interface.xpm | 0
src/wmgtemp.c | 194 +++++++++++++++-------------------
wmgtemp.1 | 4 +-
27 files changed, 165 insertions(+), 374 deletions(-)
diff --cc Makefile
index 7a08b0a,02f77fb..7a08b0a
mode 100644,100755..100755
--- a/Makefile
+++ b/Makefile
diff --cc debian/README.Debian
index e513402,0000000..4b819da
mode 100644,000000..100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -1,7 -1,0 +1,9 @@@
+wmgtemp for Debian
+------------------
+
- Currently it works for (some) i386 only, if you tested it with other
- architecture(s), and it worked, please notify me.
++WARNING: it is tested to work only with (some) i386 only. Although it's
++Arch: any, there is no *ANY* guarantee that it will not toast your box.
+
- -- Lenart Janos <ocsi at debian.org>, Fri, 23 Feb 2001 00:29:54 +0100
++If it's worked for your (non-i386) architecture, please notify me.
++
++ -- Lenart Janos <ocsi at debian.org>, Sun, 21 Mar 2004 13:02:51 +0100
diff --cc debian/changelog
index f9d6dda,0000000..e8af597
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,68 -1,0 +1,119 @@@
++wmgtemp (0.6-3) unstable; urgency=high
++
++ * Linking to libsensors3. (closes: Bug#237348)
++ * Changed Arch: to any. Dep: will do it (I hope). (closes: Bug#238252)
++
++ -- Lenart Janos <ocsi at debian.org> Sun, 21 Mar 2004 12:57:14 +0100
++
++wmgtemp (0.6-2) unstable; urgency=medium
++
++ * lm-sensors moved to Depends: in order to be sure /etc/sensors.conf
++ exists, closes: #201762
++ * Rebuild should have fixed the wacky Depends: on libsensors-1debian1,
++ closes: #211081
++ * Lot's of thank to Joy for his great work on wmgtemp while I am away.
++ closes: #191538, #197022, #185512, #185513, #185514.
++
++ -- Lenart Janos <ocsi at debian.org> Fri, 26 Dec 2003 12:05:27 +0100
++
++wmgtemp (0.6-1.2) unstable; urgency=high
++
++ * Non-maintainer upload, to recompile against proper libsensors-dev
++ and eliminate obsoleted libsensors1 dependency, closes: #197022.
++
++ -- Josip Rodin <joy-packages at debian.org> Fri, 27 Jun 2003 19:00:47 +0200
++
++wmgtemp (0.6-1.1) unstable; urgency=low
++
++ * Non-maintainer upload, approved by the maintainer.
++ * Recompiled against the new libsensors-dev, plus a little patch
++ to remove a multi-line string in printf which doesn't work with
++ new GCC, closes: #191538.
++ * Updated upstream URL, closes: #185514.
++ * Removed the duplication in the manual page and (after cross-checking)
++ merged it into the upstream file, closes: #185513.
++ * Remove mention of chips from the description since that code was
++ removed, it's now generic.
++ * Use temp1 for system and temp2 for processor temperature with via686a,
++ like the old version did, closes: #185512.
++ I've got an Abit KG7, the author has Abit KT7 -- these two boards should
++ have the same south bridge (VIA 686B), so if the settings really differ,
++ then the whole idea of guessing which sensor is which seems rather
++ pointless :(
++
++ -- Josip Rodin <joy-packages at debian.org> Tue, 10 Jun 2003 14:46:15 +0200
++
++wmgtemp (0.6-1) unstable; urgency=low
++
++ * New upstream release. (closes: Bug#169498)
++
++ -- Lenart Janos <ocsi at debian.org> Tue, 11 Mar 2003 21:36:57 +0100
++
+wmgtemp (0.5-4) unstable; urgency=low
+
+ * Typo fixed in the description. (closes: Bug#125492)
+ * Upgraded Standards-Version.
+
+ -- Lenart Janos <ocsi at debian.org> Sat, 22 Dec 2001 16:25:10 +0100
+
+wmgtemp (0.5-3) unstable; urgency=low
+
+ * Added Build-Depends: xlibs-dev. (closes: Bug#123153)
+
+ -- Lenart Janos <ocsi at debian.org> Mon, 10 Dec 2001 22:08:12 +0100
+
+wmgtemp (0.5-2) unstable; urgency=low
+
+ * Fixed menu by Josip Rodin <joy at debian.org>. (closes: Bug#119945)
+ * Emacs-thingy removed from this changelog.
+
+ -- Lenart Janos <ocsi at debian.org> Sat, 17 Nov 2001 13:04:58 +0100
+
+wmgtemp (0.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Lenart Janos <ocsi at debian.org> Tue, 12 Jun 2001 21:08:31 +0200
+
+wmgtemp (0.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added suggestion against i2c-source.
+ * Added example.
+ * Changed description.
+
+ -- Lenart Janos <ocsi at debian.org> Tue, 17 Apr 2001 21:17:39 +0200
+
+wmgtemp (0.3-3) unstable; urgency=low
+
+ * Upgraded Standards-Version.
+ * Converted to use debhelper v3.
+
+ -- Lenart Janos <ocsi at debian.org> Sat, 31 Mar 2001 18:45:23 +0200
+
+wmgtemp (0.3-2) unstable; urgency=low
+
+ * Added manpage, currently in the diff only. (closes: Bug#88697)
+ * Removed dh_testversion from debian/rules.
+
+ -- Lenart Janos <ocsi at debian.org> Wed, 28 Mar 2001 21:11:00 +0200
+
+wmgtemp (0.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Makefile's patch removed from diff since it's now included in the
+ upstream.
+
+ -- Lenart Janos <ocsi at debian.org> Tue, 6 Mar 2001 05:54:28 +0100
+
+wmgtemp (0.1-1.1) unstable; urgency=medium
+
+ * Moved from /usr/X11R6/bin to /usr/bin
+
+ -- Lenart Janos <ocsi at debian.org> Sat, 24 Feb 2001 17:28:02 +0100
+
+wmgtemp (0.1-1) unstable; urgency=low
+
+ * Initial Release. (closes: Bug#87146)
+
+ -- Lenart Janos <ocsi at debian.org> Fri, 23 Feb 2001 00:29:54 +0100
diff --cc debian/control
index 5c2ddae,0000000..9c08e21
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,20 -1,0 +1,17 @@@
+Source: wmgtemp
+Section: utils
+Priority: optional
+Maintainer: Lenart Janos <ocsi at debian.org>
+Build-Depends: debhelper (>> 3.0.0), libsensors-dev, xlibs-dev
- Standards-Version: 3.5.6.0
++Standards-Version: 3.6.1.0
+
+Package: wmgtemp
- Architecture: i386
- Depends: ${shlibs:Depends}
++Architecture: any
++Depends: ${shlibs:Depends}, lm-sensors
+Suggests: i2c-source
- Description: Temperature sensor dockapp for WindowMaker
- It displays the CPU and SYS temperatures (both in numerically and
- graphically) of motherboards with the VIA686A chipset primarily but
- also supports some other sensors, including W83781D, W83627HF and
- AS99127F. There is also intention of adding support for other chipsets
- in the future.
++Description: Temperature sensor dockapp for Window Maker
++ wmgtemp displays the CPU and SYS temperatures (both numerically and
++ graphically) of motherboards with support for lm_sensors.
+ .
- You will need a kernel compiled with i2c capabilities to make this work,
- use the i2c-source package to make it for yourself.
++ You will need I2C support to make this work, use the i2c-source
++ package to set it up.
diff --cc debian/copyright
index 575794d,0000000..097b0a1
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,13 -1,0 +1,13 @@@
+This package was debianized by Lenart Janos <ocsi at debian.org> on
+Fri, 23 Feb 2001 00:29:54 +0100.
+
- It was downloaded from http://www.nanunanu.org/~kronos/wmgtemp-0.1.tar.gz
++The original source can be found at: http://www.fluxcode.net/
+
- Upstream Author(s): Roger Dunce <kronos at nanunanu.org>
++Upstream Author: Roger Dunce <kronos at fluxcode.net>
+
+Copyright:
+
+You may distribute this program under the terms of the Artistic License.
+
+On Debian GNU/Linux systems, the complete text of the Artistic License
+can be found in `/usr/share/common-licenses/Artistic'.
diff --cc debian/menu
index 9dd047f,0000000..eb30546
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,2 -1,0 +1,2 @@@
- ?package(wmgtemp):needs=x11 section=Apps/System title="wmgtemp" \
++?package(wmgtemp):needs="x11" section="Apps/System" title="wmgtemp" \
+ longtitle="Temperature sensor" command="/usr/bin/wmgtemp"
diff --cc debian/rules
index e62c6a9,0000000..c59082e
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,62 -1,0 +1,64 @@@
+#!/usr/bin/make -f
+# debian/rules for wmgtemp by Lenart Janos.
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+ dh_testdir
+ $(MAKE) depend
+ $(MAKE)
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ $(MAKE) clean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs usr/bin
+ $(MAKE) install INSTDIR=$(CURDIR)/debian/wmgtemp/usr/bin
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs TODO
++ chmod -x examples/wmgtemprc
+ dh_installexamples examples/wmgtemprc
+ dh_installmenu
- dh_installman debian/local/wmgtemp.1
++ dh_installman wmgtemp.1
+ dh_installchangelogs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
++
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --cc src/.deps
index 5abdddc,5abdddc..5520580
mode 100644,100755..100755
--- a/src/.deps
+++ b/src/.deps
@@@ -1,2 -1,2 +1,2 @@@
wmgtemp.o: wmgtemp.c wmgeneral/wmgeneral.h wmgeneral/misc.h \
-- wmgtemp-interface.xpm wmgtemp-interface-mask.xbm
++ wmgtemp-interface.xpm wmgtemp-interface-mask.xbm
diff --cc src/Makefile
index 554f5e9,5e2647d..b0c0fac
mode 100644,100755..100755
--- a/src/Makefile
+++ b/src/Makefile
@@@ -17,7 -17,7 +17,7 @@@ $(BINARY): $(OFILES
$(CC) $(OFILES) $(LDFLAGS) -o $(BINARY)
clean:
-- @ $(RM) $(OFILES) *~ "#"* $(BINARY)
++ $(RM) $(OFILES) *~ "#"* $(BINARY)
install::
$(INSTALL) -m 755 -c $(BINARY) $(INSTDIR)/$(BINARY)
diff --cc src/wmgtemp.c
index 71566b0,792e7b4..42b406a
mode 100644,100755..100755
--- a/src/wmgtemp.c
+++ b/src/wmgtemp.c
@@@ -201,6 -165,6 +165,13 @@@ int main(int argc, char **argv)
/* output the name of the sensor if found. */
printf("wmgtemp: Primary Sensor - %s on %s\n", name->prefix, sensors_get_adapter_name(name->bus));
++
++ /* via686a puts system temperature in temp1 and CPU temperature in temp2 */
++ if(strcmp(chipname, SENSORS_VIA686A_PREFIX) == 0) {
++ SENSOR_DEF_CPU = SENSORS_VIA686A_TEMP2;
++ SENSOR_DEF_SYS = SENSORS_VIA686A_TEMP;
++ }
++
if(swap_types) {
printf("wmgtemp: swapping temps\n");
tmp_swap = SENSOR_DEF_SYS;
@@@ -618,29 -588,29 +595,29 @@@ int init_sensors()
}
void display_usage() {
-- printf("Usage: wmgtemp [options]
--Options:
-- -s, --scale=SCALE display temperatures in SCALE
-- SCALE=kelvin, fahrenheit
-- [Default: celcius]
-- -g, --graph=STYLE display graph as STYLE
-- STYLE=line, block
-- [Default: line]
-- -H, --high=TEMP Display red warning light at TEMP degrees celcius
-- [Default: 50]
-- -w, --warn=TEMP Display amber warning light at TEMP degrees celcius
-- [Default: 45]
-- -u, --update=SEC update the display every SEC seconds
-- [Default: 1]
-- -m, --min=TEMP set the lower bound of the graph to TEMP degrees celcius
-- [Default: 20]
-- -M, --max=TEMP set the upper bound of the graph to TEMP degrees celcius
-- [Default: 35]
-- -a, --execat=TEMP Execute a command at TEMP degrees celcius
-- -e, --exec=COMMAND Execute COMMAND when the 'execat' temperature is reached
-- -t, --swap Swap CPU and SYS temps
-- -h, --help Displays this help screen
--");
++ printf("Usage: wmgtemp [options]\n"
++"Options:\n"
++" -s, --scale=SCALE display temperatures in SCALE\n"
++" SCALE=kelvin, fahrenheit\n"
++" [Default: celcius]\n"
++" -g, --graph=STYLE display graph as STYLE\n"
++" STYLE=line, block\n"
++" [Default: line]\n"
++" -H, --high=TEMP Display red warning light at TEMP degrees celcius\n"
++" [Default: 50]\n"
++" -w, --warn=TEMP Display amber warning light at TEMP degrees celcius\n"
++" [Default: 45]\n"
++" -u, --update=SEC update the display every SEC seconds\n"
++" [Default: 1]\n"
++" -m, --min=TEMP set the lower bound of the graph to TEMP degrees celcius\n"
++" [Default: 20]\n"
++" -M, --max=TEMP set the upper bound of the graph to TEMP degrees celcius\n"
++" [Default: 35]\n"
++" -a, --execat=TEMP Execute a command at TEMP degrees celcius\n"
++" -e, --exec=COMMAND Execute COMMAND when the 'execat' temperature is reached\n"
++" -t, --swap Swap CPU and SYS temps\n"
++" -h, --help Displays this help screen\n"
++);
}
diff --cc wmgtemp.1
index 64e8154,d584284..0896af0
mode 100644,100755..100755
--- a/wmgtemp.1
+++ b/wmgtemp.1
@@@ -6,7 -6,7 +6,7 @@@ wmgtemp \- Temperature sensor dock app
.B wmgtemp
.I "[options]"
.SH "DESCRIPTION"
--wmgtemp is a dock-app for Window Maker that graphically displays the CPU and System temperatures using the lm_sensors package. It was originally intended to work with the VIA686A chipset but also supports some other sensors. It displays the CPU and System temperature values, a scaling graph of temperature history,high-temperature warning lights and temperatures in celcius, fahrenheit or kelvin.
++wmgtemp is a dock-app for Window Maker that graphically displays the CPU and System temperatures using the lm_sensors package. It was originally intended to work with the VIA686A chipset but also supports some other sensors. It displays the CPU and System temperature values, a scaling graph of temperature history, high-temperature warning lights and temperatures in celcius, fahrenheit or kelvin.
.PP
The temperature graph is auto scaling, meaning that if the max or min temperature boundary is crossed the graph will be scaled to display the temperature. A red line marks the upper boundary whereas a blue line indicates the lower boundary. When all the temperatures being displayed are within the boundaries the graph will be scaled back to the preset values for min/max and the boundary indicator lines will be removed.
.PP
@@@ -116,5 -113,5 +116,3 @@@ Blank lines in the config file cause a
.BR wmaker (1x)
.SH AUTHOR
wmgtemp was written by Roger Dunce <kronos at nanunanu.org>
--
--
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmgtemp.git
More information about the Pkg-wmaker-commits
mailing list