Skip to content
Commits on Source (77)
debian/tmp/usr/share/man/man1/bustle-pcap.1
.TH BUSTLE-DBUS-MONITOR 1 "January 8, 2009"
.SH NAME
bustle \- D-Bus visualiser
.SH SYNOPSIS
.B bustle
.RI logfile
.SH DESCRIPTION
Bustle is a tool to chart and provide timing information of D-Bus calls for
profiling and debugging. It is intended to replace reading the cryptic output
of \fBdbus-monitor\fP. Calls are displayed using Message Sequence Charts, a
succinct way of representing entities and interactions over time.
.PP
You may generate a dump using \fBbustle-pcap\fP and pass its filename as an
argument to this command to visualise dbus calls saved previously.
.SH AUTHOR
\fBbustle\fP was written by Will Thompson <will.thompson@collabora.co.uk>.
.PP
This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
project (but may be used by others).
usr/bin/bustle
usr/share/appdata/*
usr/share/applications/*
usr/share/bustle/data/*
usr/share/icons/*
bustle (0.5.4-2) UNRELEASED; urgency=medium
* Set Rules-Requires-Root to no.
* Switch Vcs-* fields to salsa.
-- Clint Adams <clint@debian.org> Mon, 07 May 2018 21:07:46 -0400
bustle (0.5.4-1) unstable; urgency=medium
* New upstream version 0.5.4
* debian/watch: improve regex and use https url
* move bustle-pcap man file into bustle-pcap package. (Closes: #783689)
* debian/patches:
- drop 0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
(upstreamed)
- add 0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch
(taken from upstream)
* debian/bustle.install: avoid redundant copyright files
* debian/compat: bump to version 9
* debian/control: Update my uploader name
* debian/control: bump standards version. No changes
* debian/control: update bustle-pcap replaces due to manpage move.
-- Héctor Orón Martínez <zumbi@debian.org> Sun, 11 Dec 2016 23:57:16 +0100
bustle (0.5.2-1) unstable; urgency=medium
* New upstream release
* Fixes FTBFS: Bustle/Loader/OldSkool.hs:122:23: Ambiguous occurrence `<*>'
(Closes: #808017)
* d/watch: update for new URL.
-- Héctor Orón Martínez <zumbi@debian.org> Fri, 08 Jan 2016 13:12:52 +0100
bustle (0.4.8-1) unstable; urgency=medium
* New upstream release
-- Joachim Breitner <nomeata@debian.org> Fri, 22 May 2015 09:47:01 +0200
bustle (0.4.7-3) unstable; urgency=medium
[ Ted Gould ]
* d/control: Split out bustle-pcap into its own binary package. (Closes:
#772148)
[ Iain Lane ]
* Add Breaks/Replaces for file move.
-- Ted Gould <ted@gould.cx> Wed, 21 Jan 2015 17:37:02 +0000
bustle (0.4.7-2) unstable; urgency=medium
* d/control: really build depend on intltool
-- Hector Oron <zumbi@debian.org> Wed, 24 Sep 2014 02:01:59 +0200
bustle (0.4.7-1) unstable; urgency=medium
* New upstream release.
* d/control: bump standards version
* d/control: build depend on haskell gettext
* d/control: build depend on intltool
* d/patches/use-system-usr-prefix.patch: refresh
-- Hector Oron <zumbi@debian.org> Wed, 24 Sep 2014 00:11:06 +0200
bustle (0.4.2-2) unstable; urgency=low
* /usr/share/bustle-0.4.2 -> /usr/share/bustle
-- Louis Bettens <louis@bettens.info> Wed, 31 Jul 2013 17:30:43 +0200
bustle (0.4.2-1) unstable; urgency=low
* [10d8853] Imported Upstream version 0.4.2
- The Makefile now respects the `DESTDIR` variable.
- No more deprecation warnings about `g_thread_create()`!
- We explicitly check for GLib ≥ 2.26.
* [118bcd9] debian/watch: Update to match upstream URL scheme
* [bd39b44] d/control: Check for glib-2.26 per upstream
* [ffc40ed] d/rules: Pass -threaded if we don't have the threaded runtime available
* [9a6ba27] Remove 0001-Makesfile-respect-DESTDIR.patch, applied upstream
and refresh 0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
-- Iain Lane <iain.lane@canonical.com> Mon, 19 Nov 2012 11:10:26 +0000
bustle (0.4.1-1) unstable; urgency=low
* New upstream release.
(Closes: #693215)
* Drop build dep on deprecated haskell-dbus-core.
* Build depend on haskell-pcap-dev.
* Add build-dep-indep on help2man.
* Drop bustle strict dependency on bustle-dbus-monitor.
* Don't use the libghc6* dummy packages but depend on the real ones.
* Don't link the haskell98 package.
* Added myself to debian/copyright and debian/control
-- Hector Oron <zumbi@debian.org> Wed, 14 Nov 2012 12:20:58 +0100
bustle (0.2.5-1) unstable; urgency=low
* New upstream release.
* Update debian/copyright.
-- Chris Lamb <lamby@debian.org> Tue, 28 Jun 2011 19:43:42 +0100
bustle (0.2.4-1) unstable; urgency=low
* New upstream release (Closes: #630979)
* Add Homepage field. (Closes: #630978)
* Bump Standards-Version to 3.9.2.
-- Chris Lamb <lamby@debian.org> Sun, 19 Jun 2011 13:45:10 +0100
bustle (0.2.3-1) unstable; urgency=low
* New upstream release.
* Update Vcs-{Git,Browser}.
* Bump Standards-Version to 3.9.1.
-- Chris Lamb <lamby@debian.org> Sat, 26 Feb 2011 23:18:51 +0000
bustle (0.2.2-1) unstable; urgency=low
* New upstream release (Closes: #587132)
- Add libghc6-glade-dev to Build-Depends.
* Move to dpkg v3 source format.
* Bump Standards-Version to 3.8.4.
-- Chris Lamb <lamby@debian.org> Wed, 30 Jun 2010 14:31:43 +0100
bustle (0.2.1-1) unstable; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Remove extra LICENSE file installed to /usr/share/bustle-$VER.
-- Chris Lamb <lamby@debian.org> Fri, 04 Dec 2009 21:02:14 +0000
bustle (0.2.0-2) unstable; urgency=low
* Update Build-Depends to use Parsec 3. (Closes: #534091)
* Bump Standards-Version to 3.8.2.
-- Chris Lamb <lamby@debian.org> Thu, 25 Jun 2009 12:28:54 +0100
bustle (0.2.0-1) unstable; urgency=low
* New upstream release.
* Update debian/watch.
* Add Suggests: on graphviz and add update long description to reflect
new 'dot' output.
* debian/patches:
- Drop 01-bustle-gdk-events.diff - merged upstream.
- Drop 02-bustle-ambiguous-exception.diff - different fix made upstream.
* Remove quilt patch machinery as we have no local patches.
* Bump Standards-Version to 3.8.1.
* Add manpages for bustle-{count,dot,time}.1.
-- Chris Lamb <lamby@debian.org> Mon, 06 Apr 2009 00:08:14 +0100
bustle (0.1-2) unstable; urgency=low
* Don't call runhaskell; GHCI isn't available on all archs (Closes: #517706)
* Add patches for GHC 6.10 compatibility. (Closes: #518746)
- Bump Build-Depends to ghc6 (>= 6.10)
* Move to more "minimal" debian/rules file.
- Bump Build-Depends on debhelper to 7.0.50 for this feature.
* Update Git repository locations.
-- Chris Lamb <lamby@debian.org> Sun, 08 Mar 2009 04:03:30 +0000
bustle (0.1-1) unstable; urgency=low
* Initial release. (Closes: #511111)
-- Chris Lamb <lamby@debian.org> Thu, 08 Jan 2009 00:03:25 +0000
Source: bustle
Section: devel
Priority: optional
Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Uploaders: Héctor Orón Martínez <zumbi@debian.org>, Iain Lane <laney@debian.org>
, Louis Bettens <louis@bettens.info>
Rules-Requires-Root: no
Build-Depends: debhelper (>= 7.0.50)
, ghc (>= 6.10)
, pkg-config
, libdbus-1-dev
, libglib2.0-dev (>= 2.26)
, libghc-mtl-dev
, libghc-cairo-dev
, libghc-gtk3-dev (>= 0.13.7)
, libghc-parsec3-dev
, libpcap0.8-dev
, libghc-dbus-dev
, libghc-pcap-dev
, libghc-hgettext-dev
, help2man
, intltool
Standards-Version: 4.1.4
Homepage: http://willthompson.co.uk/bustle/
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/bustle
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git
Package: bustle
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: bustle-pcap
Suggests: graphviz
Description: D-Bus activity visualiser
Bustle is a tool to chart and provide timing information of D-Bus
calls for profiling and debugging purposes. It is intended to replace
reading the cryptic output of dbus-monitor.
.
Calls are displayed using Message Sequence Charts, a succinct way of
representing entities and interactions over time. It can also output
data in Graphviz format.
.
This package contains the graphical visualizer for traces generated
with the bustle-pcap tool in the bustle-pcap package.
Package: bustle-pcap
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: bustle (<< 0.4.7-3~)
Replaces: bustle (<< 0.5.4-1~)
Description: D-Bus traffic capture tool for the pcap format
Bustle is a tool to chart and provide timing information of D-Bus
calls for profiling and debugging purposes. It is intended to replace
reading the cryptic output of dbus-monitor.
.
This package contains the capture tool which will capture the D-Bus
traffic into a pcap file that can be visualized using Bustle.
Author: Will Thompson <will.thompson@collabora.co.uk>
Download: http://www.willthompson.co.uk/bustle/releases/
Files: *
Copyright: (C) 2008-2011 © Collabora Ltd. <http://www.collabora.co.uk>
License: LGPL-2.1+
Files: bustle-dbus-monitor.c
Copyright:
© 2003 Philip Blundell <philb@gnu.org>
© 2008-2011 Collabora Ltd. <http://www.collabora.co.uk>
License: GPL-2+
Files: dfeet-{method,signal}.png
Copyright:
© 2003, 2004, 2005, 2006 Red Hat Inc. <http://www.redhat.com/>
© 2003 David Zeuthen
© 2004 Rob Taylor
© 2005, 2006 Collabora Ltd. <http://www.collabora.co.uk/>
License: GPL-2+
Files: debian/*
Copyright: © 2008, 2009, 2010, 2011 Chris Lamb <lamby@debian.org>
© 2012 Hector Oron Martinez <zumbi@debian.org>
License: LGPL-2.1+
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, or (at your option)
any later version.
.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'
From 5051295aae3d85f6052568c8c86e4ef16c884b21 Mon Sep 17 00:00:00 2001
From: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date: Thu, 28 Jan 2016 15:07:43 +0000
Subject: [PATCH] bustle-pcap: stop leaking so much in parse_arguments()
---
c-sources/bustle-pcap.c | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/c-sources/bustle-pcap.c b/c-sources/bustle-pcap.c
index f68553a..29082c3 100644
--- a/c-sources/bustle-pcap.c
+++ b/c-sources/bustle-pcap.c
@@ -109,6 +109,7 @@ parse_arguments (
gchar *usage;
GError *error = NULL;
gboolean ret;
+ gint exit_status = -1;
context = g_option_context_new ("FILENAME");
g_option_context_add_main_entries (context, entries, NULL);
@@ -121,7 +122,9 @@ parse_arguments (
{
fprintf (stderr, "%s\n", error->message);
fprintf (stderr, "%s", usage);
- exit (2);
+
+ exit_status = 2;
+ goto out;
}
if (version)
@@ -130,13 +133,17 @@ parse_arguments (
fprintf (stdout, "Copyright 2011 Will Thompson <will@willthompson.co.uk>\n");
fprintf (stdout, "This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n");
fprintf (stdout, "Written by Will Thompson <will@willthompson.co.uk>\n");
- exit (0);
+
+ exit_status = 0;
+ goto out;
}
else if (session_specified && system_specified)
{
fprintf (stderr, "You may only specify one of --session and --system\n");
fprintf (stderr, "%s", usage);
- exit (2);
+
+ exit_status = 2;
+ goto out;
}
else if (system_specified)
{
@@ -153,10 +160,21 @@ parse_arguments (
{
fprintf (stderr, "You must specify exactly one output filename\n");
fprintf (stderr, "%s", usage);
- exit (2);
+
+ exit_status = 2;
+ goto out;
}
- *filename = filenames[0];
+ *filename = g_strdup (filenames[0]);
+
+out:
+ g_free (usage);
+ g_strfreev (filenames);
+ g_option_context_free (context);
+ g_clear_error (&error);
+
+ if (exit_status > -1)
+ exit (exit_status);
}
static void
@@ -196,6 +214,7 @@ main (
if (pcap == NULL)
{
fprintf (stderr, "%s", error->message);
+ g_clear_error (&error);
exit (1);
}
@@ -214,6 +233,7 @@ main (
bustle_pcap_monitor_stop (pcap);
g_object_unref (pcap);
+ g_free (filename);
return 0;
}
--
2.7.0.rc3
use-system-usr-prefix.patch
0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
bustle (0.4.7-1) unstable; urgency=medium
.
* New upstream release.
Author: Hector Oron <zumbi@debian.org>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- bustle-0.4.7.orig/Makefile
+++ bustle-0.4.7/Makefile
@@ -3,7 +3,7 @@ DBUS_FLAGS = $(shell pkg-config --cflags
GIO_FLAGS := $(shell pkg-config --cflags --libs 'glib-2.0 >= 2.26' gio-2.0 gio-unix-2.0)
PCAP_FLAGS := $(shell pcap-config --cflags pcap-config --libs)
DESTDIR =
-PREFIX = /usr/local
+PREFIX = /usr
BINDIR = $(DESTDIR)$(PREFIX)/bin
DATADIR = $(DESTDIR)$(PREFIX)/share
MAN1DIR = $(DATADIR)/man/man1
#!/usr/bin/make -f
# export DH_VERBOSE=1
#
THREADED := $(if $(wildcard /usr/lib/*/libHSrts_thr.a),,-f-threaded)
%:
dh $@
clean:
dh $@
[ ! -f ./setup ] || ./setup clean
rm -rf bustle-pcap dist setup Setup.hi Setup.o GetText.o GetText.hi
override_dh_auto_configure:
ghc -package Cabal Setup.hs -o setup
./setup configure --prefix /usr $(THREADED) --datasubdir=bustle
override_dh_auto_build:
$(MAKE)
./setup build
override_dh_install:
./setup copy --destdir debian/tmp
dh_install
version=3
##http://www.willthompson.co.uk/bustle/releases/(\d+.)+/ bustle-(.*).tar.gz
https://www.freedesktop.org/software/bustle/([\d].*)/ bustle-([\d].*)\.tar\.gz