diff -ru bfm-0.6.3/ChangeLog bfm-0.6.4/ChangeLog --- bfm-0.6.3/ChangeLog 2004-01-03 08:12:25.000000000 +0000 +++ bfm-0.6.4/ChangeLog 2004-07-24 03:58:59.000000000 +0100 @@ -1,3 +1,26 @@ +2003-07-24 03:57 Peter Palfrader + * : Move setting hints a bit down, as suggested in wmfire's + bug report #250937 (closes: #251507). See + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=250937 + and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=251507 + * : Restore default of using eth0 with 'fish show network traffic'. + (closes: #241284). One of the recent versions changed that to + ppp0! See + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=241284 + * : Allow an optional value for -n to specify the network interface. + (closes: #159782). See + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=159782 + +2003-07-24 03:53 James Rowe + * : Merged the debian patch. Basically just changes a default option + in the Makefile and replaces the debian/ structure. A small + attempt to make importing patches much easier(as they seem to + be coming from Debian users a lot ;) + +2004-07-24 03:38 Miguel Bazdresch + * : Stop the waterlevel memory monitor including cached memory in the + total. [Linux ONLY] + 2003-11-05 05:03 James Rowe * : Pull the NET_DEVICE variable in to the config section of the Makefile. (suggestion from too many people to mention.) diff -ru bfm-0.6.3/Makefile bfm-0.6.4/Makefile --- bfm-0.6.3/Makefile 2004-01-03 08:12:25.000000000 +0000 +++ bfm-0.6.4/Makefile 2004-07-24 03:56:11.000000000 +0100 @@ -13,11 +13,11 @@ EXTRA += -DENABLE_MEMSCREEN EXTRA += -DENABLE_FISH EXTRA += -DENABLE_TIME -# EXTRA += -DUPSIDE_DOWN_DUCK +EXTRA += -DUPSIDE_DOWN_DUCK # EXTRA += -DKDE_DOCKAPP # If building for Linux define the network device to monitor. -NET_DEVICE = ppp0 +NET_DEVICE = eth0 ############################################################################### diff -ru bfm-0.6.3/bubblemon.c bfm-0.6.4/bubblemon.c --- bfm-0.6.3/bubblemon.c 2004-01-03 08:12:26.000000000 +0000 +++ bfm-0.6.4/bubblemon.c 2004-07-24 16:53:52.000000000 +0100 @@ -76,7 +76,7 @@ */ #define _GNU_SOURCE -#define VERSION "0.6.3" +#define VERSION "0.6.4" /* general includes */ #include @@ -165,6 +165,11 @@ #ifdef ENABLE_FISH int fish_enabled = 1; int fish_traffic = 0; +#ifdef NET_DEVICE +char *network_interface = NET_DEVICE; +#else +char *network_interface = "eth0"; +#endif #endif #ifdef ENABLE_TIME @@ -319,32 +324,32 @@ "Usage: bubblefishymon [switches] [program_1] [program_2]\n\n" "Disable compiled-in features\n" #ifdef ENABLE_DUCK - " -d\tdisable swimming duck\n" + " -d\t\tdisable swimming duck\n" #ifdef UPSIDE_DOWN_DUCK - " -u\tdisable upside-down duck\n" + " -u\t\tdisable upside-down duck\n" #endif /* UPSIDE_DOWN_DUCK */ #endif /* ENABLE_DUCK */ #ifdef ENABLE_FISH - " -f\tdisable fish\n" + " -f\t\tdisable fish\n" #endif #ifdef ENABLE_CPU - " -c\tdisable CPU meter\n" + " -c\t\tdisable CPU meter\n" #endif /* ENABLE_CPU */ #ifdef ENABLE_MEMSCREEN - " -m\tdisable memory screen\n" + " -m\t\tdisable memory screen\n" #endif /* ENABLE_MEMSCREEN */ "\nGeneral options\n" #ifdef ENABLE_MEMSCREEN - " -p\tuse alternative color scheme in memory info screen\n" - " -k\tdisplay memory and swap statistics in megabytes\n" + " -p\t\tuse alternative color scheme in memory info screen\n" + " -k\t\tdisplay memory and swap statistics in megabytes\n" #endif #ifdef ENABLE_FISH - " -n\tfish represents network traffic\n" + " -n[iface]\tfish represents network traffic [on ]\n" #endif #ifdef ENABLE_TIME - " -t\tdraw the clock too\n" + " -t\t\tdraw the clock too\n" #endif - " -h\tdisplay this help\n", + " -h\t\tdisplay this help\n", options /* this is the global static string with compiled features */ ); } @@ -412,7 +417,7 @@ #ifdef ENABLE_FISH strcat(options, "FISH "); strcat(execute, "f"); - strcat(execute, "n"); + strcat(execute, "n::"); #endif #ifdef ENABLE_TIME strcat(options, "TIME "); @@ -485,6 +490,8 @@ break; case 'n': fish_traffic = 1; + if (optarg) + network_interface = optarg; break; #endif #ifdef ENABLE_TIME @@ -744,7 +751,6 @@ wmhints.window_group = win; wmhints.flags = StateHint | IconWindowHint | IconPositionHint | WindowGroupHint; - XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints); bm.gc = gdk_gc_new(bm.win); @@ -757,6 +763,8 @@ gdk_window_set_back_pixmap(bm.iconwin, bm.pixmap, False); gdk_window_show(bm.win); + + XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints); #endif #ifdef KDE_DOCKAPP /* makes the dockapp visible inside KDE wm */ diff -ru bfm-0.6.3/debian/README.Debian bfm-0.6.4/debian/README.Debian --- bfm-0.6.3/debian/README.Debian 2004-01-03 08:26:18.000000000 +0000 +++ bfm-0.6.4/debian/README.Debian 2004-07-24 03:52:17.000000000 +0100 @@ -1,7 +1,10 @@ bfm for Debian -------------- -Thanks go to Jamie Wilkinson, on account of how most of the package stuff is -'inspired' by his example with bfm-0.5.1 +Changed dockapp name from bfm to bubblefishymon. - -- Huw Giddens , Mon, 27 Oct 2003 21:39:29 +1300 +Gurkan recommends starting the docapp like so: + bubblefishymon -n "aterm -tr -sh 69 +sb -rv -fn lime" "gmc --nodesktop" +so clicking starts an aterm or a gmc. + + -- Jamie Wilkinson , Mon, 19 Aug 2002 10:50:39 +1000 diff -ru bfm-0.6.3/debian/changelog bfm-0.6.4/debian/changelog --- bfm-0.6.3/debian/changelog 2004-01-03 08:26:18.000000000 +0000 +++ bfm-0.6.4/debian/changelog 2004-07-24 03:56:53.000000000 +0100 @@ -1,53 +1,77 @@ bfm (0.6.3-1) unstable; urgency=low - * New upstream version. + * New upstream release, new upstream maintainer. + Thanks to James Rowe for taking on development. + Thanks to Huw Giddens for his unofficial packages in the 0.6.x series. + - Removed build-depends on libgtk1.2-dev. + - Updated copyright. + - Updated package descriptions. + - Removed man page from debian/ directory as it's now in upstream. + - Install new Xdefaults file into examples. + * Updated rules file with some shiny new shines. - -- James Rowe Sat, 08 Nov 2003 17:45:31 +0000 + -- Jamie Wilkinson Sat, 24 Jan 2004 12:40:18 +1100 -bfm (0.6.2-1) unstable; urgency=low +bfm (0.5.1-7) unstable; urgency=low - * New upstream version. + * Applied patch from Huw Giddens to finally fix the memory usage routines + for 2.6 kernels that still works for 2.4 kernels. Thanks Huw. + (Closes: #175140) - -- James Rowe Sat, 08 Nov 2003 17:40:12 +0000 + -- Jamie Wilkinson Mon, 27 Oct 2003 19:07:11 +1100 -bfm (0.6.1-1) unstable; urgency=low +bfm (0.5.1-6) unstable; urgency=low - * New upstream version. + * The "stirring words from the DPL" release. + * Added -fPIC to gkrellm2 target. Fixes FTBFS on hppa and others. - -- Huw Giddens Wed, 05 Nov 2003 13:06:29 +1300 + -- Jamie Wilkinson Thu, 23 Jan 2003 17:33:56 +0800 -bfm (0.6.0-5) unstable; urgency=low +bfm (0.5.1-5) unstable; urgency=low - * Added missing copyright text to fishmon.c - * Corrected code used to keep fish in the water so that it actually works. + * The "promised I'd fix bugs while at LCA" release. + * Recompiled against gkrellm 2 now that gkrellm 1 has been removed from + the archive. (Closes: #159645) + Patch thanks to Sjoerd Simons. + * Fixed installation path of gkrellm plugin. - -- Huw Giddens Tue, 28 Oct 2003 20:56:29 +1300 + -- Jamie Wilkinson Thu, 23 Jan 2003 13:02:17 +0800 -bfm (0.6.0-4) unstable; urgency=low +bfm (0.5.1-4) unstable; urgency=low - * If can't open /proc/meminfo, proceed safely rather than over a cliff. - * Add comments to sys_linux.c re: changes I've made. + * Bumped standards version to 3.5.8.0. + * Set DH_COMPAT to 4. - -- Huw Giddens Mon, 27 Oct 2003 23:30:29 +1300 + -- Jamie Wilkinson Sat, 30 Nov 2002 12:23:53 +1100 -bfm (0.6.0-3) unstable; urgency=low +bfm (0.5.1-3) unstable; urgency=low - * Add other recommends &c. to control file. + * Applied gkrellm2 patch from Sjoerd Simons + (Closes: #159645) + * Moved example Xdefaults file from docs to examples. + * Fixed manpage section. - -- Huw Giddens Mon, 27 Oct 2003 22:54:29 +1300 + -- Jamie Wilkinson Fri, 6 Sep 2002 18:54:32 +1000 -bfm (0.6.0-2) unstable; urgency=low +bfm (0.5.1-2) unstable; urgency=low - * Added missing build deps to gkrellm-bfm. + * Added -fPIC to the gkrellm plugin CFLAGS. + * Added to sys_linux.c. - -- Huw Giddens Mon, 27 Oct 2003 22:50:29 +1300 + -- Jamie Wilkinson Mon, 26 Aug 2002 18:58:21 +1000 -bfm (0.6.0-1) unstable; urgency=low +bfm (0.5.1-1) unstable; urgency=low + + * New upstream version. + * Initial upload into Debian. (Closes: #157218) + * Reworded manpage. + * Fixed Build-Depends. + + -- Jamie Wilkinson Mon, 19 Aug 2002 10:50:39 +1000 + +bubblefishymon (0.3-1) unstable; urgency=low * Initial Release. - * Changed Makefile to make the gkrellm plugin by default. - * Changed the code in sys_linux.c that reads the memory info from - /proc/meminfo to code that works in 2.4 and 2.6. - -- Huw Giddens Mon, 27 Oct 2003 21:39:29 +1300 + -- Gurkan Sengun Sun, 30 Sep 2001 18:35:20 +0200 diff -ru bfm-0.6.3/debian/control bfm-0.6.4/debian/control --- bfm-0.6.3/debian/control 2004-01-03 08:26:18.000000000 +0000 +++ bfm-0.6.4/debian/control 2004-07-24 03:52:17.000000000 +0100 @@ -1,23 +1,22 @@ Source: bfm Section: x11 Priority: optional -Maintainer: Huw Giddens -Build-Depends: debhelper (>= 4.0.0), gkrellm, libgtk2.0-dev -Standards-Version: 3.6.0 +Maintainer: Jamie Wilkinson +Build-Depends: debhelper (>> 4.0.0), gkrellm, libgtk2.0-dev +Standards-Version: 3.6.1.0 Package: bubblefishymon Architecture: any Depends: ${shlibs:Depends} -Description: A system load dockapp, based on bubblemon +Description: system load dockapp with a duck A load monitor dockapp, descended from wmfishtime and bubblemon. - Features include fish representing network traffic, bubbles representing CPU - usage, and a duck representing a duck. + Features include fish representing network traffic, bubbles representing + CPU usage, and a duck representing a duck. Package: gkrellm-bfm Architecture: any Depends: ${shlibs:Depends} -Recommends: gkrellm -Description: A system load plugin for gkrellm - A load monitor for gkrellm, descended from wmfishtime and bubblemon. - Features include fish representing network traffic, bubbles representing CPU - usage, and a duck representing a duck. +Description: system load plugin for gkrellm with a duck + A load monitor plugin for gkrellm, descended from wmfishtime and bubblemon. + Features include fish representing network traffic, bubbles representing + CPU usage, and a duck representing a duck. diff -ru bfm-0.6.3/debian/copyright bfm-0.6.4/debian/copyright --- bfm-0.6.3/debian/copyright 2004-01-03 08:26:58.000000000 +0000 +++ bfm-0.6.4/debian/copyright 2004-07-24 03:52:17.000000000 +0100 @@ -1,5 +1,5 @@ -This package was debianized by Huw Giddens on -Mon, 27 Oct 2003 21:39:29 +1300. +This package was debianized by Jamie Wilkinson on +Mon, 19 Aug 2002 10:50:39 +1000. It was downloaded from http://www.jnrowe.ukfsn.org/projects/bfm.html @@ -7,4 +7,19 @@ Copyright: -See /usr/share/common-licenses/GPL + This package 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; version 2 dated June, 1991. + + This package 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., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. diff -ru bfm-0.6.3/debian/rules bfm-0.6.4/debian/rules --- bfm-0.6.3/debian/rules 2004-01-03 08:26:18.000000000 +0000 +++ bfm-0.6.4/debian/rules 2004-07-24 03:52:17.000000000 +0100 @@ -1,28 +1,25 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 -# Uncomment this to turn on verbose mode. +# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This has to be exported to make some magic below work. -export DH_OPTIONS - - +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 + CFLAGS += -O0 else - CFLAGS += -O2 + CFLAGS += -O2 +endif +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s + INSTALL_PROGRAM += -s endif configure: configure-stamp @@ -30,86 +27,62 @@ dh_testdir touch configure-stamp - -#Architecture -build: build-arch build-indep - -build-arch: build-arch-stamp -build-arch-stamp: configure-stamp - - # Add here commands to compile the arch part of the package. - $(MAKE) bubblefishymon - $(MAKE) gkrellm - touch build-arch-stamp - -build-indep: build-indep-stamp -build-indep-stamp: configure-stamp - - # Add here commands to compile the indep part of the package. - #$(MAKE) doc - touch build-indep-stamp +build: configure-stamp build-stamp +build-stamp: + dh_testdir + $(MAKE) PREFIX=/usr bubblefishymon + $(MAKE) PREFIX=/usr gkrellm + touch build-stamp clean: dh_testdir dh_testroot - rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# - - # Add here commands to clean up after the build process. + rm -f build-stamp configure-stamp -$(MAKE) clean + dh_clean - dh_clean - -install: install-arch -install-arch: - dh_testdir - dh_testroot - dh_clean -k -s --exclude ./ChangeLog.orig - dh_installdirs -s - - # Add here commands to install the arch part of the package into - # debian/tmp. - $(MAKE) install PREFIX=/usr DESTDIR=$(CURDIR)/debian/bubblefishymon - cp gkrellm-bfm.so $(CURDIR)/debian/gkrellm-bfm/usr/lib/gkrellm2/plugins/ - - dh_install -s -# Must not depend on anything. This is to be called by -# binary-arch/binary-indep -# in another 'make' thread. -binary-common: +install: DH_OPTIONS= +install: build dh_testdir dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -# Build architecture independant packages using the common target. -binary-indep: build-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + dh_clean -k + dh_installdirs + $(MAKE) PREFIX=/usr install DESTDIR=$(CURDIR)/debian/bubblefishymon + cp gkrellm-bfm.so $(CURDIR)/debian/gkrellm-bfm/usr/lib/gkrellm2/plugins + +# Build architecture-independent files here. +binary-indep: build install +# nothing to do + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a +# dh_installdebconf -a + dh_installdocs -a + dh_installexamples -a + dh_installmenu -a +# dh_installlogrotate -a +# dh_installemacsen -a +# dh_installpam -a +# dh_installmime -a +# dh_installinit -a +# dh_installcron -a + dh_installman -a doc/bubblefishymon.1 +# dh_installinfo -a +# dh_undocumented -a + dh_installchangelogs -a ChangeLog + dh_strip -a + dh_link -a + dh_compress -a + dh_fixperms -a +# dh_makeshlibs -a + dh_installdeb -a +# dh_perl -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a -binary: binary-arch -.PHONY: build clean binary-arch binary install install-arch configure +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff -ru bfm-0.6.3/gkrellm-bfm.c bfm-0.6.4/gkrellm-bfm.c --- bfm-0.6.3/gkrellm-bfm.c 2004-01-03 08:12:42.000000000 +0000 +++ bfm-0.6.4/gkrellm-bfm.c 2004-07-24 16:54:02.000000000 +0100 @@ -33,7 +33,7 @@ #include #include -#define PLUGIN_VERSION "0.6.3" +#define PLUGIN_VERSION "0.6.4" #define PLUGIN_NAME "gkrellm-bfm" #define PLUGIN_DESC "bubblefishymon gkrellm port" diff -ru bfm-0.6.3/sys_linux.c bfm-0.6.4/sys_linux.c --- bfm-0.6.3/sys_linux.c 2004-01-03 08:12:26.000000000 +0000 +++ bfm-0.6.4/sys_linux.c 2004-07-24 03:56:11.000000000 +0100 @@ -101,15 +101,12 @@ else if (strcmp(name, "SwapCached:") == 0) swap_cache = value; } fclose(mem); + + mem_used = mem_max - ( mem_used + mem_cache + mem_buffers ); - mem_used = (mem_max - mem_used) + (swap_max - swap_used) - - (mem_cache + mem_buffers + swap_cache); - if (mem_used > mem_max) { - swap_used = mem_used - mem_max; - mem_used = mem_max; - } else { - swap_used = 0; - } + if( mem_used > mem_max ) mem_used = mem_max; + + swap_used = swap_max - swap_used; /* proc reports usage in kb, bm wants it in bytes. */ bm.mem_used = 1024 * mem_used; @@ -165,6 +162,7 @@ int delay; extern int fish_traffic; +extern char *network_interface; void get_traffic(void); int net_tx_speed(void) @@ -215,7 +213,7 @@ /* I love sscanf! :) */ sscanf(buffer, "%*[ ]%[^:]:%*d %Ld %*d %*d %*d %*d %*d %*d %*d %Ld %*d %*d %*d %*d %*d %*d", name, &rx_amount, &tx_amount); - if(!strcmp(name, NET_DEVICE)) + if(!strcmp(name, network_interface)) { /* Incoming traffic */ if(rx_amount != last_rx_amount)