[SCM] kwin packaging branch, master, updated. debian/5.3.2-3-3-g818bec2

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwin.git;a=commitdiff;h=818bec2

The following commit has been merged in the master branch:
commit 818bec21411103a6badf362f87c7ffe9e6e62049
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Aug 10 20:24:03 2015 +0200

    Make kwin-x11 break/replace kde-window-manager (<< 4:5) because of the /usr/bin/kwin file conflict.
---
 debian/changelog | 2 ++
 debian/control   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ffa72b7..d426b47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ kwin (4:5.3.2-4) UNRELEASED; urgency=medium
 
   [ Felix Geyer ]
   * Update symbols files for gcc 5.
+  * Make kwin-x11 break/replace kde-window-manager (<< 4:5) because of the
+    /usr/bin/kwin file conflict.
 
  -- Scott Kitterman <scott at kitterman.com>  Fri, 31 Jul 2015 03:16:55 -0400
 
diff --git a/debian/control b/debian/control
index 3bfcc3d..8343f76 100644
--- a/debian/control
+++ b/debian/control
@@ -117,6 +117,8 @@ Description: KDE window manager, common files
 Package: kwin-x11
 Architecture: any
 Depends: kwin-common (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: kde-window-manager (<< 4:5)
+Replaces: kde-window-manager (<< 4:5)
 Provides: kwin
 Description: KDE window manager, X11 version
  KWin (pronounced as one syllable "kwin") is the window

-- 
kwin packaging