diff -u hardware-monitor-1.4/config.sub hardware-monitor-1.4/config.sub --- hardware-monitor-1.4/config.sub +++ hardware-monitor-1.4/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -475,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; diff -u hardware-monitor-1.4/debian/control hardware-monitor-1.4/debian/control --- hardware-monitor-1.4/debian/control +++ hardware-monitor-1.4/debian/control @@ -1,7 +1,8 @@ Source: hardware-monitor Section: gnome Priority: optional -Maintainer: Ari Pollak +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Ari Pollak Build-Depends: debhelper (>> 4.2.13), libsensors-dev (>= 2.8.4-1), libglademm-2.4-dev, libgnomecanvasmm-2.6-dev, libgtop2-dev (>= 2.0.5), libpanel-applet2-dev, libgconfmm-2.6-dev, libgtkmm-2.4-dev (>= 2.6.0), intltool Standards-Version: 3.5.9 diff -u hardware-monitor-1.4/debian/changelog hardware-monitor-1.4/debian/changelog --- hardware-monitor-1.4/debian/changelog +++ hardware-monitor-1.4/debian/changelog @@ -1,3 +1,13 @@ +hardware-monitor (1.4-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP #160601), remaining changes: + - Applied patch from Christof Krüger to not count iowait as cpu load. + - Updated maintainer field. + - Build-Depends: dropped libgnomemm-2.6-dev, libgnomeuimm-2.6-dev and duplicate + libpanel-applet2-dev + + -- Miguel Ruiz Wed, 12 Dec 2007 12:28:58 -0300 + hardware-monitor (1.4-1) unstable; urgency=low * New upstream release (Closes: #408301) @@ -5,6 +15,37 @@ -- Ari Pollak Wed, 27 Jun 2007 21:18:31 -0400 +hardware-monitor (1.4-0ubuntu4) gutsy; urgency=low + + * Rebuild against glib, now that the fix is actually applied. + + -- Daniel Holbach Mon, 25 Jun 2007 16:27:58 +0200 + +hardware-monitor (1.4-0ubuntu3) gutsy; urgency=low + + * Rebuild for glib ABI change. + + -- Daniel Holbach Mon, 25 Jun 2007 11:25:24 +0200 + +hardware-monitor (1.4-0ubuntu2) feisty; urgency=low + + * Applied patch from Christof Krüger to not count iowait as cpu + load (closes: lp#81599). + * Update maintainer field. + + -- Stefan Potyra Fri, 9 Mar 2007 19:55:16 +0100 + +hardware-monitor (1.4-0ubuntu1) feisty; urgency=low + + * New upstream release (Closes: Malone #80888) + * Build-Depends: dropped libgnomemm-2.6-dev, libgnomeuimm-2.6-dev and + duplicate libpanel-applet2-dev + * Bumped Standards-Version to 3.7.2 + * Updated debhelper compat and versioned build dependency to 5 + * Dropped useless debian/dirs + + -- Adrien Cunin Wed, 24 Jan 2007 13:16:54 +0100 + hardware-monitor (1.2.1-3.1) unstable; urgency=low * NMU to fix RC bug @@ -13,6 +54,12 @@ -- Ari Pollak Mon, 21 May 2007 10:50:18 -0400 +hardware-monitor (1.2.1-3build1) dapper; urgency=low + + * Build against new libgtop2 to make package installable again. + + -- Martin Pitt Fri, 13 Jan 2006 11:13:11 +0100 + hardware-monitor (1.2.1-3) unstable; urgency=low * Adapted to new gconf/schema handling stuff, using dh_gconf. diff -u hardware-monitor-1.4/config.guess hardware-monitor-1.4/config.guess --- hardware-monitor-1.4/config.guess +++ hardware-monitor-1.4/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -330,7 +330,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -793,7 +793,7 @@ exit ;; *:Interix*:[3456]*) case ${UNAME_MACHINE} in - x86) + x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; EM64T | authenticamd) only in patch2: unchanged: --- hardware-monitor-1.4.orig/src/monitor-impls.cpp +++ hardware-monitor-1.4/src/monitor-impls.cpp @@ -236,11 +236,11 @@ int const CpuUsageMonitor::max_no_cpus = GLIBTOP_NCPU; CpuUsageMonitor::CpuUsageMonitor() - : cpu_no(all_cpus), total_time(0), nice_time(0), idle_time(0) + : cpu_no(all_cpus), total_time(0), nice_time(0), idle_time(0), iowait_time(0) {} CpuUsageMonitor::CpuUsageMonitor(int cpu) - : cpu_no(cpu), total_time(0), nice_time(0), idle_time(0) + : cpu_no(cpu), total_time(0), nice_time(0), idle_time(0), iowait_time(0) { if (cpu_no < 0 || cpu_no >= max_no_cpus) cpu_no = all_cpus; @@ -252,33 +252,37 @@ glibtop_get_cpu(&cpu); - guint64 t, n, i; + guint64 t, n, i, io; if (cpu_no == all_cpus) { t = cpu.total; n = cpu.nice; i = cpu.idle; + io = cpu.iowait; } else { t = cpu.xcpu_total[cpu_no]; n = cpu.xcpu_nice[cpu_no]; i = cpu.xcpu_idle[cpu_no]; + io = cpu.xcpu_iowait[cpu_no]; } // calculate ticks since last call guint64 dtotal = t - total_time, dnice = n - nice_time, - didle = i - idle_time; + didle = i - idle_time, + diowait = io - iowait_time; // and save the new values total_time = t; nice_time = n; idle_time = i; + iowait_time = io; // don't count in dnice to avoid always showing 100% with SETI@home and // similar applications running - double res = double(dtotal - dnice - didle) / dtotal; + double res = double(dtotal - dnice - didle - diowait) / dtotal; if (res > 0) return res; only in patch2: unchanged: --- hardware-monitor-1.4.orig/src/monitor-impls.hpp +++ hardware-monitor-1.4/src/monitor-impls.hpp @@ -59,7 +59,7 @@ // we need to save these values to compute the difference next time the // monitor is updated - guint64 total_time, nice_time, idle_time; + guint64 total_time, nice_time, idle_time, iowait_time; };