[SCM] kxmlrpcclient packaging branch, master, updated. debian/5.37.0-2-80-g6ff5a7f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6d111126ba62cc7d43be1889518d8e011e745f33
Merge: b82224ef4e5442f51ba6d053abbcb97b77ce1bb4 c3de55873418429363a7f1fbc7fa11b866de3513
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sat Jul 11 07:05:52 2015 -0700

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

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

diff --cc debian/changelog
index 1d9bd8d,e8ecb03..0733ab6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,20 +1,20 @@@
 -kxmlrpcclient (5.11.0-1) unstable; urgency=medium
 +kxmlrpcclient (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
-   [ Jonathan Riddell ]
-   * Remove  0001-add-LGPL-file.patch, applied upstream
- 
-   [ Scarlett Clark ]
 -  * New upstream release (5.11.0).
 +  * New upstream release
++  * Fix merrge, remove unused broken backport.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:29:09 -0700
++ 
++kxmlrpcclient (5.11.0-1) unstable; urgency=medium 
+ 
+   [ Jonathan Riddell ]
+   * Remove 0001-add-LGPL-file.patch, applied upstream
+ 
+   [ Maximiliano Curia ]
++  * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 10:56:14 +0200
  
 -kxmlrpcclient (5.10.0-0ubuntu2) UNRELEASED; urgency=medium
 -
 -  * Remove  0001-add-LGPL-file.patch, applied upstream
 -
 - -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 15 Jun 2015 06:40:23 +0200
 -
  kxmlrpcclient (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index c9f1ee1,3e29a65..39f6841
--- a/debian/control
+++ b/debian/control
@@@ -5,9 -5,9 +5,9 @@@ 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),
-                kio-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kio-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.10.0~),
++               kio-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
                 pkg-kde-tools (>> 0.15.15),
                 qtbase5-dev (>= 5.4)
  Standards-Version: 3.9.6

-- 
kxmlrpcclient packaging