[SCM] kross packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-7-g920bab8

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 920bab863b9a227de92ce26f5945019f7d05aac2
Merge: cf52b16742e115c856bcb2eca78527f2e4eebea3 a69b9bce6846835a813133e95857d2eb022acddc
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 21:40:01 2015 -0700

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

 debian/changelog     |  9 +++++++++
 debian/control       | 32 ++++++++++++++++----------------
 debian/kross.install |  6 ++----
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --cc debian/changelog
index 6aae0e9,11ec524..a6168a8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
 +kross (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:22:28 -0700
 +
+ kross (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+   * Update install files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 14:33:06 +0200
+ 
  kross (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index 623bed9,0ef9d21..1c3b42d
--- a/debian/control
+++ b/debian/control
@@@ -5,17 -5,17 +5,17 @@@ 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),
-                kio-dev (>= 5.12.0),
-                libkf5completion-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5parts-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
-                libkf5xmlgui-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kdoctools-dev (>= 5.11.0~),
 -               kio-dev (>= 5.11.0~),
 -               libkf5completion-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5parts-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.10.0),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
 -               libkf5xmlgui-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.10.0~),
++               kdoctools-dev (>= 5.12.0~),
++               kio-dev (>= 5.12.0~),
++               libkf5completion-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5parts-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
++               libkf5xmlgui-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
                 qtscript5-dev (>= 5.4),
@@@ -31,12 -31,12 +31,12 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: kross-dev
  Section: libdevel
  Architecture: any
- Depends: kio-dev (>= 5.12.0),
 -Depends: kio-dev (>= 5.11.0~),
++Depends: kio-dev (>= 5.12.0~),
           kross (= ${binary:Version}),
-          libkf5i18n-dev (>= 5.12.0),
-          libkf5iconthemes-dev (>= 5.12.0),
-          libkf5parts-dev (>= 5.12.0),
-          libkf5widgetsaddons-dev (>= 5.12.0),
 -         libkf5i18n-dev (>= 5.11.0~),
 -         libkf5iconthemes-dev (>= 5.11.0~),
 -         libkf5parts-dev (>= 5.11.0~),
 -         libkf5widgetsaddons-dev (>= 5.11.0~),
++         libkf5i18n-dev (>= 5.12.0~),
++         libkf5iconthemes-dev (>= 5.12.0~),
++         libkf5parts-dev (>= 5.12.0~),
++         libkf5widgetsaddons-dev (>= 5.12.0~),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: development files for kross

-- 
kross packaging