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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-07-08 19:04:57 +0000 (Tue, 08 Jul 2008)
New Revision: 11398

Modified:
   branches/kde4/packages/kdebase/debian/changelog
   branches/kde4/packages/kdebase/debian/control
Log:
Add Conflicts with kcontrol to kdebase-bin.
(I just run out of Futurama episodes btw :-( )


Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2008-07-08 18:55:35 UTC (rev 11397)
+++ branches/kde4/packages/kdebase/debian/changelog	2008-07-08 19:04:57 UTC (rev 11398)
@@ -9,8 +9,10 @@
   +++ Changes by Ana Beatriz Guerrero Lopez:
   
   * Remove patch 97_fix_target_link_libraries.
+  * Add Conflicts with kcontrol to kdebase-bin. Thanks Peter! 
+    (Closes: #483658)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 07 Jul 2008 17:10:13 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 08 Jul 2008 21:12:59 +0200
 
 kdebase (4:4.0.84-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control	2008-07-08 18:55:35 UTC (rev 11397)
+++ branches/kde4/packages/kdebase/debian/control	2008-07-08 19:04:57 UTC (rev 11398)
@@ -65,7 +65,7 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, kdebase-data (= ${source:Version})
-Conflicts: kdesktop
+Conflicts: kdesktop, kcontrol
 Description: core binaries for the KDE 4 base module
  This package contains miscellaneous programs needed by other KDE 4
  applications, particularly those in the KDE 4 base module.