[Pkg-haskell-commits] [SCM] D-Bus activity visualiser branch, master, updated. debian/0.4.2-1

[Iain Lane]

The following commit has been merged in the master branch:
commit 9a6ba27fb53982a1479bc4245f6748955b933e90
Author: Iain Lane <iain.lane at canonical.com>
Date:   Mon Nov 19 11:08:05 2012 +0000

    Remove 0001-Makesfile-respect-DESTDIR.patch, applied upstream
    
    and refresh 0002-Use-g_thread_try_new-rather-than-g_thread_create.patch

diff --git a/debian/patches/0001-Makefile-respect-DESTDIR.patch b/debian/patches/0001-Makefile-respect-DESTDIR.patch
deleted file mode 100644
index 4c38a20..0000000
--- a/debian/patches/0001-Makefile-respect-DESTDIR.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 53070dfb17b60520169a20c2c72b0021144cb93f Mon Sep 17 00:00:00 2001
-From: Will Thompson <will at willthompson.co.uk>
-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 --git a/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch b/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
index b7e73ff..9af518a 100644
--- a/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
+++ b/debian/patches/0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
@@ -10,23 +10,11 @@ to have to make.
  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 @@ index c642813..cfcda5a 100644
    if (priv->thread == NULL)
      {
        g_prefix_error (error, "Couldn't spawn logging thread: ");
--- 
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
index fe416a3..6d36015 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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 --git a/debian/patches/use-usr-as-preifx.patch b/debian/patches/use-usr-as-preifx.patch
index 3157dfb..3ddc5b3 100644
--- a/debian/patches/use-usr-as-preifx.patch
+++ b/debian/patches/use-usr-as-preifx.patch
@@ -25,10 +25,12 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- 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

-- 
D-Bus activity visualiser