[SCM] kconfig packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-ga48dbc5

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a48dbc507ed72488a4f0a54b012ee2cdbee1e590
Merge: a7dc9e67319540545c046fcfe546949073589055 3327825c9e4056c9fc6576f787602b85b000dd2a
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:37:31 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 633c501,35a3644..6a28c7c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,20 @@@
+ kconfig (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:08:37 -0700
+ 
 +kconfig (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * Update symbols files from buildds logs (5.9.0-1).
 +  * New upstream release (5.11.0).
 +  * Revert the -dev package to MA same.
 +  * Update symbols files.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 17:26:46 +0200
 +
  kconfig (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kconfig packaging