[SCM] kinit packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-gcaeb29d

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit caeb29d3200917dc84a69b6c287f24109a3afd2d
Merge: c1c58e0814739288acc525652a7567899741079e 6d6228d285ad98cf764d4c34b7912742db54dacc
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Jul 8 17:27:15 2015 +0200

    Merge branch 'kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 48508f4,94d8749..35f0ea8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kinit (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:21:59 -0700
+ 
 +kinit (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 10:19:51 +0200
 +
  kinit (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
@@@ -96,7 -95,7 +102,7 @@@ kinit (5.2.0-0ubuntu1) utopic; urgency=
  
    [ Scarlett Clark ]
    * Move copyright extra details to comment to silence
--    space-in-std-shortname-in-dep5-copyright lintian error.  
++    space-in-std-shortname-in-dep5-copyright lintian error.
  
   -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Sep 2014 19:49:27 +0200
  

-- 
kinit packaging