[SCM] kpeople packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-9-gff92b25

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit ff92b25e48ac0c8fe258591cab22a1476df6edbd
Merge: 857935ac943330a4a50e609f27ae970632ade9e0 b1b7f99c9ed842ac63d13f9b6b6a1dccdf998074
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 20:45:26 2015 -0700

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

 debian/changelog |  9 +++++++++
 debian/control   | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index d741684,0735a83..90ca597
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
 +kpeople (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:20:49 -0700
 +
+ kpeople (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * Remove upstream applied patch: upstream_rename-tranlations.diff
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 16:04:17 +0200
+ 
  kpeople (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index cdeca54,e3ace7a..aa7d7c8
--- a/debian/control
+++ b/debian/control
@@@ -6,12 -6,12 +6,12 @@@ Uploaders: Maximiliano Curia <maxy at debi
  Build-Depends: cmake (>= 2.8.12~),
                 dbus-x11,
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5itemviews-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5itemviews-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.10.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5itemviews-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
                 libqt5sql5-sqlite,
                 pkg-kde-tools (>> 0.15.15),
                 qtbase5-dev (>= 5.4),

-- 
kpeople packaging