[SCM] KDE Artwork module packaging branch, master, updated. debian/15.08.3-1-7-g6ee09f1

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 6ee09f1f3dbc603d945f283ac702305ff22b80d5
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 23 13:33:01 2016 +0200

    nuvola-icon-theme: turn Conflicts to Breaks
    
    it is what should be done for file moving between packages (which is
    what happened)
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9746398..0c0f116 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ kdeartwork (4:15.08.3-2) UNRELEASED; urgency=medium
   * Update Vcs-* fields.
   * Bump Standards-Version to 3.9.8, no changes required.
   * Update watch file to monitor only old 15.08.x tarballs.
+  * Turn the Conflicts in nuvola-icon-theme to Breaks, since it is what should
+    be done for file moving between packages (which is what happened).
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 23 Jul 2016 13:07:39 +0200
 
diff --git a/debian/control b/debian/control
index e50c7ce..eedc444 100644
--- a/debian/control
+++ b/debian/control
@@ -101,7 +101,7 @@ Section: x11
 Architecture: all
 Depends: hicolor-icon-theme, ${misc:Depends}
 Replaces: kde-icons-nuvola (<< 4:4.0.0), kdeartwork-theme-icon (<= 4:4.3.0-3)
-Conflicts: kde-icons-nuvola (<< 4:4.0.0), kdeartwork-theme-icon (<= 4:4.3.0-3)
+Breaks: kde-icons-nuvola (<< 4:4.0.0), kdeartwork-theme-icon (<= 4:4.3.0-3)
 Description: Nuvola icon theme for KDE
  This package contains the Nuvola icon theme for KDE.
  .

-- 
KDE Artwork module packaging