[Pkg-xfce-commits] r1666 - desktop/trunk/thunar/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-02-27 19:42:42 +0000 (Wed, 27 Feb 2008)
New Revision: 1666

Modified:
   desktop/trunk/thunar/debian/changelog
   desktop/trunk/thunar/debian/control
Log:
* debian/control: add proper conflicts against previous thunar-data.

Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2008-02-27 16:19:48 UTC (rev 1665)
+++ desktop/trunk/thunar/debian/changelog	2008-02-27 19:42:42 UTC (rev 1666)
@@ -6,8 +6,9 @@
       zombies. Thanks Jeremy Lal.                               closes: #465803
   * debian/thunar.install: install .desktop files in thunar package.
   * debian/rules: remove .desktop files from thunar-data package.
+  * debian/control: add proper conflicts against previous thunar-data.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 27 Feb 2008 16:45:03 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 27 Feb 2008 20:42:13 +0100
 
 thunar (0.9.0-3) unstable; urgency=low
 

Modified: desktop/trunk/thunar/debian/control
===================================================================
--- desktop/trunk/thunar/debian/control	2008-02-27 16:19:48 UTC (rev 1665)
+++ desktop/trunk/thunar/debian/control	2008-02-27 19:42:42 UTC (rev 1666)
@@ -31,7 +31,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info, thunar-data (= ${source:Version})
 Recommends: hal, dbus, gamin
-Conflicts: libthunar-vfs-1 (<= 0.2.0alpha-r19548-3)
+Conflicts: libthunar-vfs-1 (<= 0.2.0alpha-r19548-3), thunar-data (<= 0.9.0-3)
 Replaces: libthunar-vfs-dev (<= 0.3.0beta1-2)
 Suggests: thunar-archive-plugin, thunar-media-tags-plugin, thunar-volman
 Description: File Manager for Xfce