[Pkg-telepathy-commits] ./packages/unstable/empathy r85: * libempathy-common.install: Install empathy-chatroom-manager.{xsl, dtd}

[Sjoerd Simons]

------------------------------------------------------------
revno: 85
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: empathy
timestamp: Mon 2008-01-21 17:04:38 +0100
message:
  * libempathy-common.install: Install empathy-chatroom-manager.{xsl,dtd}
  * libempathy-gtk-common.install: No longer install
    empathy-chatroom-manager.dtd
  * control: Let libempathy-common conflict with older versions of
    libempathy-gtk-common
modified:
  changelog
  control
  libempathy-common.install
  libempathy-gtk-common.install
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-01-21 14:16:18 +0000
+++ b/changelog	2008-01-21 16:04:38 +0000
@@ -15,6 +15,11 @@
   [ Sjoerd Simons ]
   * Add symbol files for libempathy and libempathy-gtk
   * libempathy7: Bumped shlibs
+  * libempathy-common.install: Install empathy-chatroom-manager.{xsl,dtd}
+  * libempathy-gtk-common.install: No longer install
+    empathy-chatroom-manager.dtd
+  * control: Let libempathy-common conflict with older versions of
+    libempathy-gtk-common
 
  -- Laurent Bigonville <bigon at bigon.be>  Mon, 07 Jan 2008 01:58:46 +0100
 

=== modified file 'control'
--- a/control	2008-01-16 19:45:48 +0000
+++ b/control	2008-01-21 16:04:38 +0000
@@ -46,7 +46,7 @@
 Package: libempathy-common
 Architecture: all
 Section: misc
-Conflicts: empathy (<< 0.12-1)
+Conflicts: empathy (<< 0.12-1), libempathy-gtk-common (<< 0.21.5.2)
 Replaces: empathy (<< 0.12-1)
 Depends: ${shlibs:Depends},
          ${misc:Depends}

=== modified file 'libempathy-common.install'
--- a/libempathy-common.install	2007-08-25 12:08:25 +0000
+++ b/libempathy-common.install	2008-01-21 16:04:38 +0000
@@ -1,2 +1,4 @@
 usr/share/mission-control
 usr/share/locale
+usr/share/empathy/empathy-chatroom-manager.dtd
+usr/share/empathy/empathy-chatroom-manager.xsl

=== modified file 'libempathy-gtk-common.install'
--- a/libempathy-gtk-common.install	2007-10-29 13:46:44 +0000
+++ b/libempathy-gtk-common.install	2008-01-21 16:04:38 +0000
@@ -2,4 +2,5 @@
 usr/share/icons/
 usr/share/empathy/icons/
 usr/share/empathy/*.glade
-usr/share/empathy/*.dtd
+usr/share/empathy/empathy-contact-groups.dtd
+usr/share/empathy/empathy-status-presets.dtd