[SCM] ksshaskpass packaging branch, kubuntu_wily_archive, updated. debian/5.2.2-1-12-g5944034

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 594403483a7771b1174bced95e62a6454979c326
Merge: ae61946405091c63e6f3605d6989475f2712e9dd 0f48f7cddb16631a305eb1a87ced4c5fa873023a
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:16:39 2015 +0200

    merge master

 debian/.gitattributes                         |  1 +
 debian/README.Debian                          |  2 +-
 debian/changelog                              | 25 ++++++++++
 debian/control                                | 10 ++--
 debian/copyright                              | 66 +++++++++++++--------------
 debian/meta/upstream_scm.json                 |  1 +
 debian/patches/manpage-add-last-modified-date | 12 +++++
 debian/patches/series                         |  1 +
 debian/postinst                               |  2 -
 debian/prerm                                  |  4 +-
 debian/rules                                  |  1 -
 debian/watch                                  |  3 ++
 12 files changed, 81 insertions(+), 47 deletions(-)

diff --cc debian/changelog
index bcceb5a,42fd56a..cb04aec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,18 +1,38 @@@
 +ksshaskpass (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:28:21 +0200
 +
 +ksshaskpass (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Plasma 5.3 beta
 +  * new upstream release
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:32:03 +0200
 +
+ ksshaskpass (4:5.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.3.0).
+   * New upstream release (5.3.1).
+   * New patch: manpage-add-last-modified-date (Closes: #787115)
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 04 Jun 2015 13:54:59 +0200
+ 
+ ksshaskpass (4:5.2.2-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+   * New upstream release (5.2.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:57 +0100
+ 
  ksshaskpass (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
ksshaskpass packaging