debian/0000775000000000000000000000000012220346060007163 5ustar debian/menu0000664000000000000000000000017312000464456010061 0ustar ?package(wmcpuload):needs="X11" section="Applications/System/Monitoring"\ title="wmcpuload" command="/usr/bin/wmcpuload" debian/clean0000664000000000000000000000001312000531052010153 0ustar stamp-h.in debian/changelog0000664000000000000000000001174012220346051011040 0ustar wmcpuload (1.0.1-6) unstable; urgency=low * [02_dependencies.diff] Fix FTBFS. Closes: #724162 -- Andreas Metzler Tue, 24 Sep 2013 19:30:08 +0200 wmcpuload (1.0.1-5) unstable; urgency=low [ Rodolfo García Peñas ] * debian/control + Bump Standards-Version to 3.9.4. + Removed DM-Upload-Allowed flag (obsolete). + Updated maintainer email address from kix@kix.es to kix@debian.org. + Added Homepage field. * debian/copyright is now DEP-5. * Added debian/watch file (only with comment about the upstream). * Updated debian/patches/01_kfreebsd.diff, removed the patch code for configure file. [ Andreas Metzler ] * Use and build-depend on dh-autoreconf instead of autotools, to allow us to stop patching configure. -- Andreas Metzler Mon, 22 Jul 2013 14:50:43 +0200 wmcpuload (1.0.1-4) unstable; urgency=low * Adopt package. Closes: #661121 - New maintainers Rodolfo García Peñas and Andreas Metzler. * Refresh packaging: + dh v9 compat level. + Use dh instead of fully-fledged rules. + Refresh config.(sub|guess) at build time with autotools-dev's dh module. + Use 3.0 (quilt) format. + [lintian] add ${misc:Depends}. + Bump standards-version. (no further changes.) + Stop patching upstream URL in README, the newer one is dead, too. * Install icons to /usr/share/icons instead of /usr/share/doc/. -- Andreas Metzler Sun, 15 Jul 2012 18:22:16 +0200 wmcpuload (1.0.1-3.2) unstable; urgency=low * Non-maintainer upload. * Fix debian/rules + Add a hyphen in front of autostuff copy (Closes: #499739) -- Julien Danjou Sun, 23 Nov 2008 11:06:10 +0100 wmcpuload (1.0.1-3.1) unstable; urgency=low * Non-maintainer upload. * Fix FTBFS on GNU/kFreeBSD (Closes: #417867) * Set debhelper compatibility in debian/compat rather than in debian/rules * Do not ignore errors on make clean in debian/rules * Fix menu entry section * Bump standard version -- Julien Danjou Sat, 06 Sep 2008 09:35:18 +0200 wmcpuload (1.0.1-3) unstable; urgency=low * debian/control: Updated build-depends (removed xlibs-dev) (Closes: #347046) * debian/control: Standards-Version to 3.6.2 * debian/copyright: Updated to reflect the real licensing situation * Updated the URL of the upstream homepage (thanks to Miriam Ruiz for the notice) * Removed unused directories from debian/dirs -- Christian Aichinger Thu, 20 Apr 2006 17:37:46 +0200 wmcpuload (1.0.1-2) unstable; urgency=low * New Maintainer * Added proper Linux 2.6 support, thanks to Peter Colberg for the patch. (Closes: #238684) * debian/control: Standards-Version to 3.6.1.1 -- Christian Aichinger Sun, 13 Feb 2005 18:42:41 +0100 wmcpuload (1.0.1-1) unstable; urgency=low * New upstream release * debian/control: Standards-Version to 3.5.8 * debian/rules: Update DEB_BUILD_OPTIONS handling * Debhelper v4 * Drop doc/contrib (it's useless without the sources) -- Gordon Fraser Mon, 10 Mar 2003 08:28:49 +0100 wmcpuload (1.0.0-1) unstable; urgency=low * New upstream release -- Gordon Fraser Thu, 1 Aug 2002 10:47:52 +0200 wmcpuload (0.9.0-1) unstable; urgency=low * New upstream release -- Gordon Fraser Sat, 23 Mar 2002 20:11:22 +0100 wmcpuload (0.8.1-2) unstable; urgency=low * Change help text to prevent confusion (Closes: #137502) * Update manpage with further explanation accordingly -- Gordon Fraser Sun, 10 Mar 2002 14:53:11 +0100 wmcpuload (0.8.1-1) unstable; urgency=low * New upstream release (Closes: #129515) -- Gordon Fraser Thu, 17 Jan 2002 20:09:50 +0100 wmcpuload (0.8.0-3) unstable; urgency=low * Update config.guess and config.sub to enable build on Mips - (Closes: #127545) -- Gordon Fraser Fri, 4 Jan 2002 08:22:06 +0100 wmcpuload (0.8.0-2) unstable; urgency=low * Fix backlight color option -- Gordon Fraser Tue, 1 Jan 2002 07:46:16 +0100 wmcpuload (0.8.0-1) unstable; urgency=low * New upstream release * Updated description and maintainer email address -- Gordon Fraser Mon, 31 Dec 2001 12:06:24 +0100 wmcpuload (0.7-4) unstable; urgency=low * Update manpage to credit author -- Gordon Fraser Wed, 5 Dec 2001 08:59:02 +0100 wmcpuload (0.7-3) unstable; urgency=low * Updated config.guess and config.sub - (Closes: #114687) -- Gordon Fraser Sat, 06 Oct 2001 10:48:41 +0200 wmcpuload (0.7-2) unstable; urgency=low * Fixed grammatical mistake in description - (Closes: #114258) -- Gordon Fraser Wed, 03 Oct 2001 08:03:41 +0200 wmcpuload (0.7-1) unstable; urgency=low * Initial Release - (Closes: #113956) -- Gordon Fraser Sun, 23 Sep 2001 12:10:37 +0200 Local variables: mode: debian-changelog End: debian/rules0000775000000000000000000000013212173217201010240 0ustar #!/usr/bin/make -f export DEB_CFLAGS_MAINT_APPEND := -Wall %: dh $@ --with autoreconf debian/docs0000664000000000000000000000004012000531675010034 0ustar AUTHORS NEWS README TODO THANKS debian/copyright0000664000000000000000000000505412173220347011130 0ustar Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174 Upstream-Name: wmcpuload Upstream-Contact: Seiichi Sato Source: http://repo.or.cz/w/dockapps.git Files: * Copyright: 2001, Seiichi Sato 2002, Seiichi Sato 2003, Seiichi Sato License: GPL-2+ Files: debian/* Copyright: 2001, Gordon Fraser 2013, Andreas Metzler 2013, Rodolfo García Peñas License: GPL-2+ Files: libdockapp/* Copyright: 1999, Alfredo K. Kojima 1999, Pascal G. Hofstee License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. debian/source/0000775000000000000000000000000012173220673010473 5ustar debian/source/format0000664000000000000000000000001412173215767011711 0ustar 3.0 (quilt) debian/watch0000664000000000000000000000010212173215612010212 0ustar # The upstream version is now in http://repo.or.cz/w/dockapps.git debian/install0000664000000000000000000000020112000531757010552 0ustar icons/wmcpuload-16x16.xpm /usr/share/icons icons/wmcpuload-32x32.xpm /usr/share/icons icons/wmcpuload-48x48.xpm /usr/share/icons debian/compat0000664000000000000000000000000212000526747010371 0ustar 9 debian/control0000664000000000000000000000144012173217742010600 0ustar Source: wmcpuload Section: x11 Priority: optional Maintainer: Andreas Metzler Uploaders: Rodolfo García Peñas Build-Depends: debhelper (>= 9), libx11-dev, libxext-dev, libxpm-dev, libxmu-dev, dh-autoreconf Standards-Version: 3.9.4 Homepage: http://windowmaker.org/ Package: wmcpuload Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Dockapp that displays the current CPU usage WMCPULoad is a dockapp for X window managers such as WindowMaker, AfterStep, BlackBox and Enlightenment. It displays the current CPU usage as percentage value and chart with an LCD-like look. Its appearance can be configured from the commandline and it has a backlight mode which can be triggered manually or by an adjustable alarm percentage. debian/patches/0000775000000000000000000000000012220346016010613 5ustar debian/patches/02_dependencies.diff0000664000000000000000000000165612220345720014405 0ustar Description: Fix Makefile.am for automake 1.14 Author: Andreas Metzler Origin: vendor Bug-Debian: http://bugs.debian.org/724162 --- wmcpuload-1.0.1.orig/src/Makefile.am +++ wmcpuload-1.0.1/src/Makefile.am @@ -1,5 +1,7 @@ # $Id: Makefile.am,v 1.1.1.1 2002/10/14 09:31:17 sch Exp $ +AUTOMAKE_OPTIONS = subdir-objects + bin_PROGRAMS = wmcpuload wmcpuload_SOURCES = \ @@ -8,7 +10,8 @@ wmcpuload_SOURCES = \ main.c \ backlight_on.xpm \ backlight_off.xpm \ - parts.xpm + parts.xpm \ + ../libdockapp/dockapp.c ../libdockapp/dockapp.h EXTRA_wmcpuload_SOURCES = \ cpu_linux.c \ @@ -21,7 +24,6 @@ EXTRA_wmcpuload_SOURCES = \ cpu_irix.c \ cpu_darwin.c -wmcpuload_DEPENDENCIES = ../libdockapp/dockapp.o INCLUDES = \ @HEADER_SEARCH_PATH@ \ @@ -30,7 +32,6 @@ INCLUDES = \ CFLAGS = @DFLAGS@ @CFLAGS@ -I../libdockapp/ wmcpuload_LDADD = \ - dockapp.o \ @LIBRARY_SEARCH_PATH@ \ @XLIBS@ \ @XLFLAGS@ debian/patches/01_kfreebsd.diff0000664000000000000000000000434512173216541013546 0ustar Description: Add support for GNU/kFreeBSD Author: Cyril Brulebois Author: Rodolfo García Peñas Bug-Debian: http://bugs.debian.org/417867 Last-Update: 2013-07-21 --- a/configure.ac +++ b/configure.ac @@ -102,6 +102,12 @@ AC_CHECK_HEADER(linux/threads.h, [AC_DEFINE(USE_SMP, 1, [use SMP support])], [echo "linux/threads.h header file was not found, but is necessary to support mulit processors"]) ;; +kfreebsd*) + # Same as Linux, but don't check for threads.h header + OS=linux + ignore_nice=yes + ignore_proc=yes + ;; freebsd*) OS=freebsd ignore_nice=yes --- a/src/cpu_linux.c +++ b/src/cpu_linux.c @@ -21,7 +21,11 @@ #include #include #include +#ifdef __linux__ #include +#else +#include +#endif #ifdef USE_SMP #include @@ -46,7 +50,11 @@ static int pre_used, pre_total; static int pre_ig_used; int usage; - int cpu, nice, system, idle; + // Initialize all of these to zero, so that if fscanf partially fails + // (eg on 2.4 where iowait, irq, softirq are missing), we still get + // correct results. + int cpu = 0, nice = 0, system = 0, idle = 0; + int iowait = 0, irq = 0, softirq = 0; int used = 0, total = 0; int ig_used = 0; int i; @@ -57,7 +65,7 @@ exit(1); } - fscanf(fp, "%*s %d %d %d %d", &cpu, &nice, &system, &idle); + fscanf(fp, "%*s %d %d %d %d %d %d %d", &cpu, &nice, &system, &idle, &iowait, &irq, &softirq); #ifdef USE_SMP if (opts->cpu_number >= 0) { @@ -68,7 +76,7 @@ } for (i = 0; i <= opts->cpu_number; i++) { - fscanf(fp, "%s %d %d %d %d", cpu_name, &cpu, &nice, &system, &idle); + fscanf(fp, "%s %d %d %d %d %d %d %d", cpu_name, &cpu, &nice, &system, &idle, &iowait, &irq, &softirq); if (strncmp(cpu_name, "cpu", 3)){ fprintf (stderr, "can't find cpu%d!\n", opts->cpu_number); exit (1); @@ -81,7 +89,7 @@ used = cpu + system; if (!opts->ignore_nice) used += nice; - total = cpu + nice + system + idle; + total = cpu + nice + system + idle + iowait + irq + softirq; /* get CPU usage of processes which specified by name with '-p' option */ if (opts->ignore_procs) { debian/patches/series0000664000000000000000000000004612220345446012036 0ustar 01_kfreebsd.diff 02_dependencies.diff