[bustle] 02/09: New upstream version 0.5.4
Hector Oron
zumbi at moszumanska.debian.org
Sun Dec 11 23:04:34 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 144aebc97232522c5a77996e3524ec91bd6b8331
Author: Héctor Orón Martínez <zumbi at debian.org>
Date: Sun Dec 11 23:08:05 2016 +0100
New upstream version 0.5.4
---
Bustle/Loader/Pcap.hs | 3 +++
HACKING.md | 24 +++++++++++++++++++++++-
Makefile | 2 ++
NEWS.md | 13 +++++++++++++
bustle.cabal | 3 ++-
c-sources/pcap-monitor.c | 8 ++++++--
data/bustle.appdata.xml.in | 10 ++++++++--
data/bustle.desktop.in | 1 +
8 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/Bustle/Loader/Pcap.hs b/Bustle/Loader/Pcap.hs
index 26a8f5b..f59e902 100644
--- a/Bustle/Loader/Pcap.hs
+++ b/Bustle/Loader/Pcap.hs
@@ -254,4 +254,7 @@ readPcap :: FilePath
readPcap path = try $ do
p <- openOffline path
+ -- TODO: check link type header is DLT_DBUS or DLT_NULL (for
+ -- backwards-compatibility)
+
liftM partitionEithers $ evalStateT (mapBodies p convert) Map.empty
diff --git a/HACKING.md b/HACKING.md
index 4004521..c8268eb 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -10,5 +10,27 @@ bugs on <https://bugs.freedesktop.org/enter_bug.cgi?product=Bustle>.
In new code, try to follow
<https://github.com/tibbe/haskell-style-guide/blob/master/haskell-style.md>.
-Certain authors did not follow it in the past but it seems like a good kind of
+The author did not follow it in the past but it seems like a good kind of
thing to aim for.
+
+Releasing Bustle
+================
+
+* Ideally, automate the steps below
+* Update version number in `bustle.cabal`
+* Write news in `NEWS.md`
+
+```sh
+# Tag release, build and sign the tarballs
+make maintainer-make-release
+
+# Stick source and binaries on freedesktop.org
+mkdir x.y.z
+cp dist/bustle-x.y.z* x.y.z/
+scp -r x.y.z annarchy.freedesktop.org:/srv/www.freedesktop.org/www/software/bustle/
+
+# Upload source to Hackage
+cabal upload
+
+git push origin --tags master
+```
diff --git a/Makefile b/Makefile
index 459b2f2..132ed61 100644
--- a/Makefile
+++ b/Makefile
@@ -123,6 +123,8 @@ maintainer-make-release: bustle.cabal dist/build/autogen/version.txt
git tag -s -m 'Bustle '`cat dist/build/autogen/version.txt` \
bustle-`cat dist/build/autogen/version.txt`
make maintainer-binary-tarball
+ gpg --detach-sign --armor dist/bustle-`cat dist/build/autogen/version.txt`.tar.gz
+ gpg --detach-sign --armor dist/bustle-`cat dist/build/autogen/version.txt`-x86_64.tar.bz2
.travis.yml: bustle.cabal make_travis_yml.hs
./make_travis_yml.hs $< libpcap-dev libgtk-3-dev libcairo2-dev happy-1.19.4 alex-3.1.3 > $@
diff --git a/NEWS.md b/NEWS.md
index fced0fa..01fafd8 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,16 @@
+Bustle 0.5.4 (2016-01-27)
+-------------------------
+
+* A single-byte functional change!
+* Use `DLT_DBUS` link type in pcap files
+
+Bustle 0.5.3 (2016-01-11)
+-------------------------
+
+* No functional changes!
+* Add keywords to `.desktop` file
+* Update screenshots in `.appdata.xml` file
+
Bustle 0.5.2 (2015-08-18)
-------------------------
diff --git a/bustle.cabal b/bustle.cabal
index c6c79c0..30fe299 100644
--- a/bustle.cabal
+++ b/bustle.cabal
@@ -1,6 +1,6 @@
Name: bustle
Category: Network, Desktop
-Version: 0.5.2
+Version: 0.5.4
Cabal-Version: >= 1.18
Tested-With: GHC >= 7.8.4 && < 7.11
Synopsis: Draw sequence diagrams of D-Bus traffic
@@ -202,6 +202,7 @@ Test-suite test-regions
type: exitcode-stdio-1.0
main-is: Test/Regions.hs
other-modules: Bustle.Regions
+ default-language: Haskell2010
Build-Depends: base
, QuickCheck
diff --git a/c-sources/pcap-monitor.c b/c-sources/pcap-monitor.c
index c9623ae..0a19d96 100644
--- a/c-sources/pcap-monitor.c
+++ b/c-sources/pcap-monitor.c
@@ -23,6 +23,11 @@
#include <string.h>
#include <pcap/pcap.h>
+#ifndef DLT_DBUS
+# define DLT_DBUS 231
+#endif
+
+
typedef struct {
struct timeval ts;
GByteArray *blob;
@@ -428,8 +433,7 @@ initable_init (
return FALSE;
}
- /* FIXME: use DLT_DBUS when it makes it into libpcap. */
- priv->p = pcap_open_dead (DLT_NULL, 1 << 27);
+ priv->p = pcap_open_dead (DLT_DBUS, 1 << 27);
if (priv->p == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
diff --git a/data/bustle.appdata.xml.in b/data/bustle.appdata.xml.in
index ff276cb..2bc38ff 100644
--- a/data/bustle.appdata.xml.in
+++ b/data/bustle.appdata.xml.in
@@ -16,8 +16,14 @@
and average method call times.</_p>
</description>
<screenshots>
- <!-- Translators: This should be the URI of a 691×510 pixel screenshot of Bustle in your language. If you can't take a screenshot, leave the string as the English screenshot. -->
- <_screenshot type="default" width="691" height="510">http://willthompson.co.uk/bustle/bustle-0.3.1.png</_screenshot>
+ <screenshot type="default">
+ <!-- Translators: This should be the URI of a 2400×1350, pixel screenshot of Bustle in your language. If you can't take a screenshot, leave the string as the English screenshot. -->
+ <_image type="source">https://wiki.freedesktop.org/www/Software/Bustle/bustle-0.5.2-1.png</_image>
+ </screenshot>
+ <screenshot>
+ <!-- Translators: This should be the URI of a 2400×1350, pixel screenshot of Bustle in your language. If you can't take a screenshot, leave the string as the English screenshot. -->
+ <_image type="source">https://wiki.freedesktop.org/www/Software/Bustle/bustle-0.5.2-2.png</_image>
+ </screenshot>
</screenshots>
<url type="homepage">http://willthompson.co.uk/bustle/</url>
<updatecontact>philip_at_tecnocode.co.uk</updatecontact>
diff --git a/data/bustle.desktop.in b/data/bustle.desktop.in
index e239d52..16a4389 100644
--- a/data/bustle.desktop.in
+++ b/data/bustle.desktop.in
@@ -7,3 +7,4 @@ Terminal=false
Type=Application
Categories=GTK;Development;Debugger;Profiling;
StartupNotify=true
+_Keywords=debug;profile;d-bus;dbus;sequence;monitor;
--
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