[Pkg-wmaker-commits] [wmgtemp] 10/45: Imported Debian patch 0.7-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 25 02:58:04 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 6390383d0d6e17b5e3524cbe699123b8a5d5c1b2
Merge: d85eb45 bea6b35
Author: Josip Rodin <joy-packages at debian.org>
Date: Mon Sep 11 02:14:31 2006 +0200
Imported Debian patch 0.7-1
CREDITS | 10 +++--
Makefile | 8 +++-
README | 2 +-
debian/README.Debian | 9 ----
debian/changelog | 12 +++++
debian/control | 13 +++---
debian/copyright | 9 ++--
debian/rules | 32 ++++----------
examples/wmgtemprc | 4 ++
src/wmgtemp.c | 123 ++++++++++++++++++++++++++++++++++-----------------
wmgtemp.1 | 36 ++++++++++++---
11 files changed, 162 insertions(+), 96 deletions(-)
diff --cc Makefile
index 7a08b0a,02f77fb..1d5e696
--- a/Makefile
+++ b/Makefile
@@@ -5,7 -9,5 +9,9 @@@ depend
( cd src && $(MAKE) depend )
install:
- ( cd src && $(MAKE) install INSTDIR=$(INSTDIR))
- ( cd src && $(MAKE) install )
- $(INSTALL) -m 755 -c $(MANPAGE) $(MANINSTDIR)/$(MANPAGE)
++ ( cd src && $(MAKE) install INSTDIR=$(INSTDIR) )
++ $(INSTALL) -d $(MANINSTDIR)
++ $(INSTALL) -m 755 -c $(MANPAGE) $(MANINSTDIR)/$(MANPAGE)
+
+clean:
+ ( cd src && $(MAKE) clean)
diff --cc debian/changelog
index 73f76b5,0000000..41350ed
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,140 -1,0 +1,152 @@@
++wmgtemp (0.7-1) unstable; urgency=low
++
++ * New upstream version.
++ + Obsoleted the patch that was added to fix #185512, since a run-time
++ option for swapping temperatures now exists.
++ + Obsoleted the patch that fixed a multi-line string in printf.
++ + Obsoleted/updated the patch for the manual page to avoid listing
++ chipsets and instead point to lm_sensors manuals, and fix typos.
++ * Cleaned up the packaging a bit.
++
++ -- Josip Rodin <joy-packages at debian.org> Mon, 11 Sep 2006 02:14:31 +0200
++
+wmgtemp (0.6-5) unstable; urgency=low
+
+ * Adopting the package, closes: #349201.
+
+ -- Josip Rodin <joy-packages at debian.org> Mon, 11 Sep 2006 02:05:33 +0200
+
+wmgtemp (0.6-4) unstable; urgency=low
+
+ * Orphaning the package.
+ * NMU ACK. (closes: bug#347099)
+
+ -- LENART Janos <ocsi at debian.org> Sat, 21 Jan 2006 15:17:34 +0100
+
+wmgtemp (0.6-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace build-dependency on xlibs-dev with an explicit build-dependency
+ on each required package. (Closes: #347099)
+
+ -- Steinar H. Gunderson <sesse at debian.org> Sat, 21 Jan 2006 15:01:38 +0100
+
+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 c8eae23,0000000..08884bb
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,18 @@@
+Source: wmgtemp
+Section: utils
+Priority: optional
+Maintainer: Josip Rodin <joy-packages at debian.org>
- Build-Depends: debhelper (>> 3.0.0), libsensors-dev, libx11-dev, libxext-dev, libxpm-dev
- Standards-Version: 3.6.1.0
++Build-Depends: debhelper (>> 5), libsensors-dev, libx11-dev, libxext-dev, libxpm-dev
++Standards-Version: 3.6.1
+
+Package: wmgtemp
+Architecture: any
+Depends: ${shlibs:Depends}, lm-sensors
+Suggests: i2c-source
+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.
++ wmgtemp is a dock app (a 64x64 window) which graphically displays the
++ CPU and SYS temperatures of motherboards supported by lm_sensors.
+ .
- You will need I2C support to make this work, use the i2c-source
- package to set it up.
++ To make wmgtemp work, one needs to set up lm_sensors and I2C.
++ On Debian systems, the lm-sensors-source and i2c-source packages
++ are used to set these up.
diff --cc debian/copyright
index 097b0a1,0000000..09ca508
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,13 -1,0 +1,12 @@@
+This package was debianized by Lenart Janos <ocsi at debian.org> on
+Fri, 23 Feb 2001 00:29:54 +0100.
++It is currently maintained by Josip Rodin <joy-packages at debian.org>.
+
+The original source can be found at: http://www.fluxcode.net/
+
- Upstream Author: Roger Dunce <kronos at fluxcode.net>
-
- Copyright:
++Upstream author: Roger Dunce <kronos at fluxcode.net>
+
+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'.
++On Debian systems, the complete text of the Artistic License
++can be found in /usr/share/common-licenses/Artistic.
diff --cc debian/rules
index c59082e,0000000..eb4a223
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,64 -1,0 +1,50 @@@
+#!/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.
++# debian/rules for wmgtemp, by Josip Rodin
++# based on files by Joey Hess and Janos Lenart.
+
- # Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
- # This is the debhelper compatability version to use.
- export DH_COMPAT=3
++export DH_COMPAT=5
+
- configure: configure-stamp
- configure-stamp:
- dh_testdir
- touch configure-stamp
++build: src/wmgtemp
+
- build: configure-stamp build-stamp
- build-stamp:
++src/wmgtemp: src/Makefile
+ 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
++ $(MAKE) install INSTDIR=$(CURDIR)/debian/wmgtemp/usr/bin MANINSTDIR=$(CURDIR)/debian/wmgtemp/usr/share/man/man1
+
- # Build architecture-independent files here.
- binary-indep: build install
- # We have nothing to do by default.
++binary-indep:
+
- # Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs TODO
++ dh_installchangelogs
+ chmod -x examples/wmgtemprc
+ dh_installexamples examples/wmgtemprc
+ dh_installmenu
- 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
++.PHONY: build clean binary-indep binary-arch binary install
diff --cc wmgtemp.1
index 0896af0,4250d47..0f1a945
--- a/wmgtemp.1
+++ b/wmgtemp.1
@@@ -6,7 -6,7 +6,11 @@@ 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 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 displays the CPU and
++System temperature values, a scaling graph of temperature history,
++high-temperature warning lights and temperatures in degrees Celsius,
++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
@@@ -113,6 -129,8 +133,10 @@@ You may change the scale the temperatur
Blank lines in the config file cause a Segmentation Fault.
.PP
.SH SEE ALSO
++.BR sensors.conf (5),
++.BR libsensors (3),
.BR wmaker (1x)
.SH AUTHOR
- wmgtemp was written by Roger Dunce <kronos at nanunanu.org>
+ wmgtemp was written by Roger Dunce <kronos at fluxcode.net>
+
+
--
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