rev 9817 - branches/kde4/packages/kdebase/debian

[Armin Berres]

Author: trigger-guest
Date: 2008-03-21 16:20:51 +0000 (Fri, 21 Mar 2008)
New Revision: 9817

Modified:
   branches/kde4/packages/kdebase/debian/changelog
   branches/kde4/packages/kdebase/debian/control
Log:
* Add conflict against kcontrol to kinfocenter (Closes: #465702).

Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2008-03-21 16:20:18 UTC (rev 9816)
+++ branches/kde4/packages/kdebase/debian/changelog	2008-03-21 16:20:51 UTC (rev 9817)
@@ -1,3 +1,9 @@
+kdebase (4:4.0.2-2) experimental; urgency=low
+
+  * Add conflict against kcontrol to kinfocenter (Closes: #465702).
+
+ -- Armin Berres <trigger+debian at space-based.de>  Fri, 21 Mar 2008 17:17:29 +0100
+
 kdebase (4:4.0.2-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control	2008-03-21 16:20:18 UTC (rev 9816)
+++ branches/kde4/packages/kdebase/debian/control	2008-03-21 16:20:51 UTC (rev 9817)
@@ -111,6 +111,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: kcontrol
 Replaces: kdebase-bin (<< 4:4.0.0-1)
 Description: system information viewer for KDE 4
  KInfoCenter provides you with a graphical overview of various aspects of your