[SCM] KDE Artwork module packaging branch, master, updated. debian/4.8.4-1-2-gf98edc8

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeartwork.git;a=commitdiff;h=f98edc8

The following commit has been merged in the master branch:
commit f98edc83cd64cc9f8cdc33d99040d5905723630c
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jun 25 20:06:09 2012 +0200

    kdewallpapers: raise the version of the conflict against kdebase-workspace-data (#679008)
---
 debian/changelog |    3 +++
 debian/control   |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c8c34b..9ebb0fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdeartwork (4:4.8.4-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Raise the version of the conflict against kdebase-workspace-data
+    in kdewallpapers. (Closes: #679008)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 25 Jun 2012 20:01:32 +0200
 
diff --git a/debian/control b/debian/control
index b679dc2..08369c7 100644
--- a/debian/control
+++ b/debian/control
@@ -52,8 +52,8 @@ Package: kdewallpapers
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: kde-window-manager | x-window-manager
-Replaces: kdebase-workspace-data (<< 4:4.6.0)
-Breaks: kdebase-workspace-data (<< 4:4.6.0)
+Replaces: kdebase-workspace-data (<< 4:4.7.0)
+Breaks: kdebase-workspace-data (<< 4:4.7.0)
 Description: wallpapers released with KDE Plasma Workspaces
  This package contains additional wallpapers for KDE Plasma Workspaces.
  .

-- 
KDE Artwork module packaging