diff -Nru bustle-0.4.1/Makefile bustle-0.4.2/Makefile --- bustle-0.4.1/Makefile 2012-08-30 02:59:15.000000000 +0000 +++ bustle-0.4.2/Makefile 2012-11-14 15:19:34.000000000 +0000 @@ -1,10 +1,11 @@ CFLAGS = -g -O2 -Wall -Wunused DBUS_FLAGS = $(shell pkg-config --cflags --libs dbus-1) -GIO_FLAGS := $(shell pkg-config --cflags --libs glib-2.0 gio-2.0 gio-unix-2.0) +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 -BINDIR = $(PREFIX)/bin -MAN1DIR = $(PREFIX)/share/man/man1 +BINDIR = $(DESTDIR)$(PREFIX)/bin +MAN1DIR = $(DESTDIR)$(PREFIX)/share/man/man1 BINARIES = \ dist/build/bustle-pcap \ diff -Nru bustle-0.4.1/NEWS bustle-0.4.2/NEWS --- bustle-0.4.1/NEWS 2012-08-30 02:59:15.000000000 +0000 +++ bustle-0.4.2/NEWS 2012-11-14 15:19:34.000000000 +0000 @@ -1,3 +1,25 @@ +Bustle 0.4.2 (2012-11-14) +------------------------- + +This release is all about build fixes; nothing user-visible has changed. + +* The Makefile now respects the `DESTDIR` variable. +* No more deprecation warnings about `g_thread_create()`! +* We explicitly check for GLib ≥ 2.26. + +Also, there's now a `threaded` Cabal flag you can turn off if you're +building for some platform where the threaded GHC runtime isn't +available (such as S/390, MIPS or Sparc). This is the same approach used +to make several other packages build for those architectures in Debian, +as per [bug 541848][]. You can do something like this in your packaging: + + DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc-$(GHC_VERSION)/libHSrts_thr.a || echo --flags=-threaded) + +Bustle doesn't directly use Haskell-land threads, but I don't trust it +not to break in this configuration, so it's not the default. + +[bug 541848]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541848#33 + Bustle 0.4.1 (2012-08-29) ------------------------- @@ -12,7 +34,6 @@ * The front page now has two big buttons rather than some [lame instructions][fdo44889]. - * Memory usage should be a bit better, particularly for wide logs showing lots of applications. @@ -20,12 +41,9 @@ * You can now make a symlink to the launcher script and have it work properly. - * Bustle [builds with GHC 7.4.1][fdo47013] (courtesy of Sergei Trofimovich). - * `make clean` [works][fdo47908] in source tarballs. - * `bustle-pcap` now has a man page (courtesy of Alex Merry). [dbus]: http://hackage.haskell.org/package/dbus-0.10 diff -Nru bustle-0.4.1/bustle.cabal bustle-0.4.2/bustle.cabal --- bustle-0.4.1/bustle.cabal 2012-08-30 02:59:15.000000000 +0000 +++ bustle-0.4.2/bustle.cabal 2012-11-14 15:19:34.000000000 +0000 @@ -1,6 +1,6 @@ Name: bustle Category: Network, Desktop -Version: 0.4.1 +Version: 0.4.2 Cabal-Version: >= 1.8 Synopsis: Draw pretty sequence diagrams of D-Bus traffic Description: Draw pretty sequence diagrams of D-Bus traffic @@ -18,6 +18,7 @@ -- C bits c-sources/bustle-pcap.c, c-sources/pcap-monitor.h, + c-sources/config.h, Makefile, -- Stuff for nerds @@ -42,6 +43,10 @@ Description: Build interactive test programs Default: False +Flag threaded + Description: Build with the multi-threaded runtime + Default: True + Executable bustle Main-is: Bustle.hs Other-modules: Bustle.Application.Monad @@ -68,11 +73,12 @@ , Bustle.Upgrade , Bustle.Util , Bustle.VariantFormatter - Ghc-options: -threaded - -Wall + Ghc-options: -Wall -fno-warn-unused-do-bind + if flag(threaded) + ghc-options: -threaded C-sources: c-sources/pcap-monitor.c - pkgconfig-depends: glib-2.0 + pkgconfig-depends: glib-2.0 >= 2.26 Build-Depends: base >= 4 && < 5 , bytestring @@ -99,7 +105,8 @@ main-is: tests/Monitor.hs other-modules: Bustle.Monitor - Ghc-options: -threaded + if flag(threaded) + Ghc-options: -threaded C-sources: c-sources/pcap-monitor.c pkgconfig-depends: glib-2.0 Build-Depends: base >= 4 && < 5 diff -Nru bustle-0.4.1/c-sources/bustle-pcap.c bustle-0.4.2/c-sources/bustle-pcap.c --- bustle-0.4.1/c-sources/bustle-pcap.c 2012-08-30 02:59:15.000000000 +0000 +++ bustle-0.4.2/c-sources/bustle-pcap.c 2012-11-14 15:19:34.000000000 +0000 @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + #include #include #include diff -Nru bustle-0.4.1/c-sources/config.h bustle-0.4.2/c-sources/config.h --- bustle-0.4.1/c-sources/config.h 1970-01-01 00:00:00.000000000 +0000 +++ bustle-0.4.2/c-sources/config.h 2012-11-14 15:19:34.000000000 +0000 @@ -0,0 +1,25 @@ +/* config.h: some preprocessor goop for Bustle's C code. + * + * Copyright © 2012 Collabora Ltd. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef BUSTLE_CONFIG_H +#define BUSTLE_CONFIG_H + +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26 +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_30 + +#endif /* BUSTLE_CONFIG_H */ diff -Nru bustle-0.4.1/c-sources/pcap-monitor.c bustle-0.4.2/c-sources/pcap-monitor.c --- bustle-0.4.1/c-sources/pcap-monitor.c 2012-08-30 02:59:15.000000000 +0000 +++ bustle-0.4.2/c-sources/pcap-monitor.c 2012-11-14 15:19:34.000000000 +0000 @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "pcap-monitor.h" #include diff -Nru bustle-0.4.1/debian/changelog bustle-0.4.2/debian/changelog --- bustle-0.4.1/debian/changelog 2012-11-14 11:21:08.000000000 +0000 +++ bustle-0.4.2/debian/changelog 2012-11-19 11:21:20.000000000 +0000 @@ -1,3 +1,17 @@ +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 Mon, 19 Nov 2012 11:10:26 +0000 + bustle (0.4.1-1) unstable; urgency=low * New upstream release. diff -Nru bustle-0.4.1/debian/control bustle-0.4.2/debian/control --- bustle-0.4.1/debian/control 2012-11-14 11:01:02.000000000 +0000 +++ bustle-0.4.2/debian/control 2012-11-19 11:21:20.000000000 +0000 @@ -7,7 +7,7 @@ , ghc (>= 6.10) , pkg-config , libdbus-1-dev - , libglib2.0-dev + , libglib2.0-dev (>= 2.26) , libghc-mtl-dev , libghc-cairo-dev , libghc-gtk-dev diff -Nru bustle-0.4.1/debian/patches/0001-Makefile-respect-DESTDIR.patch bustle-0.4.2/debian/patches/0001-Makefile-respect-DESTDIR.patch --- bustle-0.4.1/debian/patches/0001-Makefile-respect-DESTDIR.patch 2012-09-03 15:04:27.000000000 +0000 +++ bustle-0.4.2/debian/patches/0001-Makefile-respect-DESTDIR.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -From 53070dfb17b60520169a20c2c72b0021144cb93f Mon Sep 17 00:00:00 2001 -From: Will Thompson -Date: Mon, 3 Sep 2012 10:41:06 -0400 -Subject: [PATCH 1/2] Makefile: respect DESTDIR - ---- - Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index d6062b2..9be9b4c 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,9 +2,10 @@ CFLAGS = -g -O2 -Wall -Wunused - DBUS_FLAGS = $(shell pkg-config --cflags --libs dbus-1) - GIO_FLAGS := $(shell pkg-config --cflags --libs glib-2.0 gio-2.0 gio-unix-2.0) - PCAP_FLAGS := $(shell pcap-config --cflags pcap-config --libs) -+DESTDIR = - PREFIX = /usr/local --BINDIR = $(PREFIX)/bin --MAN1DIR = $(PREFIX)/share/man/man1 -+BINDIR = $(DESTDIR)$(PREFIX)/bin -+MAN1DIR = $(DESTDIR)$(PREFIX)/share/man/man1 - - BINARIES = \ - dist/build/bustle-pcap \ --- -1.7.10 - diff -Nru bustle-0.4.1/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch bustle-0.4.2/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch --- bustle-0.4.1/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch 2012-09-03 15:04:27.000000000 +0000 +++ bustle-0.4.2/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch 2012-11-19 11:21:20.000000000 +0000 @@ -10,23 +10,11 @@ c-sources/pcap-monitor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/Makefile b/Makefile -index 9be9b4c..c2537b4 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - CFLAGS = -g -O2 -Wall -Wunused - DBUS_FLAGS = $(shell pkg-config --cflags --libs dbus-1) --GIO_FLAGS := $(shell pkg-config --cflags --libs glib-2.0 gio-2.0 gio-unix-2.0) -+GIO_FLAGS := $(shell pkg-config --cflags --libs 'glib-2.0 >= 2.32' gio-2.0 gio-unix-2.0) - PCAP_FLAGS := $(shell pcap-config --cflags pcap-config --libs) - DESTDIR = - PREFIX = /usr/local -diff --git a/c-sources/pcap-monitor.c b/c-sources/pcap-monitor.c -index c642813..cfcda5a 100644 +Index: b/c-sources/pcap-monitor.c +=================================================================== --- a/c-sources/pcap-monitor.c +++ b/c-sources/pcap-monitor.c -@@ -443,7 +443,7 @@ initable_init ( +@@ -444,7 +444,7 @@ return FALSE; } @@ -35,6 +23,3 @@ if (priv->thread == NULL) { g_prefix_error (error, "Couldn't spawn logging thread: "); --- -1.7.10 - diff -Nru bustle-0.4.1/debian/patches/series bustle-0.4.2/debian/patches/series --- bustle-0.4.1/debian/patches/series 2012-09-03 21:23:49.000000000 +0000 +++ bustle-0.4.2/debian/patches/series 2012-11-19 11:21:20.000000000 +0000 @@ -1,3 +1,2 @@ -0001-Makefile-respect-DESTDIR.patch 0002-Use-g_thread_try_new-rather-than-g_thread_create.patch use-usr-as-preifx.patch diff -Nru bustle-0.4.1/debian/patches/use-usr-as-preifx.patch bustle-0.4.2/debian/patches/use-usr-as-preifx.patch --- bustle-0.4.1/debian/patches/use-usr-as-preifx.patch 2012-11-14 10:34:13.000000000 +0000 +++ bustle-0.4.2/debian/patches/use-usr-as-preifx.patch 2012-11-19 11:21:20.000000000 +0000 @@ -25,10 +25,12 @@ Reviewed-By: Last-Update: ---- bustle-0.4.1.orig/Makefile -+++ bustle-0.4.1/Makefile -@@ -3,7 +3,7 @@ DBUS_FLAGS = $(shell pkg-config --cflags - GIO_FLAGS := $(shell pkg-config --cflags --libs 'glib-2.0 >= 2.32' gio-2.0 gio-unix-2.0) +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -3,7 +3,7 @@ + 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 diff -Nru bustle-0.4.1/debian/rules bustle-0.4.2/debian/rules --- bustle-0.4.1/debian/rules 2012-11-14 10:11:51.000000000 +0000 +++ bustle-0.4.2/debian/rules 2012-11-19 11:21:20.000000000 +0000 @@ -1,5 +1,8 @@ #!/usr/bin/make -f # export DH_VERBOSE=1 +# + +THREADED := $(if $(wildcard /usr/lib/*/libHSrts_thr.a),,-f-threaded) %: dh $@ @@ -11,7 +14,7 @@ override_dh_auto_configure: ghc -package Cabal Setup.hs -o setup - ./setup configure --prefix /usr + ./setup configure --prefix /usr $(THREADED) override_dh_auto_build: $(MAKE) diff -Nru bustle-0.4.1/debian/watch bustle-0.4.2/debian/watch --- bustle-0.4.1/debian/watch 2012-09-03 18:05:32.000000000 +0000 +++ bustle-0.4.2/debian/watch 2012-11-19 11:21:20.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://www.willthompson.co.uk/bustle/releases/(.*)/ bustle-(.*).tar.gz +http://www.willthompson.co.uk/bustle/releases/(\d+.)+/ bustle-(.*).tar.gz