[SCM] kparts packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g73a3f33

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 9ffafc3f675303432fe758d60630947b46533ba0
Merge: 4f34518901a21f0c0f25b373518cc4700833accc cda5b16d71ed20c7ab73650e2cd4896f191cdd68
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:11:21 2015 +0200

    Merge commit 'cda5b16d71ed20c7ab73650e2cd4896f191cdd68'
    
    Conflicts:
    	debian/control

 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --cc debian/changelog
index 7057c1f,980828b..6b5068a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +kparts (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:37 +0200
 +
+ kparts (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:18:42 +0200
+ 
 +kparts (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:39:10 +0100
 +
+ kparts (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:45:09 +0100
+ 
 +kparts (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:56 +0100
 +
  kparts (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kparts packaging