[SCM] karchive packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-12-gb845285

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 4b249edf5807135de13681310cba0a2e88070a77
Merge: c19e77a8ee1016dc15d98e29e0c9fe76af66aee3 e8a742ea7a8db802f618cf3918037beb23314595
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:14:45 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 3bb32a0,e2a47c4..691a091
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
+ karchive (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:04:15 -0700
+ 
 +karchive (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).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 18:59:43 +0200
 +
  karchive (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
karchive packaging