[SCM] KDE Base Workspace module packaging branch, squeeze, updated. debian/4.4.5-6-4-g74b4de5

[Modestas Vainius]

The following commit has been merged in the squeeze branch:
commit 15dc11dfebf2960d7f68b95f208dd271f50b5f58
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Jan 13 21:47:01 2011 +0200

    Replace Conflicts against kwin with Breaks in kde-window-manager. Also version them at (<< 4:4).
---
 debian/changelog |    2 ++
 debian/control   |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9aab011..c99e948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kdebase-workspace (4:4.4.5-7) UNRELEASED; urgency=low
 
+  * Replace Conflicts against kwin with Breaks in kde-window-manager. Also
+    version them at (<< 4:4).
 
  -- Modestas Vainius <modax at debian.org>  Thu, 13 Jan 2011 21:43:46 +0200
 
diff --git a/debian/control b/debian/control
index 24f14e3..d26595a 100644
--- a/debian/control
+++ b/debian/control
@@ -283,8 +283,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Provides: x-window-manager
 Replaces: kdebase-workspace-data (<< 4:4.1.80), kdebase-workspace-bin (<< 4:4.1.80),
- kwin, kdebase-runtime-data (<< 4:4.4.0)
-Conflicts: kwin
+ kwin (<< 4:4), kdebase-runtime-data (<< 4:4.4.0)
+Breaks: kwin (<< 4:4)
 Description: the K window manager (KWin)
  This package contains KWin, the KDE window manager, featuring 
  hardware-accelerated compositing effects.

-- 
KDE Base Workspace module packaging