[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/1%5.9.3-2-2-g5437f8f

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit a13f88d85d29d175e23c69761689228a11b3c497
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Fri Oct 7 15:11:30 2011 +0200

    d/p/0001-fix-build-with-UPower-but-no-NM-or-ConnMan.patch: Fix FTBFS when built with UPower but without NM support (Closes: #644589)

diff --git a/debian/changelog b/debian/changelog
index c6acf65..d75c392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+telepathy-mission-control-5 (1:5.9.3-3) UNRELEASED; urgency=low
+
+  * d/p/0001-fix-build-with-UPower-but-no-NM-or-ConnMan.patch: Fix FTBFS when
+    built with UPower but without NM support (Closes: #644589)
+
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 07 Oct 2011 15:06:51 +0200
+
 telepathy-mission-control-5 (1:5.9.3-2) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/patches/0001-fix-build-with-UPower-but-no-NM-or-ConnMan.patch b/debian/patches/0001-fix-build-with-UPower-but-no-NM-or-ConnMan.patch
new file mode 100644
index 0000000..9b1835f
--- /dev/null
+++ b/debian/patches/0001-fix-build-with-UPower-but-no-NM-or-ConnMan.patch
@@ -0,0 +1,39 @@
+From cc746edd95fdc1802cd656eca664a7089de61745 Mon Sep 17 00:00:00 2001
+From: Jonny Lamb <jonny.lamb at collabora.co.uk>
+Date: Fri, 07 Oct 2011 10:34:52 +0000
+Subject: connectivity-monitor: fix build with UPower but no NM or ConnMan
+
+http://bugs.debian.org/644589
+
+Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
+---
+diff --git a/src/connectivity-monitor.c b/src/connectivity-monitor.c
+index 4ecccde..2c94e3f 100644
+--- a/src/connectivity-monitor.c
++++ b/src/connectivity-monitor.c
+@@ -317,10 +317,12 @@ mcd_connectivity_monitor_init (McdConnectivityMonitor *connectivity_monitor)
+ static void
+ connectivity_monitor_finalize (GObject *object)
+ {
+-#ifdef HAVE_NM
++#if defined(HAVE_NM) || defined(HAVE_CONNMAN) || defined(HAVE_UPOWER)
+   McdConnectivityMonitor *connectivity_monitor = MCD_CONNECTIVITY_MONITOR (object);
+   McdConnectivityMonitorPrivate *priv = connectivity_monitor->priv;
++#endif
+ 
++#ifdef HAVE_NM
+   if (priv->nm_client != NULL)
+     {
+       g_signal_handler_disconnect (priv->nm_client,
+@@ -332,9 +334,6 @@ connectivity_monitor_finalize (GObject *object)
+ #endif
+ 
+ #ifdef HAVE_CONNMAN
+-  McdConnectivityMonitor *connectivity_monitor = MCD_CONNECTIVITY_MONITOR (object);
+-  McdConnectivityMonitorPrivate *priv = connectivity_monitor->priv;
+-
+   if (priv->proxy != NULL)
+     {
+       dbus_g_proxy_disconnect_signal (priv->proxy, "StateChanged",
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..fb2e25d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-build-with-UPower-but-no-NM-or-ConnMan.patch

-- 
MC 5 packaging