[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/1%5.9.0-1-6-gc23c3ea

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit 295a1604f2642760558167943ab5083167b547f0
Author: Jonny Lamb <jonny at debian.org>
Date:   Wed Oct 5 10:56:07 2011 +0100

    Enable NM and UPower support.

diff --git a/debian/changelog b/debian/changelog
index 75bdd5d..2a62333 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 telepathy-mission-control-5 (1:5.9.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Enable NM and UPower support.
 
- -- Jonny Lamb <jonny at debian.org>  Wed, 05 Oct 2011 10:55:09 +0100
+ -- Jonny Lamb <jonny at debian.org>  Wed, 05 Oct 2011 10:55:39 +0100
 
 telepathy-mission-control-5 (1:5.9.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a79ebe7..1e2500c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,8 @@ Build-Depends: autotools-dev (>= 20100122-1~),
                libglib2.0-dev (>= 2.28),
                libgnome-keyring-dev,
                libtelepathy-glib-dev (>= 0.15),
+               libupower-glib-dev,
+               libnm-glib-dev,
                pkg-config (>= 0.21),
                python (>= 2.5),
                xsltproc
diff --git a/debian/rules b/debian/rules
index cf570c7..bff1554 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,9 @@ override_dh_auto_configure:
 	--enable-gtk-doc \
 	--enable-server \
 	--enable-gnome-keyring \
-	--with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc
+	--with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc \
+	--with-connectivity=nm \
+	--enable-upower
 
 # we symlink some of the doc directories together
 override_dh_installdocs:

-- 
MC 5 packaging