[Pkg-xfce-commits] r674 - desktop/trunk/xfce4-panel/debian

[Simon Huggins]

Author: huggie
Date: 2006-06-03 11:59:46 +0000 (Sat, 03 Jun 2006)
New Revision: 674

Modified:
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/control
Log:
Make the panel conflict/replace trigger-launcher


Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2006-06-03 11:36:05 UTC (rev 673)
+++ desktop/trunk/xfce4-panel/debian/changelog	2006-06-03 11:59:46 UTC (rev 674)
@@ -1,3 +1,10 @@
+xfce4-panel (4.3.90.1-3) UNRELEASED; urgency=low
+
+  * (Simon Huggins)
+    * Conflict/Replace -trigger-launcher too.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 03 Jun 2006 12:58:13 +0100
+
 xfce4-panel (4.3.90.1-2) unstable; urgency=low
 
   * (Simon Huggins)

Modified: desktop/trunk/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control	2006-06-03 11:36:05 UTC (rev 673)
+++ desktop/trunk/xfce4-panel/debian/control	2006-06-03 11:59:46 UTC (rev 674)
@@ -9,8 +9,8 @@
 Package: xfce4-panel
 Architecture: any
 Depends: ${shlibs:Depends}, procps, libexo-0.3-0 (>= 0.3.1.6beta1-1)
-Replaces: xfce4 (<< 4.0.0.final-1), xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-utils (<< 4.3.90.1-1)
-Conflicts: xfce4 (<< 4.0.0.final-1), xfce4-themes, xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin
+Replaces: xfce4 (<< 4.0.0.final-1), xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-utils (<< 4.3.90.1-1), xfce4-trigger-launcher
+Conflicts: xfce4 (<< 4.0.0.final-1), xfce4-themes, xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-trigger-launcher
 Description: The Xfce4 desktop environment panel
  This is the panel provided by the Xfce4 desktop project.
  If you want a multi-functional panel that can even handle