[bustle] 02/02: Imported Debian patch 0.5.2-1

Hector Oron zumbi at moszumanska.debian.org
Sun Jan 10 11:02:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

zumbi pushed a commit to branch master
in repository bustle.

commit db5983f8ae26e89ef7d6d570f0e4db8c82963a59
Merge: a398a22 47e05d0
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Fri Jan 8 13:12:52 2016 +0100

    Imported Debian patch 0.5.2-1

 Bustle/Application/Monad.hs |   3 +-
 Bustle/Loader.hs            |   6 +-
 Bustle/Loader/OldSkool.hs   |  12 +-
 Bustle/Noninteractive.hs    |   4 +-
 Bustle/Renderer.hs          |   2 +-
 Bustle/UI.hs                | 148 ++++++++------
 Bustle/UI/AboutDialog.hs    |  12 +-
 Bustle/UI/Canvas.hs         |  35 ++--
 Bustle/UI/FilterDialog.hs   |  28 ++-
 Bustle/UI/OpenTwoDialog.hs  |  17 +-
 Bustle/UI/Recorder.hs       |  48 +++--
 Bustle/UI/Util.hs           |   2 +-
 Bustle/VariantFormatter.hs  |   2 +
 GetText.hs                  | 220 +++++++++++++++++++++
 LICENSE.bundled-libraries   |   4 +-
 Makefile                    |  21 +-
 NEWS.md                     |  26 ++-
 README.md                   |   2 +-
 Setup.hs                    |  31 +--
 Test/Regions.hs             |   3 +
 Test/Renderer.hs            |   1 +
 bustle.cabal                |  39 +++-
 data/OpenTwoDialog.ui       | 133 +++++++++++++
 data/bustle.ui              | 461 ++++++++++++++++----------------------------
 debian/changelog            |   9 +
 debian/control              |   2 +-
 debian/patches/series       |   2 +-
 debian/rules                |   2 +-
 debian/watch                |   3 +-
 29 files changed, 800 insertions(+), 478 deletions(-)

diff --cc debian/changelog
index cfc072e,0000000..a5a3b48
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,145 -1,0 +1,154 @@@
++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 at debian.org>  Fri, 08 Jan 2016 13:12:52 +0100
++
 +bustle (0.4.8-1) unstable; urgency=medium
 +
 +  * New upstream release 
 +
 + -- Joachim Breitner <nomeata at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at debian.org>  Sun, 08 Mar 2009 04:03:30 +0000
 +
 +bustle (0.1-1) unstable; urgency=low
 +
 +  * Initial release. (Closes: #511111)
 +
 + -- Chris Lamb <lamby at debian.org>  Thu, 08 Jan 2009 00:03:25 +0000
diff --cc debian/control
index 1bfd1cd,0000000..4aad00c
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,55 -1,0 +1,55 @@@
 +Source: bustle
 +Section: devel
 +Priority: optional
 +Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 +Uploaders: Hector Oron <zumbi at debian.org>, Iain Lane <laney at debian.org>
 +         , Louis Bettens <louis at bettens.info>
 +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-gtk-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: 3.9.5
 +Homepage: http://willthompson.co.uk/bustle/
 +Vcs-Git: git://anonscm.debian.org/pkg-haskell/bustle.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-haskell/bustle.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.4.7-3~)
 +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.
diff --cc debian/patches/series
index 98ec6fb,0000000..da5a43a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
- 0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
++##0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
 +use-system-usr-prefix.patch
diff --cc debian/rules
index 6c84f82,0000000..885d33f
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,25 -1,0 +1,25 @@@
 +#!/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
++	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
diff --cc debian/watch
index 93d87c5,0000000..2ba5f9f
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,3 @@@
 +version=3
- http://www.willthompson.co.uk/bustle/releases/(\d+.)+/ bustle-(.*).tar.gz
++##http://www.willthompson.co.uk/bustle/releases/(\d+.)+/ bustle-(.*).tar.gz
++http://www.freedesktop.org/software/bustle/(\d+.)+/ bustle-(.*).tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/bustle.git



More information about the Pkg-haskell-commits mailing list