[SCM] attica packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-g1a5f9ad

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 1a5f9ad3c96b6df6f2e5a2220cd55020a42cb313
Merge: 610d0bf8546880aae690c4fc0efef0929d6587f4 ec651084f7bc263abab2e2cea8957412c5620538
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:11:05 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 4926d5d,39a8db4..6816790
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ 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 ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:53:43 +0200
 +
  attica-kf5 (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
attica packaging