[SCM] kcoreaddons packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-gda1a01d

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 66dfbf1752dc95877c5c1a172d4714990baeb421
Merge: 6cba47c5f879cddcf6c3178cfced6a1106bde239 1c229ce2adf92ff7a25255dfc04f8e032781cd22
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 09:24:50 2015 +0200

    Merge commit '1c229ce2adf92ff7a25255dfc04f8e032781cd22'
    
    Conflicts:
    	debian/control
    	debian/libkf5coreaddons5.symbols

 debian/changelog                 | 12 ++++++++++++
 debian/control                   |  4 +---
 debian/libkf5coreaddons5.symbols |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index ccbb743,4eb0b50..2185abb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,15 +1,41 @@@
 +kcoreaddons (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * Remove colliding webp mime info.
 +  * New patch: colliding_webp_mime_info
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:22:58 +0200
 +
+ kcoreaddons (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:24:41 +0200
+ 
 +kcoreaddons (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Remove upstream patch:
 +    upstream_add_licensing_information_for_files_missing_it
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 22:26:52 +0100
 +
+ kcoreaddons (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:31:53 +0100
+ 
 +kcoreaddons (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * Update build dependencies.
 +  * New upstream patch:
 +    upstream_add_licensing_information_for_files_missing_it
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 27 Feb 2015 23:52:34 +0100
 +
  kcoreaddons (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index ef006b2,184e58b..d4af179
--- a/debian/control
+++ b/debian/control
@@@ -1,19 -1,16 +1,19 @@@
  Source: kcoreaddons
++Section: libs
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 -               extra-cmake-modules (>= 1.8.0),
 -               pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev,
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
 +               extra-cmake-modules (>= 5.9.0~),
 +               libfam-dev,
 +               pkg-kde-tools (>= 0.15.16~),
 +               qtbase5-dev (>= 5.2.0),
                 qttools5-dev,
 -               qttools5-dev-tools
 +               qttools5-dev-tools,
 +               shared-mime-info (>= 1.3)
  Standards-Version: 3.9.6
--Section: libs
 +XS-Testsuite: autopkgtest
  Homepage: http://projects.kde.org/kcoreaddons
  Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/kcoreaddons.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kcoreaddons.git
@@@ -37,7 -34,7 +37,6 @@@ Description: KDE Frameworks 5 addons t
   This package contains the development files for KCoreAddons.
  
  Package: libkf5coreaddons5
--Section: libs
  Architecture: any
  Multi-Arch: same
  Depends: libkf5coreaddons-data (= ${source:Version}),
@@@ -53,7 -49,7 +52,6 @@@ Description: KDE Frameworks 5 addons t
   This package is part of KDE Frameworks 5.
  
  Package: libkf5coreaddons-data
--Section: libs
  Architecture: all
  Multi-Arch: foreign
  Depends: ${misc:Depends}, ${shlibs:Depends}

-- 
kcoreaddons packaging