[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.28.1.1-1-9-gae8e169

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit ae8e169643888a9855db80f5261d7344f6fa57d6
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Nov 3 12:51:32 2009 +0100

    Move GConf schema to empathy package

diff --git a/debian/changelog b/debian/changelog
index c6f67df..7dcea75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ empathy (2.29.1-1) UNRELEASED; urgency=low
   * debian/control:
     - Fix typo
     - Add Recommends on yelp for empathy-common (Closes: #553524)
+  * Move GConf schema to empathy package
 
- -- Laurent Bigonville <bigon at debian.org>  Tue, 03 Nov 2009 12:13:36 +0100
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 03 Nov 2009 12:43:36 +0100
 
 empathy (2.28.1.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c7963c4..89b8d2c 100644
--- a/debian/control
+++ b/debian/control
@@ -55,6 +55,8 @@ Recommends: telepathy-gabble,
             gvfs-backends
 Suggests: telepathy-haze,
           telepathy-butterfly
+Replaces: libempathy-gtk-common
+Conflicts: libempathy-gtk-common
 Description: High-level library and user-interface for Telepathy
  Instant messaging program supporting text, voice, video, file transfers
  and inter-application communication over many different protocols,
diff --git a/debian/empathy-common.install b/debian/empathy-common.install
index f69c67e..d3bfd12 100644
--- a/debian/empathy-common.install
+++ b/debian/empathy-common.install
@@ -1,5 +1,4 @@
 usr/share/icons/
 usr/share/locale/
-etc/gconf/schemas/
 usr/share/empathy/
 usr/share/gnome/help/empathy/
diff --git a/debian/empathy.install b/debian/empathy.install
index 9ec5720..eed412c 100644
--- a/debian/empathy.install
+++ b/debian/empathy.install
@@ -1,4 +1,5 @@
 usr/bin/
+etc/gconf/schemas/empathy.schemas
 usr/share/applications/empathy.desktop
 usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
 usr/share/telepathy/clients/Empathy.client

-- 
Empathy packaging