[SCM] attica packaging branch, kubuntu_vivid_backports, updated. debian/5.11.0-1-5-gf718fff

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit f718fffc29117daf14f666a58511e8c077bbe274
Merge: f925b31bdb99a2c9bdad646d68d428cfb5a746b4 1a5f9ad3c96b6df6f2e5a2220cd55020a42cb313
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 08:40:35 2015 -0700

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

 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 362c1eb,6816790..ce5ba21
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +attica-kf5 (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Vivid backport
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:01:40 -0700
 +
+ attica-kf5 (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>  Thu, 25 Jun 2015 16:48:15 +0200
+ 
  attica-kf5 (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
attica packaging