[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.91.6.1-1-11-g499e12b

[Emilio Pozuelo Monfort]

The following commit has been merged in the debian branch:
commit 6308492d4cec37ac0d29a7581717b7f2f8bdb4d4
Author: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
Date:   Mon Feb 28 07:46:59 2011 +0000

    Re-enable the control center panel now that it builds fine

diff --git a/debian/changelog b/debian/changelog
index 1f29a2b..06b656d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ empathy (2.91.90.2-1) UNRELEASED; urgency=low
   * debian/control,
     debian/rules:
     - Let CDBS call dh_bugfiles for us.
+  * debian/rules,
+    debian/control,
+    debian/empathy.install:
+    - Re-enable the control center panel now that it builds fine.
 
  -- Sjoerd Simons <sjoerd at debian.org>  Fri, 25 Feb 2011 14:23:58 +0000
 
diff --git a/debian/control b/debian/control
index c317e2b..3a36fdc 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Build-Depends: cdbs (>= 0.4.90),
                libfolks-telepathy-dev (>= 0.3.5),
                libgnutls-dev (>= 2.8.5),
                libwebkitgtk-3.0-dev (>= 1.3.2),
+               libgnome-control-center-dev (>= 2.91),
                gsettings-desktop-schemas-dev,
                nautilus-sendto (>= 2.90)
 Standards-Version: 3.9.1
diff --git a/debian/empathy.install b/debian/empathy.install
index 8d03e6d..cdcc59d 100644
--- a/debian/empathy.install
+++ b/debian/empathy.install
@@ -1,5 +1,6 @@
 usr/bin/
 usr/lib/empathy/
+usr/lib/control-center-1/panels/*.so
 usr/share/man/man1/
 usr/share/applications/
 usr/share/dbus-1/services/
diff --git a/debian/rules b/debian/rules
index 60e51cd..c6e5486 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,7 @@ LDFLAGS += -Wl,-z,defs -Wl,-O1
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
                              --enable-webkit \
                              --disable-tests \
-                             --disable-schemas-compile \
-                              --disable-control-center-embedding
+                             --disable-schemas-compile
 
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
   DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-location=yes

-- 
Empathy packaging