rev 8989 - branches/kde4/packages/kdegraphics/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-01-17 21:48:44 +0000 (Thu, 17 Jan 2008)
New Revision: 8989

Modified:
   branches/kde4/packages/kdegraphics/debian/changelog
   branches/kde4/packages/kdegraphics/debian/control
Log:
Add Conflicts/Replaces for kcolorchooser with kcoloredit included in KDE 3.



Modified: branches/kde4/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde4/packages/kdegraphics/debian/changelog	2008-01-17 19:07:25 UTC (rev 8988)
+++ branches/kde4/packages/kdegraphics/debian/changelog	2008-01-17 21:48:44 UTC (rev 8989)
@@ -3,8 +3,12 @@
   * NOT RELEASED.
 
   * Disable ico analyzer. It conflicts with strigi. Commited Upstream.
+  
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+  
+  * Add Conflicts/Replaces for kcolorchooser with kcoloredit included in KDE 3. 
 
- -- Fathi Boudra <fabo at debian.org>  Tue, 15 Jan 2008 15:19:51 +0100
+ -- Fathi Boudra <fabo at debian.org>  Thu, 17 Jan 2008 20:56:35 +0100
 
 kdegraphics (4:4.0.0-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdegraphics/debian/control
===================================================================
--- branches/kde4/packages/kdegraphics/debian/control	2008-01-17 19:07:25 UTC (rev 8988)
+++ branches/kde4/packages/kdegraphics/debian/control	2008-01-17 21:48:44 UTC (rev 8989)
@@ -74,6 +74,8 @@
 Package: kcolorchooser
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kcoloredit (<< 4:4.0.0-1)
+Conflicts: kcoloredit (<< 4:4.0.0-1)
 Description: KDE 4's color chooser
  Kcolorchooser is a color chooser for KDE 4.
  .