[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.31.2-2-15-g927e880

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 202a70d4837d01c9dce87251e761546b65a234bb
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Jul 7 23:23:16 2010 +0200

    debian/empathy.install: Install dconf schema instead of the gconf one

diff --git a/debian/changelog b/debian/changelog
index 0834720..b912749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ empathy (2.31.4-1) UNRELEASED; urgency=low
   * New upstream release
     - debian/control: Adjust build-dependencies
   * Bump Standards-Version to 3.9.0 (no further changes)
+  * debian/empathy.install: Install dconf schema instead of the gconf one
 
- -- Laurent Bigonville <bigon at debian.org>  Wed, 07 Jul 2010 19:52:40 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 07 Jul 2010 23:28:01 +0200
 
 empathy (2.30.1.1-1) unstable; urgency=low
 
diff --git a/debian/empathy.install b/debian/empathy.install
index 37197c2..870dffe 100644
--- a/debian/empathy.install
+++ b/debian/empathy.install
@@ -1,5 +1,6 @@
 usr/bin/
-etc/gconf/schemas/empathy.schemas
 usr/share/applications/
 usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
 usr/share/telepathy/clients/Empathy.client
+usr/share/GConf/gsettings/empathy.convert
+usr/share/glib-2.0/schemas/org.gnome.Empathy.gschema.xml

-- 
Empathy packaging