[SCM] KDE metapackages branch, master, updated. debian/75

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/meta-kde.git;a=commitdiff;h=3266a3b

The following commit has been merged in the master branch:
commit 3266a3b543fae56a414ee575126553ee241c8f4a
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 26 18:47:59 2012 +0300

    Move kdebase-workspace-dev to kde-sc-dev-latest Conflicts.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67d4efc..1f016bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ meta-kde (5:75) UNRELEASED; urgency=low
   * Rename koffice to calligra, bump its version to 2.4.1.
   * Bump Standards-Version to 3.9.3: no changes needed.
   * Fix a spelling error in the kdegraphics-strigi-plugins description.
+  * Move kdebase-workspace-dev to kde-sc-dev-latest Conflicts.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Mar 2012 03:22:03 +0100
 
diff --git a/debian/control b/debian/control
index e924eed..0945e8e 100644
--- a/debian/control
+++ b/debian/control
@@ -212,7 +212,6 @@ Depends: ${misc:Depends}, debhelper (>= 7.3.16~), cmake (>= 2.6.4),
 Breaks: kdelibs5-dev (<< ${devLatest:Version}),
  kdepimlibs5-dev (<< ${devLatest:Version}),
  kde-workspace-dev (<< ${devLatest:Version}),
- kdebase-workspace-dev,
  libkactivities-dev (<< ${devLatest:Version}),
  libkexiv2-dev (<< ${devPrev:Version}), libkdcraw-dev (<< ${devPrev:Version}),
  libkipi-dev (<< ${devPrev:Version}), libmarble-dev (<< ${devPrev:Version}),
@@ -220,6 +219,7 @@ Breaks: kdelibs5-dev (<< ${devLatest:Version}),
  libkdeedu-dev (<< ${devPrev:Version}), kalgebra-dev (<< ${devPrev:Version}),
  okular-dev (<< ${devPrev:Version}),
  libakonadi-dev (<< 1.5.1)
+Conflicts: kdebase-workspace-dev
 Description: ensure that the latest KDE Development Platform is installed
  This package ensures that the latest version of the KDE Development Platform
  packages are installed on the system.

-- 
KDE metapackages