[SCM] ksshaskpass packaging branch, master, updated. debian/5.2.0-1-29-g33964bb

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 078ba20afe6a7f31e49e3ac2970c0d971b09ae75
Merge: cb8d587a0752dfe782b934f2a84e4e77430bc7d6 1ff99c84df15429139e5b16660bc1407ae5ba1fa
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 10:47:53 2015 +0100

    Merge commit '1ff99c84df15429139e5b16660bc1407ae5ba1fa'
    
    Conflicts:
    	debian/control
    	debian/copyright
    	debian/rules

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

diff --cc debian/changelog
index c278158,1982c76..2606460
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,15 +1,32 @@@
 +ksshaskpass (4:5.2.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.2.1).
 +  * New upstream release (5.2.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 09:58:56 +0100
 +
+ ksshaskpass (4:5.2.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:21:58 -0700
+ 
+ ksshaskpass (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:41:09 -0800
+ 
 +ksshaskpass (4:5.2.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Add myself as Uploader.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 12 Feb 2015 22:28:23 +0100
 +
  ksshaskpass (4:5.2.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
ksshaskpass packaging