[SCM] attica packaging branch, master, updated. debian/5.37.0-2-104-gbedaaba

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 12364e16755d97ea57b382c223ae9a6bb147d0ff
Merge: 68afab891db71a4fbdc46225064040f63af9fa66 b8c9e8448685201e1058bfa1afcb6150a8eb2507
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Tue Sep 29 22:28:31 2015 +0000

    Merging remotes/origin/kubuntu_vivid_archive into kubuntu_vivid_backports.

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

diff --cc debian/changelog
index 5ea8cde,e60c9ec..9cd139d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,15 +1,21 @@@
+ attica-kf5 (5.9.0-0ubuntu2) UNRELEASED; urgency=medium
+ 
+   * Fix control line 9 failure. 
+   * Fix merge. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 15:12:00 -0700
+ 
 -attica-kf5 (5.14.0-0ubuntu1) wily; urgency=medium
 +attica-kf5 (5.14.0-0ubuntu1) UNRELEASED; urgency=medium
  
 +  [ Clive Johnston ]
    * new upstream release
  
 - -- Clive Johnston <clivejo at aol.com>  Thu, 17 Sep 2015 13:03:00 +0100
 +  [ Scarlett Clark ]
 +  * Vivid backport. 
 +  * Manual merge, fix changelog failure.
 +  * Merge nightmare. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 14:53:15 -0700
  
  attica-kf5 (5.13.0-0ubuntu1) wily; urgency=medium
  

-- 
attica packaging