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

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 5b1579cba7ab921230e3e9d0b8c41c99f5aa5b30
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Oct 5 23:21:31 2011 +0200

    Only build with NM support on linux architectures
    
      - Build-depends on libnm-glib-dev only on linux-any arch
    * debian/rules: Only build with NM support on linux architectures

diff --git a/debian/changelog b/debian/changelog
index cc13d8e..1bb6c0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ telepathy-mission-control-5 (1:5.9.3-2) UNRELEASED; urgency=low
 
   * debian/control:
     - Add myself to Uploaders list
+    - Build-depends on libnm-glib-dev only on linux-any arch
+  * debian/rules: Only build with NM support on linux architectures
 
- -- Laurent Bigonville <bigon at debian.org>  Wed, 05 Oct 2011 22:03:18 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 05 Oct 2011 23:20:46 +0200
 
 telepathy-mission-control-5 (1:5.9.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8596854..7c0853e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: autotools-dev (>= 20100122-1~),
                libgnome-keyring-dev,
                libtelepathy-glib-dev (>= 0.15),
                libupower-glib-dev,
-               libnm-glib-dev,
+               libnm-glib-dev [linux-any],
                pkg-config (>= 0.21),
                python (>= 2.5),
                xsltproc
diff --git a/debian/rules b/debian/rules
index bff1554..58ea4a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,18 @@
 #!/usr/bin/make -f
 
+CONFIGURE_FLAGS = --libexecdir=\$${prefix}/lib/telepathy \
+                  --disable-Werror \
+                  --disable-mcd-plugins \
+                  --enable-gtk-doc \
+                  --enable-server \
+                  --enable-gnome-keyring \
+                  --with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc \
+                  --enable-upower
+
+ifeq ($(DEB_BUILD_ARCH_OS),linux)
+CONFIGURE_FLAGS += --with-connectivity=nm
+endif
+
 %:
 	dh $@ --with autotools_dev
 
@@ -24,16 +37,7 @@ override_dh_auto_test:
 # their associated documentation, making their libraries static, and disabling
 # their headers
 override_dh_auto_configure:
-	dh_auto_configure -- \
-	--libexecdir=\$${prefix}/lib/telepathy \
-	--disable-Werror \
-	--disable-mcd-plugins \
-	--enable-gtk-doc \
-	--enable-server \
-	--enable-gnome-keyring \
-	--with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc \
-	--with-connectivity=nm \
-	--enable-upower
+	dh_auto_configure -- ${CONFIGURE_FLAGS}
 
 # we symlink some of the doc directories together
 override_dh_installdocs:

-- 
MC 5 packaging