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

[Laurent Bigonville]

The following commit has been merged in the debian-squeeze branch:
commit 3bc10d2050829f62d96425a4e6faa9f6925bff71
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sat Nov 14 19:17:15 2009 +0100

    Also do not try to build with geoclue support on non-linux arch

diff --git a/debian/changelog b/debian/changelog
index 38dff8c..1f802c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+empathy (2.28.1.1-3) UNRELEASED; urgency=low
+
+  * Also do not try to build with geoclue support on non-linux arch
+
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 14 Nov 2009 17:50:51 +0100
+
 empathy (2.28.1.1-2) unstable; urgency=low
 
   * Do not try to build with networkmanager support on non-linux arch
diff --git a/debian/control b/debian/control
index 975be32..870b0f2 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Build-Depends: cdbs,
                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),
+               libgeoclue-dev (>= 0.11) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libchamplain-0.4-dev (>= 0.4),
                libchamplain-gtk-0.4-dev (>= 0.4),
                libclutter-gtk-0.10-dev (>= 0.10),
@@ -201,11 +201,11 @@ Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libempathy-gtk-common (= ${source:Version}),
-         geoclue
-Recommends: geoclue-hostip,
-            geoclue-localnet,
-            geoclue-yahoo,
-            geoclue-manual
+         geoclue [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Recommends: geoclue-hostip [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+            geoclue-localnet [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+            geoclue-yahoo [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+            geoclue-manual [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 Description: High-level library and user-interface for Telepathy (GTK library)
  Instant messaging program supporting text, voice, video, file transfers
  and inter-application communication over many different protocols,
diff --git a/debian/rules b/debian/rules
index c22a98e..d56fecd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
                              --enable-megaphone \
                              --disable-tests \
                              --enable-webkit \
-                             --enable-location \
                              --enable-map
 
 DEB_DBG_PACKAGE_empathy = empathy-dbg
@@ -32,9 +31,9 @@ binary-install/python-empathy::
 DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
-  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm
+  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-location=yes
 else
-  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no
+  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-location=no
 endif
 
 include $(CURDIR)/debian/update-patches.mk

-- 
Empathy packaging