[SCM] kxmlrpcclient packaging branch, kubuntu_wily_archive, updated. a7f85d025f621a0fb87daacfb685e9580184bcb2

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit a2bf2420b7069d71f4d7fde5935afcafa9373675
Merge: b34060317e57399fa36cb49bbe52adb735f82d64 6d8f0de03af7adfee70aa0f8bf650fd84cc34ee5
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:45:08 2015 +0200

    Merge commit '6d8f0de03af7adfee70aa0f8bf650fd84cc34ee5'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/libkf5xmlrpcclient5.install

 debian/changelog | 21 +++++++++++++++++++++
 debian/control   | 17 +++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index b1cf27c,4ae27f3..b9524ef
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,16 @@@
 +kxmlrpcclient (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:22:52 +0200
 +
+ kxmlrpcclient (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:25:09 +0200
+ 
 -kxmlrpcclient (5.8.0-0ubuntu1) vivid; urgency=medium
 +kxmlrpcclient (5.8.0-1) experimental; urgency=medium
  
    [ Harald Sitter ]
    * Split from plasma-workspace. kxmlrpcclient is now a framework.
@@@ -14,13 -14,15 +20,28 @@@
  
    [ Scarlett Clark ]
    * usr/share/locale seems to have gone missing.
 -    - comment out data package as it would be empty. 
 +    - comment out data package as it would be empty.
    * Remove the depend to empty -data package.
 +  * Split from plasma-workspace. kxmlrpcclient is now a framework.
 +  * Drop epoch as there is no file or package name overlap with the old
 +    library.
  
 - -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 13 Mar 2015 20:55:38 +0100
 +  [ Maximiliano Curia ]
 +  * Prepare initial Debian release.
  
 -kxmlrpcclient (5.7.50-0ubuntu1) UNRELEASED; urgency=medium
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:32 +0100
+ 
++kxmlrpcclient (5.8.0-0ubuntu1) vivid; urgency=medium
++
++  [ Harald Sitter ]
+   * Split from plasma-workspace. kxmlrpcclient is now a framework.
 -  * Drop epoch as there is no file or package name overlap with the old
 -    library.
+ 
 - -- Harald Sitter <sitter at kde.org>  Fri, 13 Feb 2015 10:05:30 +0100
++  [ Jonathan Riddell ]
++  * New upstream release
++
++  [ Scarlett Clark ]
++  * usr/share/locale seems to have gone missing.
++    - comment out data package as it would be empty.
++  * Remove the depend to empty -data package.
++
++ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 13 Mar 2015 20:55:38 +0100
diff --cc debian/control
index 9b0b422,ceef78f..ea843a3
--- a/debian/control
+++ b/debian/control
@@@ -29,6 -24,17 +29,17 @@@ Description: development files for kxml
   .
   This package contains the development files.
  
+ Package: libkf5xmlrpcclient-data
+ Architecture: all
 -Depends: ${misc:Depends}, ${shlibs:Depends}
+ Multi-Arch: foreign
++Depends: ${misc:Depends}, ${shlibs:Depends}
+ Description: data files for kxmlrpcclient
+  XML RPC client library.
+  .
+  This package is part of KDE Frameworks 5.
+  .
+  This package contains the data files.
+ 
  Package: libkf5xmlrpcclient5
  Architecture: any
  Multi-Arch: same
@@@ -39,8 -47,8 +52,8 @@@ Description: framework providing an xm
   This package is part of KDE Frameworks 5.
  
  Package: libkf5xmlrpcclient-dbg
--Priority: extra
  Section: debug
++Priority: extra
  Architecture: any
  Multi-Arch: same
  Depends: libkf5xmlrpcclient5 (= ${binary:Version}), ${misc:Depends}

-- 
kxmlrpcclient packaging