[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 b5c8efc7cb141534b05770e6a383de37ea089d9f
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Jun 14 23:13:39 2011 +0200

    Add cheese support
    
      - Add libcheese-gtk-dev as build-dependency
      - Add --with-cheese to configure flags

diff --git a/debian/changelog b/debian/changelog
index 81889c3..6d47dbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,12 +5,14 @@ empathy (3.1.2.1-1) UNRELEASED; urgency=low
   * debian/control:
     - Bump Standards-Version to 3.9.2 (no further changes)
     - Add libgeocode-glib-dev as build-dependency
+    - Add libcheese-gtk-dev as build-dependency
   * debian/rules:
     - Add --enable-geocode to configure flags
+    - Add --with-cheese to configure flags
   * debian/patches/0001-add-missing-gio.patch: Add missing gio linkage to fix
     FTBFS
 
- -- Laurent Bigonville <bigon at debian.org>  Tue, 14 Jun 2011 23:00:18 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 14 Jun 2011 23:12:51 +0200
 
 empathy (3.1.1-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index c23766f..9d12589 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,8 @@ Build-Depends: cdbs (>= 0.4.90),
                libgnome-control-center-dev (>= 2.91),
                gsettings-desktop-schemas-dev,
                nautilus-sendto (>= 2.90),
-               libgeocode-glib-dev
+               libgeocode-glib-dev,
+               libcheese-gtk-dev (>= 2.91.91.1)
 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 a1e7bc2..06de007 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
                              --enable-webkit \
                              --enable-map=yes \
                              --enable-geocode=yes \
+                             --with-cheese \
                              --disable-schemas-compile
 
 ifeq ($(DEB_BUILD_ARCH_OS),linux)

-- 
Empathy packaging