[Git][haskell-team/DHG_packages][master] bustle: update to 0.6.2

[Clint Adams]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
682f3ca9 by Clint Adams at 2018-05-07T21:55:46-04:00
bustle: update to 0.6.2

- - - - -


4 changed files:

- p/bustle/debian/changelog
- − p/bustle/debian/patches/0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch
- + p/bustle/debian/patches/no-tarball
- p/bustle/debian/patches/series


Changes:

=====================================
p/bustle/debian/changelog
=====================================
--- a/p/bustle/debian/changelog
+++ b/p/bustle/debian/changelog
@@ -1,9 +1,11 @@
-bustle (0.5.4-2) UNRELEASED; urgency=medium
+bustle (0.6.2-1) unstable; urgency=medium
 
   * Set Rules-Requires-Root to no.
   * Switch Vcs-* fields to salsa.
+  * New upstream version.
+    - Fixes FTBFS. closes: #897511.
 
- -- Clint Adams <clint at debian.org>  Mon, 07 May 2018 21:07:46 -0400
+ -- Clint Adams <clint at debian.org>  Mon, 07 May 2018 21:28:29 -0400
 
 bustle (0.5.4-1) unstable; urgency=medium
 


=====================================
p/bustle/debian/patches/0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch deleted
=====================================
--- a/p/bustle/debian/patches/0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 5051295aae3d85f6052568c8c86e4ef16c884b21 Mon Sep 17 00:00:00 2001
-From: Jonny Lamb <jonny.lamb at 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 at 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 at 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
-


=====================================
p/bustle/debian/patches/no-tarball
=====================================
--- /dev/null
+++ b/p/bustle/debian/patches/no-tarball
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -85,8 +85,6 @@
+ 
+ clean:
+ 	rm -f $(BINARIES) $(MANPAGE) $(BUSTLE_PCAP_GENERATED_HEADERS) $(DESKTOP_FILE) $(APPDATA_FILE)
+-	if test -d ./$(TARBALL_DIR); then rm -r ./$(TARBALL_DIR); fi
+-	rm -f ./$(TARBALL)
+ 
+ # Icon cache stuff
+ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(DATADIR)/icons/hicolor


=====================================
p/bustle/debian/patches/series
=====================================
--- a/p/bustle/debian/patches/series
+++ b/p/bustle/debian/patches/series
@@ -1,2 +1,2 @@
 use-system-usr-prefix.patch
-0001-bustle-pcap-stop-leaking-so-much-in-parse_arguments.patch
+no-tarball



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/682f3ca9b8002ee824cafda8052a437f15105f8e

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/682f3ca9b8002ee824cafda8052a437f15105f8e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180508/a635eb37/attachment-0001.html>