[SCM] kcoreaddons packaging branch, kubuntu_vivid_archive, updated. 84760147c0c097145c6e3fdcec795413bc068412

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcoreaddons.git;a=commitdiff;h=8476014

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 84760147c0c097145c6e3fdcec795413bc068412
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Fri Dec 5 07:06:38 2014 -0800

    Add -data as a depend to parent package.
    * wrap-and-sort
---
 debian/changelog                    | 5 +++++
 debian/control                      | 8 ++++++--
 debian/copyright                    | 2 +-
 debian/libkf5coreaddons-dev.install | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe34054..0019052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 kcoreaddons (5.4.0-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Jonathan Riddell ]
   * Remove unused FAM build-dep, we use inotify
   * Remove unused patch disable-failing-test.diff
 
+  [ Scarlett Clark ]
+  * Add -data as a depend to parent package.
+  * wrap-and-sort 
+
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 28 Nov 2014 13:10:03 +0100
 
 kcoreaddons (5.4.0-0ubuntu1) vivid; urgency=medium
diff --git a/debian/control b/debian/control
index 2f2f0a5..acbca4c 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,9 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kcoreaddons.git
 Package: libkf5coreaddons-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, libkf5coreaddons5 (= ${binary:Version}), qtbase5-dev
+Depends: libkf5coreaddons5 (= ${binary:Version}),
+         qtbase5-dev,
+         ${shlibs:Depends}
 Replaces: libkf5service-dev (<= 5.2.0)
 Breaks: libkf5service-dev (<= 5.2.0)
 Description: KDE Frameworks 5 addons to QtCore - development files
@@ -35,7 +37,9 @@ Package: libkf5coreaddons5
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libkf5coreaddons-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: KDE Frameworks 5 addons to QtCore
  KCoreAddons provides classes built on top of QtCore to perform various tasks
  such as manipulating mime types, autosaving files, creating backup files,
diff --git a/debian/copyright b/debian/copyright
index 1deebb6..0c77d0f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -173,4 +173,4 @@ License: LGPL-2.1+
  .
  On Debian systems, the complete text of the
  GNU Lesser General Public License version 2.1 can be found in
- /usr/share/common-licenses/LGPL-2.1
\ No newline at end of file
+ /usr/share/common-licenses/LGPL-2.1
diff --git a/debian/libkf5coreaddons-dev.install b/debian/libkf5coreaddons-dev.install
index 0d65411..80700ed 100644
--- a/debian/libkf5coreaddons-dev.install
+++ b/debian/libkf5coreaddons-dev.install
@@ -1,6 +1,6 @@
+usr/bin/desktoptojson
 usr/include/*
 usr/lib/*/cmake/*
 usr/lib/*/libKF5CoreAddons.so
 usr/lib/*/qt5/mkspecs/modules/*
 usr/share/mime/packages/kde5.xml
-usr/bin/desktoptojson

-- 
kcoreaddons packaging