[Pkg-wmaker-commits] [wmgtemp] 13/45: Imported Debian patch 1.1-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 6526cceb1f03ed9c11c38dccfb10a45d9d5bee7f
Merge: 949b021 ea76915
Author: Aurelien Jarno <aurel32 at debian.org>
Date: Mon Feb 7 19:22:37 2011 +0100
Imported Debian patch 1.1-1
BUGS | 5 -
CREDITS | 15 +-
ChangeLog | 323 ++++++++++++++++++++++++++++
debian/changelog | 12 ++
debian/control | 7 +-
debian/patches/000_fix_on_src_wmtemp.c.diff | 17 --
debian/patches/001_sensors.conf.diff | 55 +++++
debian/patches/series | 2 +-
debian/watch | 2 +-
src/wmgeneral/wmgeneral.c | 26 +--
src/wmgtemp-interface.xpm | 4 +-
src/wmgtemp.c | 237 +++++++++++++-------
wmgtemp.1 | 11 +
13 files changed, 585 insertions(+), 131 deletions(-)
diff --cc debian/changelog
index 33a2a19,0000000..daadda5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,178 -1,0 +1,190 @@@
++wmgtemp (1.1-1) unstable; urgency=low
++
++ * QA upload.
++ * New upstream version, using libsensors4 instead of libsensors3.
++ * Remove obsolete parts of descriptions about i2c-source.
++ * Fix debian/watch to also look for .tar.gz files (Closes: #596101).
++ * Remove 000_fix_on_src_wmtemp.c.diff (fixed upstream).
++ * Add 001_use_sensors3.conf.diff to use /etc/sensors3.conf instead of
++ /etc/sensors.conf.
++
++ -- Aurelien Jarno <aurel32 at debian.org> Mon, 07 Feb 2011 19:22:37 +0100
++
+wmgtemp (0.8-1) unstable; urgency=low
+
+ * QA upload.
+ * Switch to dpkg-source 3.0 (quilt) format
+ * debian/watch: Added.
+ * New upstream release (0.8) (Closes: #454492, #465335)
+ * debian/control:
+ + Debhelper updated to >=7
+ + Maintainer field set to Debian QA Group
+ + Added ${misc:Depends} to avoid lintian W: debhelper-but-no-misc-depends
+ + Bump Standards-Version to 3.8.4
+ + Added 'Homepage' field.
+ + Priority downgrade to 'extra' because depends on 'lm-sensors' which is
+ extra. Filed bug to ftp.debian.org #568356
+ * debian/rules:
+ + export DH_COMPAT was removed
+ + s/dh_clean -k/dh_prep/ to avoid lintian W: dh-clean-k-is-deprecated
+ * Menu section chaged from 'Apps/System' to 'Applications/System/Monitoring'
+ to get rid of lintian W: menu-item-uses-apps-section
+ * debian/copyright: Migrated to DEP-5 format.
+ * debian/patches:
+ + 000_fix_on_src_wmtemp.c.diff: Add missing '('
+ + 000_fix_hypens_in_wmtemp.1.diff: Fix hyphen in manpage
+
+ -- Dario Minnucci <midget at debian.org> Thu, 04 Feb 2010 08:32:12 +0100
+
+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 d4a2401,0000000..37fda45
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,19 -1,0 +1,16 @@@
+Source: wmgtemp
+Section: utils
+Priority: extra
+Maintainer: Debian QA Group <packages at qa.debian.org>
- Build-Depends: debhelper (>=7), libsensors-dev, libx11-dev, libxext-dev, libxpm-dev
++Build-Depends: debhelper (>= 7), libsensors4-dev, libx11-dev, libxext-dev, libxpm-dev
+Standards-Version: 3.8.4
+Homepage: http://www.fluxcode.net
+
+Package: wmgtemp
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, lm-sensors
- Suggests: i2c-source
+Description: Temperature sensor dockapp for Window Maker
+ wmgtemp is a dock app (a 64x64 window) which graphically displays the
+ CPU and SYS temperatures of motherboards supported by lm_sensors.
+ .
- 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.
++ To make wmgtemp work, one needs to set up lm_sensors.
diff --cc debian/patches/001_sensors.conf.diff
index 0000000,0000000..f10a3b3
new file mode 100644
--- /dev/null
+++ b/debian/patches/001_sensors.conf.diff
@@@ -1,0 -1,0 +1,55 @@@
++#
++# Description: use sensors.conf autodetection instead of providing a
++# default value
++# Author: Aurelien Jarno <aurel32 at debian.org>
++#
++--- wmgtemp-1.1.orig/src/wmgtemp.c
+++++ wmgtemp-1.1/src/wmgtemp.c
++@@ -663,11 +663,15 @@ int init_sensors() {
++ FILE *config_file;
++ int res;
++
++- config_file = fopen(rc_config, "r");
+++ if (rc_config) {
+++ config_file = fopen(rc_config, "r");
++
++- if(config_file == NULL) {
++- fprintf(stderr, "Error opening %s\n", rc_config);
++- return 0;
+++ if(config_file == NULL) {
+++ fprintf(stderr, "Error opening %s\n", rc_config);
+++ return 0;
+++ }
+++ } else {
+++ config_file = NULL; /* Use libsensors default */
++ }
++
++ res = sensors_init(config_file);
++@@ -677,7 +681,7 @@ int init_sensors() {
++ return 0;
++ }
++
++- if(fclose(config_file))
+++ if(config_file && fclose(config_file))
++ perror("Error closing sensors config");
++
++ return 1;
++@@ -688,7 +692,7 @@ void display_usage() {
++ "Usage: wmgtemp [options]\n" \
++ "Options:\n" \
++ " -S, --sensorconf=PATH Specify sensors config file PATH\n" \
++- " [Default: /etc/sensors.conf]\n" \
+++ " [Default: autodetect]\n" \
++ " -s, --scale=SCALE Display temperatures in SCALE\n" \
++ " SCALE=kelvin, fahrenheit\n" \
++ " [Default: celcius]\n" \
++@@ -950,9 +954,6 @@ int process_config(int argc, char **argv
++ if(rc_chip != NULL) {
++ sensor_chip = strdup(rc_chip);
++ }
++- if(rc_config == NULL) {
++- rc_config = "/etc/sensors.conf";
++- }
++
++ if(rc_graph != NULL) {
++ if(!strncmp(rc_graph, "l", 1)) {
diff --cc debian/patches/series
index 7786e08,0000000..119fc31
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
- 000_fix_on_src_wmtemp.c.diff
+000_fix_hypens_in_wmtemp.1.diff
++001_sensors.conf.diff
diff --cc debian/watch
index 561f1a2,0000000..dbbf3b5
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
+version=3
- http://www.fluxcode.net/ wmgtemp-(.*)\.tar\.bz2
++http://www.fluxcode.net/ wmgtemp-(.*)\.(tar.bz2|tar.gz)
--
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