[SCM] kldap packaging branch, master, updated. debian/17.08.3-1-6-g6e8e9f9

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kldap.git;a=commitdiff;h=f828337

The following commit has been merged in the master branch:
commit f828337fe9f885ccc638ea0e3c173aff5d4c8335
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 26 01:09:15 2017 +0100

    drop kdepimlibs-kio-plugins breaks/replaces
---
 debian/changelog | 3 +++
 debian/control   | 9 ++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce48f69..3ba2d44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kldap (17.08.3-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Remove the kdepimlibs-kio-plugins breaks/replaces, since that package is
+    for kdepimlibs 4.x.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Dec 2017 01:06:04 +0100
 
diff --git a/debian/control b/debian/control
index a662bda..c94d329 100644
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,8 @@ Package: kio-ldap
 Architecture: any
 Multi-Arch: no
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: kdepimlibs-kio-plugins, kf5-kdepimlibs-kio-plugins, ${kde-l10n:all}
-Breaks: kdepimlibs-kio-plugins, kf5-kdepimlibs-kio-plugins, ${kde-l10n:all}
+Replaces: kf5-kdepimlibs-kio-plugins, ${kde-l10n:all}
+Breaks: kf5-kdepimlibs-kio-plugins, ${kde-l10n:all}
 Description: library for accessing LDAP - development files
  This is a library for accessing LDAP with a convenient Qt style C++ API.
  LDAP (Lightweight Directory Access Protocol) is an application protocol
@@ -41,9 +41,8 @@ Depends: libkf5ldap5 (= ${binary:Version}),
          libsasl2-dev,
          qtbase5-dev,
          ${misc:Depends},
-Replaces: kdepimlibs-kio-plugins, kf5-kdepimlibs-kio-plugins, ${kde-l10n:all}
-Breaks: kdepimlibs-kio-plugins,
-        kf5-kdepimlibs-kio-plugins,
+Replaces: kf5-kdepimlibs-kio-plugins, ${kde-l10n:all}
+Breaks: kf5-kdepimlibs-kio-plugins,
         libkf5libkdepim-dev (<< 4:17.08),
         ${kde-l10n:all},
 Description: library for accessing LDAP - development files

-- 
kldap packaging