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

[Armin Berres]

Author: trigger-guest
Date: 2007-12-20 16:34:53 +0000 (Thu, 20 Dec 2007)
New Revision: 8313

Modified:
   branches/kde4/packages/kdebase/debian/control
Log:
add missing conflict

Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control	2007-12-20 16:04:02 UTC (rev 8312)
+++ branches/kde4/packages/kdebase/debian/control	2007-12-20 16:34:53 UTC (rev 8313)
@@ -201,6 +201,7 @@
 Section: kde
 Architecture: all
 Replaces: libkonq5 (<= 4:3.97.0-1) 
+Conflicts: kdesktop
 Description: data files needed by core libraries for Konqueror
  Some data files which are used by the Konqueror core libraries. These
  files are also provided by KDE 3's kdesktop package.