[Pkg-xfce-commits] r336 - desktop/trunk/xffm4/debian

[Rudy Godoy]

Author: rudy-guest
Date: 2005-12-03 06:07:52 +0000 (Sat, 03 Dec 2005)
New Revision: 336

Modified:
   desktop/trunk/xffm4/debian/changelog
   desktop/trunk/xffm4/debian/control
Log:
add conflicts/replaces for xffm4-icons

Modified: desktop/trunk/xffm4/debian/changelog
===================================================================
--- desktop/trunk/xffm4/debian/changelog	2005-11-30 10:41:42 UTC (rev 335)
+++ desktop/trunk/xffm4/debian/changelog	2005-12-03 06:07:52 UTC (rev 336)
@@ -1,3 +1,9 @@
+xffm4 (4.2.3-2) unstable; urgency=low
+
+  * Added conflicts/replaces for xffm4-icons, since isn't shipped anymore.
+
+ -- Rudy Godoy <rudy at kernel-panik.org>  Sat,  3 Dec 2005 01:09:32 -0500
+
 xffm4 (4.2.3-1) unstable; urgency=low
 
   * New Upstream Release

Modified: desktop/trunk/xffm4/debian/control
===================================================================
--- desktop/trunk/xffm4/debian/control	2005-11-30 10:41:42 UTC (rev 335)
+++ desktop/trunk/xffm4/debian/control	2005-12-03 06:07:52 UTC (rev 336)
@@ -10,7 +10,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, procps
 Suggests: xfwm4, xfce4
-Replaces: libxffm-0, libxffmsmb-0
+Replaces: libxffm-0, libxffmsmb-0, xffm4-icons
+Conflicts: xffm4-icons
 Description: File manager for the Xfce4 desktop environment
  xffm is the file manager of the Xfce4 desktop environment which combines
  the previous work in xftree, xfsamba and xfglob.