[SCM] libkipi packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-27-g386a4b7

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 386a4b7dc7d1de1f43877fa179126b4547deb3d9
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Feb 24 08:23:57 2016 -0800

    Add new build dep.
---
 debian/changelog              |  4 ++++
 debian/control                | 15 +++++++++------
 debian/libkf5kipi-dev.install |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f18a531..5e0f32e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 libkf5kipi (15.12.1-1ubuntu1) UNRELEASED; urgency=medium
 
+  [ Clive Johnston ]
   * New upstream release
   * Merged with Debian
   * Updating symbols file
 
+  [ Scarlett Clark ]
+  * Add new build dep. 
+
  -- Clive Johnston <clivejo at aol.com>  Mon, 08 Feb 2016 20:50:19 +0000
 
 libkf5kipi (15.12.1-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 502fea4..a854147 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: cmake (>= 2.8.12~),
                extra-cmake-modules (>= 1.1.0~),
                libkf5config-dev (>= 5.1.0~),
                libkf5i18n-dev (>= 5.1.0~),
+               libkf5kdcraw-dev (>= 15.12.0),
                libkf5kexiv2-dev (>= 5.0.0~),
                libkf5service-dev (>= 5.1.0~),
                libkf5xmlgui-dev (>= 5.1.0~),
@@ -21,9 +22,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/libkipi.git
 Package: libkf5kipi-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5kipi30.0.0 (= ${binary:Version}),
-         pkg-config,
-         ${misc:Depends}
+Depends: libkf5kipi30.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
@@ -56,11 +55,15 @@ Architecture: all
 Depends: ${misc:Depends}
 Replaces: kdegraphics-libs-data (<< 4:4.6.80),
           libkdcraw5,
+          libkipi-data,
           libkipi0,
           libkipi5,
-          libkipi6,
-          libkipi-data
-Breaks: kdegraphics-libs-data (<< 4:4.6.80), libkipi0, libkipi5, libkipi6, libkipi-data
+          libkipi6
+Breaks: kdegraphics-libs-data (<< 4:4.6.80),
+        libkipi-data,
+        libkipi0,
+        libkipi5,
+        libkipi6
 Description: KDE Image Plugin Interface library -- data files
  Libkipi is a KDE library that provides a common interface for operations
  on images such as manipulation, organization, importing from and exporting
diff --git a/debian/libkf5kipi-dev.install b/debian/libkf5kipi-dev.install
index 2eb7c93..5a3c8c8 100644
--- a/debian/libkf5kipi-dev.install
+++ b/debian/libkf5kipi-dev.install
@@ -1,4 +1,4 @@
 usr/include/KF5/KIPI/
 usr/include/KF5/libkipi_version.h
-usr/lib/*/libKF5Kipi.so
 usr/lib/*/cmake/KF5Kipi/
+usr/lib/*/libKF5Kipi.so

-- 
libkipi packaging