[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.91.5-1-2-gba925b8

[Emilio Pozuelo Monfort]

The following commit has been merged in the debian branch:
commit ba925b81bebf09fd3b9bda9ad23aefb793417a25
Author: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
Date:   Mon Jan 17 18:14:01 2011 +0000

    Re-enable webkit support

diff --git a/debian/changelog b/debian/changelog
index 0d242c5..16bfe7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 empathy (2.91.5-2) UNRELEASED; urgency=low
 
+  [ Laurent Bigonville ]
   * debian/control: Bump libdconf0 to Depends
 
+  [ Emilio Pozuelo Monfort ]
+  * debian/control,
+    debian/rules:
+    + Re-enable webkit support.
+
  -- Laurent Bigonville <bigon at debian.org>  Sun, 16 Jan 2011 03:49:28 +0100
 
 empathy (2.91.5-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 488cd23..73d15fe 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,7 @@ Build-Depends: cdbs,
                libfolks-dev (>= 0.3.3),
                libfolks-telepathy-dev (>= 0.3.3),
                libgnutls-dev (>= 2.8.5),
+               libwebkitgtk-3.0-dev (>= 1.3.2),
                gsettings-desktop-schemas-dev
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/empathy.git
diff --git a/debian/rules b/debian/rules
index 3ea4ad5..6a55b59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ binary-install/empathy::
 #LDFLAGS += -Wl,-z,defs -Wl,-O1
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
+                             --enable-webkit \
                              --disable-tests \
                              --disable-schemas-compile \
 

-- 
Empathy packaging