[SCM] kdelibs4support packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-12-g735ceff

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 735ceffb27352dcaa4bb1d8133445a52efaae363
Merge: b4cb2144f4001be21fdcbae7fb888cbf227ea5f0 90ad6a7d2f5b987f30d320187cd86a66e7d5bd76
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:07:36 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog                      | 14 ++++++--
 debian/control                        | 62 +++++++++++++++++------------------
 debian/libkf5kdelibs4support5.symbols | 29 ++++++++--------
 3 files changed, 57 insertions(+), 48 deletions(-)

diff --cc debian/changelog
index 17c6096,e328051..320c7eb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,16 +1,40 @@@
+ kdelibs4support (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 15:51:33 +0200
+ 
 +kdelibs4support (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:11:42 +0200
 +
 +kdelibs4support (5.9.0-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:21:43 +0200
 +
 +kdelibs4support (5.8.0-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:48:00 +0100
 +
 +kdelibs4support (5.7.0-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:03:42 +0100
 +
- kdelibs4support (5.10.0-1~) UNRELEASED; urgency=medium
+ kdelibs4support (5.9.0-2) experimental; urgency=medium
  
-   * New upstream release (5.10.0).
+   * Team upload.
+   * Update symbols file to fix FTBFS on armel, mips and mipsel.
  
-  -- Maximiliano Curia <maxy at debian.org>  Mon, 11 May 2015 12:23:20 +0200
+  -- Felix Geyer <fgeyer at debian.org>  Tue, 16 Jun 2015 18:10:40 +0200
  
  kdelibs4support (5.9.0-1) experimental; urgency=medium
  
diff --cc debian/control
index b409d60,ad3d721..535e261
--- a/debian/control
+++ b/debian/control
@@@ -5,30 -5,30 +5,30 @@@ 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),
-                kdesignerplugin (>= 5.10.0~),
-                kdoctools-dev (>= 5.10.0),
+                extra-cmake-modules (>= 5.11.0~),
+                kdesignerplugin (>= 5.11.0~),
+                kdoctools-dev (>= 5.11.0~),
 -               kgendesignerplugin (>= 5.6.0),
 +               kgendesignerplugin (>= 5.10.0),
-                kio-dev (>= 5.10.0),
+                kio-dev (>= 5.11.0~),
                 libecm-dev,
                 libintl-perl,
-                libkf5completion-dev (>= 5.10.0),
-                libkf5config-dev (>= 5.10.0),
-                libkf5configwidgets-dev (>= 5.10.0),
-                libkf5crash-dev (>= 5.10.0),
-                libkf5dbusaddons-dev (>= 5.10.0),
-                libkf5globalaccel-dev (>= 5.10.0),
-                libkf5guiaddons-dev (>= 5.10.0),
-                libkf5i18n-dev (>= 5.10.0),
-                libkf5iconthemes-dev (>= 5.10.0),
-                libkf5notifications-dev (>= 5.10.0),
-                libkf5parts-dev (>= 5.10.0),
-                libkf5service-dev (>= 5.10.0),
-                libkf5textwidgets-dev (>= 5.10.0),
-                libkf5unitconversion-dev (>= 5.10.0),
-                libkf5widgetsaddons-dev (>= 5.10.0),
-                libkf5windowsystem-dev (>= 5.10.0),
-                libkf5xmlgui-dev (>= 5.10.0),
+                libkf5completion-dev (>= 5.11.0~),
+                libkf5config-dev (>= 5.11.0~),
+                libkf5configwidgets-dev (>= 5.11.0~),
+                libkf5crash-dev (>= 5.11.0~),
+                libkf5dbusaddons-dev (>= 5.11.0~),
+                libkf5globalaccel-dev (>= 5.11.0~),
+                libkf5guiaddons-dev (>= 5.11.0~),
+                libkf5i18n-dev (>= 5.11.0~),
+                libkf5iconthemes-dev (>= 5.11.0~),
+                libkf5notifications-dev (>= 5.11.0~),
+                libkf5parts-dev (>= 5.11.0~),
+                libkf5service-dev (>= 5.11.0~),
+                libkf5textwidgets-dev (>= 5.11.0~),
+                libkf5unitconversion-dev (>= 5.11.0~),
+                libkf5widgetsaddons-dev (>= 5.11.0~),
+                libkf5windowsystem-dev (>= 5.11.0~),
+                libkf5xmlgui-dev (>= 5.11.0~),
                 libqt5concurrent5,
                 libqt5dbus5,
                 libqt5gui5,
@@@ -58,16 -58,16 +58,16 @@@ Package: libkf5kdelibs4support-de
  Section: libdevel
  Architecture: any
  Multi-Arch: foreign
- Depends: kdoctools-dev (>= 5.10.0),
+ Depends: kdoctools-dev (>= 5.11.0~),
 -         kgendesignerplugin (>= 5.6.0),
 +         kgendesignerplugin (>= 5.10.0),
           kinit-dev,
           kross-dev,
-          libkf5configwidgets-dev (>= 5.10.0),
-          libkf5crash-dev (>= 5.10.0),
+          libkf5configwidgets-dev (>= 5.11.0~),
+          libkf5crash-dev (>= 5.11.0~),
           libkf5dnssd-dev,
           libkf5emoticons-dev,
-          libkf5guiaddons-dev (>= 5.10.0),
-          libkf5iconthemes-dev (>= 5.10.0),
+          libkf5guiaddons-dev (>= 5.11.0~),
+          libkf5iconthemes-dev (>= 5.11.0~),
           libkf5idletime-dev,
           libkf5itemmodels-dev,
           libkf5kcmutils-dev,

-- 
kdelibs4support packaging