[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian-squeeze, updated. debian/2.28.1.1-1-2-gc8364cf

[Laurent Bigonville]

The following commit has been merged in the debian-squeeze branch:
commit 888ac9e86feaa17834959f7a895f33639d8ecd67
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Nov 11 22:55:45 2009 +0100

    Do not try to build with networkmanager support on non-linux arch

diff --git a/debian/changelog b/debian/changelog
index dbb3be0..4ed944e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+empathy (2.28.1.1-2) UNRELEASED; urgency=low
+
+  * Do not try to build with networkmanager support on non-linux arch
+
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 11 Nov 2009 22:51:04 +0100
+
 empathy (2.28.1.1-1) unstable; urgency=low
 
   * New upstream bugfix release
diff --git a/debian/control b/debian/control
index f2a1f96..975be32 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,8 @@ Build-Depends: cdbs,
                libtelepathy-farsight-dev (>= 0.0.4),
                libgstreamer0.10-dev,
                libgstreamer-plugins-base0.10-dev,
-               libnm-glib-dev (>= 0.7),
-               libnm-util-dev (>= 0.7),
+               libnm-glib-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libnm-util-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libwebkit-dev (>= 1.1.7),
                libgeoclue-dev (>= 0.11),
                libchamplain-0.4-dev (>= 0.4),
diff --git a/debian/rules b/debian/rules
index e76196f..c22a98e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
                              --enable-python \
                              --enable-megaphone \
                              --disable-tests \
-                             --with-connectivity=nm \
                              --enable-webkit \
                              --enable-location \
                              --enable-map
@@ -30,4 +29,12 @@ DEB_DBG_PACKAGE_libempathy-gtk28 = libempathy-gtk28-dbg
 binary-install/python-empathy::
 	dh_pysupport -p$(cdbs_curpkg)
 
+DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(DEB_BUILD_ARCH_OS),linux)
+  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm
+else
+  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no
+endif
+
 include $(CURDIR)/debian/update-patches.mk

-- 
Empathy packaging