[SCM] plasma-sdk packaging branch, master, updated. 8dd5dd3eeb7bd6b1e6074722e1e1b3df2678832f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-sdk.git;a=commitdiff;h=f8fd579

The following commit has been merged in the master branch:
commit f8fd579a2191bb2abf18b0f9aded7f8420d5b0b7
Merge: 2e8dcba8916986b73cd970ee5f907cd611524fe6 460c4ff5fbc4a1654340ba7093ef408ce9d9745f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jun 30 23:29:07 2015 +0200

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

 debian/changelog | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 0ec73b0,c784142..dafdae1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,22 +1,20 @@@
 -plasma-sdk (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +plasma-sdk (5.3.2-1~) UNRELEASED; urgency=medium
  
 -  [ Maximiliano Curia ]
 -  * Initial Debian release.
 -  * New upstream release (5.3.1).
 -
 -  [ Jonathan Riddell ]
 -  * New upstream release
 +  * New upstream release (5.3.2).
 +  * Update copyright information.
  
 - -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 19:04:10 +0200
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:23:41 +0200
  
 -plasma-sdk (4:5.3.0-0ubuntu1) UNRELEASED; urgency=medium
 +plasma-sdk (5.3.1-1) unstable; urgency=medium
  
 -  * New upstream release
++  [ Maximiliano Curia ]
 +  * Initial Debian release.
 +  * New upstream release (5.3.1).
  
 - -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:35:30 +0200
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 11:11:24 +0200
  
- plasma-sdk (4:5.3.0-0ubuntu1) UNRELEASED; urgency=medium
+ plasma-sdk (4:5.3.1-0ubuntu1) wily; urgency=medium
  
-   [ Harald Sitter ]
-   * Initial release.
- 
-   [ Jonathan Riddell ]
    * new upstream release
  
-  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 Apr 2015 17:09:12 +0200
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Jun 2015 20:35:20 +0200

-- 
plasma-sdk packaging