rev 8889 - branches/kde4/packages/kdeartwork/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-01-10 07:35:09 +0000 (Thu, 10 Jan 2008)
New Revision: 8889

Modified:
   branches/kde4/packages/kdeartwork/debian/changelog
   branches/kde4/packages/kdeartwork/debian/control
Log:
  * Add to kdeartwork-theme-icon a Conflicts on KDE 3's kdelibs-data since
    they both provide the same icon files.


Modified: branches/kde4/packages/kdeartwork/debian/changelog
===================================================================
--- branches/kde4/packages/kdeartwork/debian/changelog	2008-01-10 02:28:45 UTC (rev 8888)
+++ branches/kde4/packages/kdeartwork/debian/changelog	2008-01-10 07:35:09 UTC (rev 8889)
@@ -3,13 +3,15 @@
   * New upstream release.
   * Bump build-depends to >=4:4.0.0-1.
   * Update kdeartwork.install.
+  * Add to kdeartwork-theme-icon a Conflicts on KDE 3's kdelibs-data since
+    they both provide the same icon files.
 
   +++ Changes by Matthew Rosewarne:
 
   * Add Homepage: to control.
   * Tweak package descriptions.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sat, 05 Jan 2008 16:07:24 +0100
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 10 Jan 2008 08:41:33 +0100
 
 kdeartwork (4:3.98.0~svn755919-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdeartwork/debian/control
===================================================================
--- branches/kde4/packages/kdeartwork/debian/control	2008-01-10 02:28:45 UTC (rev 8888)
+++ branches/kde4/packages/kdeartwork/debian/control	2008-01-10 07:35:09 UTC (rev 8889)
@@ -58,6 +58,7 @@
 Package: kdeartwork-theme-icon
 Architecture: all
 Section: kde
+Conflicts: kdelibs-data (<<4:3.90.0)
 Description: icon themes released with KDE 4
  This package contains additional icon themes for KDE. Icon themes can be
  used to customise the appearance of standard icons throughout KDE.