[SCM] kauth packaging branch, master, updated. debian/5.37.0-2-103-g9185517

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 75b22d898a1e7dd45cbfbf39b7faa405d34a0839
Merge: eee6679ad82180a0513206753c9f37c1520c5146 fda511a3a8bdb09f0e25365009724670e141eb3e
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:18:07 2015 -0700

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

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

diff --cc debian/changelog
index e2e4d8c,da887fd..20cb928
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
+ kauth (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:05:02 -0700
+ 
 +kauth (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +  * Revert the -dev package to MA same.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 27 Jun 2015 12:58:58 +0200
 +
  kauth (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kauth packaging