[Pkg-xfce-commits] r2287 - desktop/branches/svn-snapshots/xfce4-settings/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-09-09 20:12:34 +0000 (Tue, 09 Sep 2008)
New Revision: 2287

Modified:
   desktop/branches/svn-snapshots/xfce4-settings/debian/control
Log:
update conflict


Modified: desktop/branches/svn-snapshots/xfce4-settings/debian/control
===================================================================
--- desktop/branches/svn-snapshots/xfce4-settings/debian/control	2008-09-09 20:00:19 UTC (rev 2286)
+++ desktop/branches/svn-snapshots/xfce4-settings/debian/control	2008-09-09 20:12:34 UTC (rev 2287)
@@ -12,7 +12,8 @@
 Package: xfce4-settings
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: xfce4-mcs-manager, xfce-mcs-plugins
+Conflicts: xfce4-mcs-plugins
+Replaces: xfce4-mcs-manager, xfce4-mcs-plugins
 Description: graphical application for managing Xfce settings
  xfce4-settings is the fXfce settings manager front-end. It comes
  with several different components for configuring application-independent