[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2+squeeze1-133-ge1aacd7

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 8783ecfa3df6c51ba30bd53462d27b7bd54823df
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Apr 6 15:16:23 2011 +0300

    Drop redundant kjscmd from kdelibs5-data Conflicts.
---
 debian/changelog |    1 +
 debian/control   |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89b8b6d..997d483 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ kde4libs (4:4.6.2-0r2) UNRELEASED; urgency=low
   * Pass required kdelibs cmake flags to dh_auto_configure.
     qt-kde-team/2/debian-qt-kde.mk no longer passes them implicitly.
   * Remove a deprecated link to the BSD license from debian/copyright.
+  * Drop redundant kjscmd from kdelibs5-data Conflicts.
 
   [ George Kiagiadakis ]
   * Change my email address in uploaders.
diff --git a/debian/control b/debian/control
index 0b4fe79..c8af1cf 100644
--- a/debian/control
+++ b/debian/control
@@ -537,7 +537,6 @@ Replaces: kdebase-workspace-data (<< 4:4.1.66), libplasma2, kjscmd (<< 4:3.5.10-
 Breaks: kdebase-workspace-data (<< 4:4.1.66), libplasma2, kjscmd (<< 4:3.5.10-1),
  kdelibs-data (<< 4:3.5.10.dfsg.1-5), kdelibs5-dev (<< 4:4.4.2),
  kdebase-runtime-data (<< 4:4.5.85)
-Conflicts: kjscmd (<< 4:3.5.10-1)
 Description: core shared data for all KDE Applications
  This package contains architecture-independent data files needed to run KDE
  Applications.

-- 
KDE Development Platform Libraries module packaging