[SCM] kdesignerplugin packaging branch, master, updated. 6e3af278b086e9c26519b6c6f41ccca2eb4687fe

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 46c1a20aef38977d088f1d0d2233ef6d6d294749
Merge: e292d38d555881e49589a46ce66a2dcf65004813 75e32128777ac119a26da604806fb31ec070283a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 09:30:25 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control

 debian/changelog |  6 ++++++
 debian/control   | 18 +++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index e75abc0,4e01531..1ea2839
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,27 @@@
 +kdesignerplugin (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:35:59 +0100
 +
+ kdesignerplugin (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:35:23 +0100
+ 
 +kdesignerplugin (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update copyright information.
 +  * Update install files.
 +  * Update watch file.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 04 Feb 2015 10:11:35 +0100
 +
  kdesignerplugin (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 7fd5a36,fe8cb38..e3815c3
--- a/debian/control
+++ b/debian/control
@@@ -3,26 -3,40 +3,38 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
-                kdoctools-dev (>= 5.6.0),
-                kio-dev (>= 5.6.0),
 +               libkf5completion-dev (>= 5.6.0),
 +               libkf5config-dev (>= 5.6.0),
 +               libkf5configwidgets-dev (>= 5.6.0),
 +               libkf5coreaddons-dev (>= 5.6.0),
 +               libkf5iconthemes-dev (>= 5.6.0),
 +               libkf5itemviews-dev (>= 5.6.0),
 +               libkf5plotting-dev (>= 5.6.0),
 +               libkf5sonnet-dev (>= 5.6.0),
 +               libkf5textwidgets-dev (>= 5.6.0),
 +               libkf5webkit-dev (>= 5.6.0),
 +               libkf5widgetsaddons-dev (>= 5.6.0),
 +               libkf5xmlgui-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                kdoctools-dev (>= 5.7.0),
+                kio-dev (>= 5.7.0),
 -               libkf5archive-dev (>= 5.7.0),
 -               libkf5attica-dev (>= 5.7.0),
 -               libkf5auth-dev (>= 5.7.0),
 -               libkf5bookmarks-dev (>= 5.7.0),
 -               libkf5codecs-dev (>= 5.7.0),
+                libkf5completion-dev (>= 5.7.0),
+                libkf5config-dev (>= 5.7.0),
+                libkf5configwidgets-dev (>= 5.7.0),
+                libkf5coreaddons-dev (>= 5.7.0),
 -               libkf5dbusaddons-dev (>= 5.7.0),
 -               libkf5globalaccel-dev (>= 5.7.0),
 -               libkf5guiaddons-dev (>= 5.7.0),
 -               libkf5i18n-dev (>= 5.7.0),
+                libkf5iconthemes-dev (>= 5.7.0),
+                libkf5itemviews-dev (>= 5.7.0),
 -               libkf5jobwidgets-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
+                libkf5plotting-dev (>= 5.7.0),
 -               libkf5service-dev (>= 5.7.0),
 -               libkf5solid-dev (>= 5.7.0),
+                libkf5sonnet-dev (>= 5.7.0),
+                libkf5textwidgets-dev (>= 5.7.0),
+                libkf5webkit-dev (>= 5.7.0),
+                libkf5widgetsaddons-dev (>= 5.7.0),
 -               libkf5windowsystem-dev (>= 5.7.0),
+                libkf5xmlgui-dev (>= 5.7.0),
                 libqt5webkit5-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev,
 +               qtbase5-dev (>= 5.2.0),
                 qttools5-dev,
                 qttools5-dev-tools,
                 xauth,

-- 
kdesignerplugin packaging