[SCM] kdesignerplugin packaging branch, master, updated. debian/5.37.0-2-77-gac28fe5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9145217692ccd204b77f5726d284499b9d5d74ae
Merge: 6a4501696f4eaa522afa818b3bb78eb8d0e87e79 5bba1378d09c3f92ef2fcb3a3b6325b2f67e0f3e
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 13:19:45 2015 -0700

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

 debian/changelog |  8 ++++++++
 debian/control   | 30 +++++++++++++++---------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index dc56561,e12f705..c4bad75
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,17 @@@
 -kdesignerplugin (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kdesignerplugin (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
 -  * Vivid backport
 +  * New upstream release
++  * Fix merge, remove unused broken backport.
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:13:45 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:04:49 -0700
  
+ kdesignerplugin (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 13:46:51 +0200
+ 
  kdesignerplugin (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index 335a66c,a7e08c3..5b0eeb5
--- a/debian/control
+++ b/debian/control
@@@ -5,21 -5,21 +5,21 @@@ 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),
-                libkf5config-dev (>= 5.12.0),
-                libkf5configwidgets-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5itemviews-dev (>= 5.12.0),
-                libkf5plotting-dev (>= 5.12.0),
-                libkf5sonnet-dev (>= 5.12.0),
-                libkf5textwidgets-dev (>= 5.12.0),
-                libkf5webkit-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~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5configwidgets-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5itemviews-dev (>= 5.11.0~),
 -               libkf5plotting-dev (>= 5.11.0~),
 -               libkf5sonnet-dev (>= 5.11.0~),
 -               libkf5textwidgets-dev (>= 5.11.0~),
 -               libkf5webkit-dev (>= 5.11.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~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5configwidgets-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5itemviews-dev (>= 5.12.0~),
++               libkf5plotting-dev (>= 5.12.0~),
++               libkf5sonnet-dev (>= 5.12.0~),
++               libkf5textwidgets-dev (>= 5.12.0~),
++               libkf5webkit-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
++               libkf5xmlgui-dev (>= 5.12.0~),
                 libqt5webkit5-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),

-- 
kdesignerplugin packaging