[Pkg-haskell-commits] [bustle] 02/06: Merge tag 'upstream/0.4.7'

[Hector Oron]

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

zumbi pushed a commit to branch master
in repository bustle.

commit b5b920bbfabc159a6655b53fb3d6226fe114fe57
Merge: 0a2e0df 9ba4748
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Wed Sep 24 00:02:07 2014 +0200

    Merge tag 'upstream/0.4.7'
    
    Upstream version 0.4.7
    
    # gpg: Signature made Wed 24 Sep 2014 00:02:07 CEST using RSA key ID 76E2AC7B
    # gpg: Good signature from "Hector Oron Martinez (zumbi) <hector.oron at gmail.com>"
    # gpg:                 aka "Hector Oron Martinez (K2M) <hector.oron at tsc.upc.edu>"
    # gpg:                 aka "Hector Oron Martinez (debian) <zumbi at debian.org>"
    # gpg:                 aka "Hector Oron Martinez <hector.oron at collabora.co.uk>"
    # gpg:                 aka "Hector Oron Martinez <hector.oron at collabora.com>"

 Bustle.hs                      |   2 +
 Bustle/Application/Monad.hs    |  23 ++--
 Bustle/Diagram.hs              |   4 +-
 Bustle/Loader.hs               |   5 +-
 Bustle/Monitor.hs              |  11 +-
 Bustle/Noninteractive.hs       |   9 +-
 Bustle/StatisticsPane.hs       |  35 +++---
 Bustle/Translation.hs          |  25 ++++
 Bustle/UI.hs                   |  30 ++---
 Bustle/UI/AboutDialog.hs       |  15 +--
 Bustle/UI/DetailsView.hs       |  27 +++--
 Bustle/UI/FilterDialog.hs      |   5 +-
 Bustle/UI/Recorder.hs          |   8 +-
 Bustle/Util.hs                 |   3 +-
 INSTALL                        |  31 +++--
 Makefile                       |  57 +++++++--
 NEWS                           |  46 +++++++
 Setup.hs                       | 113 ++++++++++++++++-
 bustle.cabal                   |  38 ++++--
 bustle.sh                      |   3 +
 c-sources/bustle-pcap.c        |   4 +-
 c-sources/pcap-monitor.c       |  37 ++++--
 data/bustle.appdata.xml.in     |  24 ++++
 data/bustle.desktop.in         |   9 ++
 data/bustle.png                | Bin 1282 -> 0 bytes
 data/bustle.ui                 |  19 +--
 data/icons/16x16/bustle.png    | Bin 0 -> 519 bytes
 data/icons/22x22/bustle.png    | Bin 0 -> 716 bytes
 data/icons/256x256/bustle.png  | Bin 0 -> 8774 bytes
 data/icons/32x32/bustle.png    | Bin 0 -> 1049 bytes
 data/icons/48x48/bustle.png    | Bin 0 -> 1669 bytes
 data/icons/scalable/bustle.svg | 266 +++++++++++++++++++++++++++++++++++++++++
 po/en.po                       | 164 +++++++++++++++++++++++++
 po/messages.pot                | 157 ++++++++++++++++++++++++
 34 files changed, 1035 insertions(+), 135 deletions(-)

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