rev 13245 - branches/kde4.2/packages/kdeartwork/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2009-01-09 13:49:47 +0000 (Fri, 09 Jan 2009)
New Revision: 13245

Modified:
   branches/kde4.2/packages/kdeartwork/debian/changelog
   branches/kde4.2/packages/kdeartwork/debian/control
Log:
this conflict is not needed


Modified: branches/kde4.2/packages/kdeartwork/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeartwork/debian/changelog	2009-01-08 20:59:51 UTC (rev 13244)
+++ branches/kde4.2/packages/kdeartwork/debian/changelog	2009-01-09 13:49:47 UTC (rev 13245)
@@ -6,6 +6,8 @@
    * Remove kdeartwork-theme-window, themes are not longed provided.
    * Add plasma-desktopthemes-artwork containing all plasma desktop themes
      moved from kdeplasma-data.
+   * kdeartwork-theme-icon does not longer conflict with KDE 3.5's
+     kdelibs-data. Removed conflicts line.
    * Bump KDE build depends to 4:4.1.96.
    * Bump Standards-Version to 3.8.0 and add README.source.
    * Do not build depend on cmake explicitly.

Modified: branches/kde4.2/packages/kdeartwork/debian/control
===================================================================
--- branches/kde4.2/packages/kdeartwork/debian/control	2009-01-08 20:59:51 UTC (rev 13244)
+++ branches/kde4.2/packages/kdeartwork/debian/control	2009-01-09 13:49:47 UTC (rev 13245)
@@ -44,7 +44,6 @@
 Architecture: all
 Section: kde
 Suggests: kde-window-manager | x-window-manager
-Conflicts: 
 Description: wallpapers released with KDE 4
  This package contains additional wallpapers for KDE 4.
  .
@@ -54,7 +53,6 @@
 Package: kdeartwork-theme-icon
 Architecture: all
 Section: kde
-Conflicts: kdelibs-data
 Description: icon themes released with KDE 4
  This package contains additional icon themes for KDE 4.
  .