[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=ab5185f

The following commit has been merged in the master branch:
commit ab5185f79b87be29175d31a208a22eadf4fb1af8
Merge: 07a3853052c33685d4432cbb2990262f94e1147b 9cac8f0a65f82ba94df83d2c7e381a000fcf72a2
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Sep 29 14:59:02 2015 -0700

    Fix merge, vivid backport.

 debian/changelog             |  27 ++++-
 debian/control               |   4 +
 debian/libkf5attica5.symbols | 230 +------------------------------------------
 3 files changed, 30 insertions(+), 231 deletions(-)

diff --cc debian/changelog
index 77ab6b9,c08a4ce..413c897
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,28 +1,33 @@@
 -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.
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 14:53:15 -0700  
+ 
+ attica-kf5 (5.13.0-0ubuntu1) wily; urgency=medium
+ 
+   [ José Manuel Santamaría Lema ]
+   * Update symbols file:
+     - Mark as optional the previously non-optional symbols gone after building
+       with gcc 5
+     - Keep the optional symbols gone after building with gcc 5
+ 
+   [ Jonathan Riddell ]
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 12:45:37 +0200
+ 
+ attica-kf5 (5.12.0-0ubuntu1) wily; urgency=medium
+ 
    * New upstream release
    * Vivid backport. 
-   * Vivid backport
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 14:53:15 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:22:16 +0200
  
  attica-kf5 (5.11.0-1) unstable; urgency=medium
  
diff --cc debian/control
index 542d35c,013355b..4c5f34d
--- a/debian/control
+++ b/debian/control
@@@ -5,7 -5,7 +5,11 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
++<<<<<<< HEAD
 +               extra-cmake-modules (>= 5.14.0),
++=======
+                extra-cmake-modules (>= 5.14.0~),
++>>>>>>> origin/kubuntu_unstable
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
  Standards-Version: 3.9.6

-- 
attica packaging