[SCM] kpackage packaging branch, master, updated. debian/5.37.0-2-83-gd1244e3

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b3fc613760411ab630e43e1362b36e65409584f6
Merge: e98989f07b17aa3fccd25f42bad2eb72678eb210 97d8a4e4970a88db7434f4f3571cae1d11604e6d
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 19:27:46 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                | 13 ++++++++++---
 debian/control                  | 14 +++++++-------
 debian/libkf5package-dev.acc.in |  1 +
 debian/libkf5package5.symbols   |  3 ++-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 0dfefc2,3d19a03..819d165
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,15 @@@
 +kpackage (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  + Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:19:44 -0700
 +
- kpackage (5.10.0-0ubuntu2) wily; urgency=medium
+ kpackage (5.11.0-1) unstable; urgency=medium
  
+   * New upstream release (5.11.0).
+ 
+   [ José Manuel Santamaría Lema ]
    * libkf5package-data Breaks/Replaces libkf5package5 (<< 5.10) LP: #1461987
    * kpackagetool5 Breaks/Replaces libkf5package5 (<< 5.10)
  
diff --cc debian/control
index b42ae54,1770c24..84b59a4
--- a/debian/control
+++ b/debian/control
@@@ -5,12 -5,12 +5,12 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
-                kdoctools-dev (>= 5.12.0),
-                libkf5archive-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kdoctools-dev (>= 5.11.0~),
 -               libkf5archive-dev (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               kdoctools-dev (>= 5.12.0~),
++               libkf5archive-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
                 pkg-kde-tools,
                 pkg-kde-tools (>> 0.15.15),
                 qtbase5-dev (>= 5.4)
@@@ -37,7 -37,7 +37,7 @@@ Description: command line kpackage too
  Package: libkf5package-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5coreaddons-dev (>= 5.12.0),
 -Depends: libkf5coreaddons-dev (>= 5.11.0~),
++Depends: libkf5coreaddons-dev (>= 5.12.0~),
           libkf5package5 (= ${binary:Version}),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}

-- 
kpackage packaging