[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.30.0.2-1-5-g69b4c53

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 7b1abcbeb84aa0de0102f16b6ae7e4f658a0eb61
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sat May 1 16:49:29 2010 +0200

    Re-enable geoclue support on kfreebsd-* archs

diff --git a/debian/changelog b/debian/changelog
index 97c8e82..d8171ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 empathy (2.30.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Re-enable geoclue support on kfreebsd-* archs
 
- -- Laurent Bigonville <bigon at debian.org>  Sat, 01 May 2010 16:35:51 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 01 May 2010 16:48:26 +0200
 
 empathy (2.30.0.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0573d19..1b57a21 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,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.15),
-               libgeoclue-dev (>= 0.11) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libgeoclue-dev (>= 0.11) [!hurd-i386],
                libchamplain-0.4-dev (>= 0.4),
                libchamplain-gtk-0.4-dev (>= 0.4),
                libclutter-gtk-0.10-dev (>= 0.10),
@@ -52,15 +52,15 @@ Depends: ${shlibs:Depends},
          empathy-common (= ${source:Version}),
          telepathy-mission-control-5,
          gnome-icon-theme,
-         geoclue [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+         geoclue [!hurd-i386],
          dbus-x11
 Recommends: telepathy-gabble,
             telepathy-salut,
             gvfs-backends,
-            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],
+            geoclue-hostip [!hurd-i386],
+            geoclue-localnet [!hurd-i386],
+            geoclue-yahoo [!hurd-i386],
+            geoclue-manual [!hurd-i386],
             nautilus-sendto-empathy,
             freedesktop-sound-theme
 Suggests: telepathy-haze,
diff --git a/debian/rules b/debian/rules
index dc66657..714c4a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,8 @@ DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
   DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-location=yes
+else ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
+  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-location=yes
 else
   DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-location=no
 endif

-- 
Empathy packaging