[SCM] KDE Games module packaging branch, master, updated. debian/4.4.5-1-36-g0eda9ff

[Pino Toscano]

The following commit has been merged in the master branch:
commit 0eda9ffe9072c67a9ae73378c98c72083d932c53
Author: Pino Toscano <pino at kde.org>
Date:   Sat Apr 2 18:47:22 2011 +0200

    remove conflict of libkdegames5 against libkdegames1
    
    they have nothing common, so no need to not allow coinstallability
---
 debian/changelog |    2 ++
 debian/control   |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75ca27c..e60e63f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ kdegames (4:4.6.1-0r4) UNRELEASED; urgency=low
     used to generate irregular grid puzzles.
   * Update lintian overrides.
   * Remove article from short description.
+  * Remove conflict of libkdegames5 against libkdegames1, as they have
+    nothing common.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 Apr 2011 02:33:17 +0300
 
diff --git a/debian/control b/debian/control
index 11b5f3d..461fbed 100644
--- a/debian/control
+++ b/debian/control
@@ -51,8 +51,8 @@ Package: libkdegames5
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libkdegames1, libkdegames4
-Breaks: libkdegames1, libkdegames4 
+Replaces: libkdegames4
+Breaks: libkdegames4
 Description: libraries and common files for KDE games
  This package contains shared libraries and common infrastructure used by KDE
  games, including support for the GNU Gaming Zone online gaming environment.

-- 
KDE Games module packaging