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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2009-01-09 18:12:47 +0000 (Fri, 09 Jan 2009)
New Revision: 13254

Modified:
   branches/kde4.2/packages/kdeartwork/debian/changelog
   branches/kde4.2/packages/kdeartwork/debian/control
Log:
   * Add conflict to kdewallpapers with KDE 4.1's kdebase-workspace-data,
     some wallpapers were moved.



Modified: branches/kde4.2/packages/kdeartwork/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeartwork/debian/changelog	2009-01-09 17:55:26 UTC (rev 13253)
+++ branches/kde4.2/packages/kdeartwork/debian/changelog	2009-01-09 18:12:47 UTC (rev 13254)
@@ -1,4 +1,4 @@
-kdeartwork (4:4.1.96+svn907669-0r1) UNRELEASED; urgency=low
+kdeartwork (4:4.1.96+svn908369-0r1) UNRELEASED; urgency=low
 
    * New upstream development snapshot.
    * Remove kdeartwork-misc, kwordclock maps are not longer provided.
@@ -8,6 +8,8 @@
      moved from kdeplasma-data.
    * kdeartwork-theme-icon does not longer conflict with KDE 3.5's
      kdelibs-data. Removed conflicts line.
+   * Add conflict to kdewallpapers with KDE 4.1's kdebase-workspace-data,
+     some wallpapers were moved.
    * 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-09 17:55:26 UTC (rev 13253)
+++ branches/kde4.2/packages/kdeartwork/debian/control	2009-01-09 18:12:47 UTC (rev 13254)
@@ -44,6 +44,7 @@
 Architecture: all
 Section: kde
 Suggests: kde-window-manager | x-window-manager
+Replaces: kdebase-workspace-data (<< 4.1.96)
 Description: wallpapers released with KDE 4
  This package contains additional wallpapers for KDE 4.
  .