[SCM] kross packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-ga69b9bc

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a69b9bce6846835a813133e95857d2eb022acddc
Merge: 63cb0224c4ddf1bd4ef48dceaf41755273d8b900 37ff0efe91f1970abf4f2d5fbf7e6a4d89066a10
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:50:06 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control
    	debian/kross.install

 debian/changelog     |  8 ++++++++
 debian/control       | 30 +++++++++++++++---------------
 debian/kross.install |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index 545817e,56a0f84..11ec524
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,21 @@@
+ 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 ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:11:08 +0200
 +
  kross (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).
diff --cc debian/control
index 87d1941,b106f42..0ef9d21
--- 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.10.0),
-                kio-dev (>= 5.10.0),
-                libkf5completion-dev (>= 5.10.0),
-                libkf5coreaddons-dev (>= 5.10.0),
-                libkf5i18n-dev (>= 5.10.0),
-                libkf5iconthemes-dev (>= 5.10.0),
-                libkf5parts-dev (>= 5.10.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~),
 +               libkf5service-dev (>= 5.10.0),
-                libkf5widgetsaddons-dev (>= 5.10.0),
-                libkf5xmlgui-dev (>= 5.10.0),
+                libkf5widgetsaddons-dev (>= 5.11.0~),
+                libkf5xmlgui-dev (>= 5.11.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
                 qtscript5-dev (>= 5.4),
diff --cc debian/kross.install
index c537a5a,9747bf9..ab9a4c3
--- a/debian/kross.install
+++ b/debian/kross.install
@@@ -1,4 -1,4 +1,4 @@@
  usr/bin/kf5kross
 -usr/lib/*/qt5/plugins/kross*.so
 +usr/lib/*/qt5/plugins/*.so
- usr/lib/*/qt5/plugins/script/krossqtsplugin.so
+ usr/lib/*/qt5/plugins/script/kross*.so
  usr/share/locale/*/*/kross5.mo

-- 
kross packaging