[SCM] kpackage packaging branch, master, updated. debian/5.8.0-1-11-g5dc4480

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit acf27a6f6736d19bc1e6bc48acdf648d87f40582
Merge: ca16e79a32e115c8502d8fe6bbcd9cae3ed53a83 d78c48f46b53c944b4b30d2cc1ffb22508ad2a1e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:09:20 2015 +0200

    Merge commit 'd78c48f46b53c944b4b30d2cc1ffb22508ad2a1e'
    
    Conflicts:
    	debian/control
    	debian/kpackagetool5.install

 debian/changelog | 12 ++++++++++++
 debian/control   |  1 +
 2 files changed, 13 insertions(+)

diff --cc debian/changelog
index 815c08d,2fad262..8cb37a3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +kpackage (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 17 Apr 2015 12:56:36 +0200
 +
+ kpackage (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:28:57 +0200
+ 
 +kpackage (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:49 +0100
 +
+ kpackage (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:38:53 +0100
+ 
 +kpackage (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:46 +0100
 +
  kpackage (5.7.0-0ubuntu1) vivid; urgency=medium
  
    [ Harald Sitter ]
diff --cc debian/control
index 266a0e4,9026fd7..703a59d
--- a/debian/control
+++ b/debian/control
@@@ -52,9 -47,8 +52,10 @@@ Description: development files for kpac
  Package: libkf5package5
  Architecture: any
  Multi-Arch: same
 -Depends: ${misc:Depends}, ${shlibs:Depends}
 +Depends: libkf5package-data (= ${source:Version}),
 +         ${misc:Depends},
 +         ${shlibs:Depends}
+ Recommends: kpackagetool5 (>= ${binary:Version})
  Description: non-binary asset management framework
   KPackage provides classes for applications to manage user installable packages
   of non-binary assets.

-- 
kpackage packaging