[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/3.1.1-1-10-gb5c8efc

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 2ccb11ba16e8b6c62d0eb5d9d8875b6c172f383d
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Jun 14 23:01:34 2011 +0200

    Enable geocode support
    
    * debian/control:
      - Add libgeocode-glib-dev as build-dependency
    * debian/rules:
      - Add --enable-geocode to configure flags

diff --git a/debian/changelog b/debian/changelog
index 4736a07..81889c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,13 @@ empathy (3.1.2.1-1) UNRELEASED; urgency=low
     - Bump build-dependencies
   * debian/control:
     - Bump Standards-Version to 3.9.2 (no further changes)
+    - Add libgeocode-glib-dev as build-dependency
+  * debian/rules:
+    - Add --enable-geocode to configure flags
   * debian/patches/0001-add-missing-gio.patch: Add missing gio linkage to fix
     FTBFS
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 13 Jun 2011 17:09:59 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 14 Jun 2011 23:00:18 +0200
 
 empathy (3.1.1-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 24cdc81..c23766f 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,8 @@ Build-Depends: cdbs (>= 0.4.90),
                libwebkitgtk-3.0-dev (>= 1.3.2),
                libgnome-control-center-dev (>= 2.91),
                gsettings-desktop-schemas-dev,
-               nautilus-sendto (>= 2.90)
+               nautilus-sendto (>= 2.90),
+               libgeocode-glib-dev
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/empathy.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/empathy.git
diff --git a/debian/rules b/debian/rules
index 3e03a25..a1e7bc2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ LDFLAGS += -Wl,-z,defs -Wl,-O1
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
                              --enable-webkit \
                              --enable-map=yes \
+                             --enable-geocode=yes \
                              --disable-schemas-compile
 
 ifeq ($(DEB_BUILD_ARCH_OS),linux)

-- 
Empathy packaging