[SCM] libkipi packaging branch, master, updated. debian/4%17.08.1-1-6-gaea7b96

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit ef01d92bc80bf5b2983256cf6365767906d3f109
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 8 22:10:47 2017 +0100

    libkf5kipi-dev: remove libkipi*-dev conflicts
---
 debian/changelog | 2 ++
 debian/control   | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 41cde56..8fc80a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ libkf5kipi (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.1.2, no changes required.
   * Simplify watch file, and switch it to https.
   * Replace ksnapshot with spectacle in descriptions.
+  * Remove all the libkipi*-dev conflicts from libkf5kipi-dev, since they are
+    not conflicting anymore.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Dec 2017 22:02:13 +0100
 
diff --git a/debian/control b/debian/control
index 44ebfc3..abf8d28 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,6 @@ Package: libkf5kipi-dev
 Section: libdevel
 Architecture: any
 Depends: libkf5kipi32.0.0 (= ${binary:Version}), pkg-config, ${misc:Depends}
-Conflicts: libkipi0-dev, libkipi5-dev, libkipi6-dev, libkipi7-dev
 Description: KDE Image Plugin Interface library -- development files
  Libkipi is a KDE library that provides a common interface for operations
  on images such as manipulation, organization, importing from and exporting

-- 
libkipi packaging