--- bfm-0.6.4.orig/Makefile +++ bfm-0.6.4/Makefile @@ -14,7 +14,7 @@ EXTRA += -DENABLE_FISH EXTRA += -DENABLE_TIME EXTRA += -DUPSIDE_DOWN_DUCK -# EXTRA += -DKDE_DOCKAPP +EXTRA += -DKDE_DOCKAPP # If building for Linux define the network device to monitor. NET_DEVICE = eth0 @@ -27,11 +27,12 @@ # gtk cflags and gtk lib flags GTK_CFLAGS = $(shell gtk-config --cflags) -GTK_LIBS = $(shell gtk-config --libs) +GTK_LIBS = -lX11 $(shell gtk-config --libs) GTK2_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags) -GTK2_LIBS = $(shell pkg-config gtk+-2.0 --libs) +GTK2_LIBS = -lX11 $(shell pkg-config gtk+-2.0 --libs) +LIBS += -lm # optimization cflags #CFLAGS = -O3 -Wall ${EXTRA} @@ -53,7 +54,7 @@ GKRELLM_SRCS = gkrellm-bfm.c GKRELLM_OBJS = gkrellm-bfm.o GKRELLM_BFM = gkrellm-bfm.so -LDFLAGS = -shared -Wl +LDFLAGS = -shared STRIP = strip @@ -62,7 +63,6 @@ INSTALLMAN = -m 644 - # special things for Linux ifeq ($(OS), Linux) ifeq "$(NET_DEVICE)" "" @@ -80,14 +80,14 @@ ifeq ($(OS), FreeBSD) SRCS += sys_freebsd.c OBJS += sys_freebsd.o - LIBS = -lkvm + LIBS += -lkvm INSTALL = -c -g kmem -m 2755 -o root endif # special things for OpenBSD ifeq ($(OS), OpenBSD) OBJS += sys_openbsd.o - LIBS = `gtk-config --libs | sed "s/-lgtk//g"` + LIBS += `gtk-config --libs | sed "s/-lgtk//g"` endif #special things for SunOS @@ -110,7 +110,7 @@ CFLAGS += ${EXTRA} SRCS += sys_sunos.c OBJS += sys_sunos.o - LIBS = -lkstat -lm + LIBS += -lkstat INSTALL = -m 755 endif @@ -130,12 +130,12 @@ bubblefishymon: clean_obj $(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEFISHYMON) \ - $(LIBS) $(GTK2_LIBS) $(SRCS) + $(SRCS) $(LIBS) $(GTK2_LIBS) $(STRIP) $(BUBBLEFISHYMON) bubblefishymon1: clean_obj $(CC) $(GTK_CFLAGS) $(CFLAGS) -o $(BUBBLEFISHYMON) \ - $(LIBS) $(GTK_LIBS) $(SRCS) + $(SRCS) $(LIBS) $(GTK_LIBS) $(STRIP) $(BUBBLEFISHYMON) clean_obj: --- bfm-0.6.4.orig/debian/copyright +++ bfm-0.6.4/debian/copyright @@ -3,13 +3,19 @@ It was downloaded from http://www.jnrowe.ukfsn.org/projects/bfm.html -Upstream Author: James Rowe +Copyright: -Copyright: + Copyright (C) 1999 Merlin Hughes + Copyright (C) 1999-2000 Johan Walles + Copyright (C) 2001 Pigeon + Copyright (c) 2009 James Rowe + +License: 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. + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,8 +24,8 @@ 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. + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -On Debian GNU/Linux systems, the complete text of the GNU General +On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. + --- bfm-0.6.4.orig/debian/menu +++ bfm-0.6.4/debian/menu @@ -1,6 +1,6 @@ ?package(bubblefishymon):\ - needs=X11\ - section=Apps/System\ + needs="X11"\ + section="Applications/System/Monitoring"\ hints="Dockapp,System,Monitor"\ title="bubblefishymon"\ command="/usr/bin/bubblefishymon -n" --- bfm-0.6.4.orig/debian/changelog +++ bfm-0.6.4/debian/changelog @@ -1,3 +1,75 @@ +bfm (0.6.4-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Specifically link libm. (Closes: #713602). + * Fix ordering of libraries. (Closes: #616727). + + Thanks to Dave Walker for the fix. + + -- Barry deFreese Sun, 07 Jul 2013 04:02:09 -0400 + +bfm (0.6.4-5) unstable; urgency=low + + * Removed extraneous -Wl flag that cause FTBFS with GCC 4.7 + (Closes: #667112). + * Updated Standards-Version: 3.9.3 + + -- Mika Matsuzaki Tue, 03 Apr 2012 23:56:02 -0400 + +bfm (0.6.4-4) unstable; urgency=low + + * Fixed nostrip build option. (Closes: #436580) + * Fixed watch. (Closes: #450079) + * Fixed menu. + * Fixed FTBFS bug with binutils-gold. (Closes: #553959) + * Fixed black background in WindowMaker. (Closes: 555923) + * Updated to Standards-Version: 3.9.1 + * Removed the deprecated pseudo header for Homepage and turned it into a + regular debian/control field (Closes:#615303, #615318). + + -- Mika Matsuzaki Sat, 26 Feb 2011 20:44:58 -0500 + +bfm (0.6.4-3) unstable; urgency=low + + * New maintainer. + + -- Mika Matsuzaki Mon, 26 Feb 2007 01:12:17 -0500 + +bfm (0.6.4-2) unstable; urgency=low + + * Updated to Standards-Version: 3.6.2. + * Build-Depends on debhelper >=5 and updated debian/compat. + * Updated FSF address in debian/copyright file. + + -- Jose Carlos Medeiros Mon, 27 Mar 2006 17:05:41 -0300 + +bfm (0.6.4-1) unstable; urgency=low + + * New upstream release. (closes: #210313) + * New maintainer. (closes: #325047) + * Added debian/watch file. + * Updated man file. (closes: #241181) + + -- Jose Carlos Medeiros Thu, 29 Sep 2005 19:50:47 -0300 + +bfm (0.6.3-3) unstable; urgency=low + + * changed Maintainer to QA and orphaned the package + + -- Martin Wuertele Tue, 12 Jul 2005 13:51:57 +0300 + +bfm (0.6.3-2) unstable; urgency=low + + * Adopt bfm (closes: #253796), comaintaining with maxx@d.o. + * Move setting hints a bit down, as suggested in wmfire's + bug report #250937 (closes: #251507). + * Restore default of using eth0 with 'fish show network traffic'. + (closes: #241284). One of the recent versions changed that to + ppp0! + * Allow an optional value for -n to specify the network interface. + (closes: #159782). + + -- Peter Palfrader Tue, 13 Jul 2004 06:16:10 +0200 + bfm (0.6.3-1) unstable; urgency=low * New upstream release, new upstream maintainer. @@ -32,7 +104,7 @@ * 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 Sjörd Simons. + Patch thanks to Sjord Simons. * Fixed installation path of gkrellm plugin. -- Jamie Wilkinson Thu, 23 Jan 2003 13:02:17 +0800 @@ -68,10 +140,9 @@ * Fixed Build-Depends. -- Jamie Wilkinson Mon, 19 Aug 2002 10:50:39 +1000 - + bubblefishymon (0.3-1) unstable; urgency=low * Initial Release. -- Gurkan Sengun Sun, 30 Sep 2001 18:35:20 +0200 - --- bfm-0.6.4.orig/debian/compat +++ bfm-0.6.4/debian/compat @@ -1 +1 @@ -4 +5 --- bfm-0.6.4.orig/debian/watch +++ bfm-0.6.4/debian/watch @@ -0,0 +1,7 @@ +version=3 +http://www.jnrowe.ukfsn.org/projects/bfm.html../_downloads/bfm-(.*)\.tar\.bz2 + + + + + --- bfm-0.6.4.orig/debian/rules +++ bfm-0.6.4/debian/rules @@ -20,25 +20,31 @@ endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s + STRIP_PROGRAM = strip +else + STRIP_PROGRAM = true endif + configure: configure-stamp configure-stamp: dh_testdir touch configure-stamp -build: configure-stamp build-stamp +build: configure-stamp build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: dh_testdir - $(MAKE) PREFIX=/usr bubblefishymon - $(MAKE) PREFIX=/usr gkrellm + $(MAKE) PREFIX=/usr STRIP=$(STRIP_PROGRAM) bubblefishymon + $(MAKE) PREFIX=/usr STRIP=$(STRIP_PROGRAM) gkrellm touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - -$(MAKE) clean + $(MAKE) clean dh_clean install: DH_OPTIONS= @@ -58,27 +64,16 @@ 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_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 --- bfm-0.6.4.orig/debian/control +++ bfm-0.6.4/debian/control @@ -1,13 +1,15 @@ Source: bfm Section: x11 Priority: optional -Maintainer: Jamie Wilkinson -Build-Depends: debhelper (>> 4.0.0), gkrellm, libgtk2.0-dev -Standards-Version: 3.6.1.0 +Maintainer: Mika Matsuzaki +Uploaders: Ola Lundqvist +Build-Depends: debhelper (>= 5), gkrellm, libgtk2.0-dev +Standards-Version: 3.9.3 +Homepage: http://www.jnrowe.ukfsn.org/projects/bfm.html Package: bubblefishymon Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: system load dockapp with a duck A load monitor dockapp, descended from wmfishtime and bubblemon. Features include fish representing network traffic, bubbles representing @@ -15,8 +17,9 @@ Package: gkrellm-bfm Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} 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. + --- bfm-0.6.4.orig/doc/bubblefishymon.1 +++ bfm-0.6.4/doc/bubblefishymon.1 @@ -44,6 +44,9 @@ .B \-d disable swimming duck. .TP +.B \-u +disable upside-down duck. +.TP .B \-f disable fish. .TP @@ -59,6 +62,12 @@ .B \-k display memory and swap statistics in megabytes. .TP +.B \-n[iface] +fish represents network traffic [on ]. +.TP +.B \-t +draw the clock too. +.TP .B \-h display help. .SH SEE ALSO