[SCM] kdecoration packaging branch, kubuntu_wily_archive, updated. debian/5.2.2-1-14-g398a425

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kdecoration.git;a=commitdiff;h=398a425

The following commit has been merged in the kubuntu_wily_archive branch:
commit 398a425ead8edb7b6c6a35c5ea4144661bb71f24
Merge: 7dd78cadde07190c40c94a6ece94e84e3a87ba51 7cf02314d3b672400ba1f25a2e10d2ae657dbe12
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:08:02 2015 +0200

    merge master

 debian/.gitattributes                   |  1 +
 debian/changelog                        | 29 +++++++++++++++++++++++++++++
 debian/control                          | 17 ++++++++++-------
 debian/copyright                        | 32 ++++++++++++++++++++++++--------
 debian/libkdecorations2-5.symbols       |  9 +++++++++
 debian/libkdecorations2-dev.acc.in      | 23 +++++++++++++++++++++++
 debian/libkdecorations2-dev.install     |  8 +++++---
 debian/libkdecorations2private5.symbols |  8 ++++++++
 debian/rules                            |  4 +++-
 debian/tests/acc                        | 11 +++++++++++
 debian/tests/control                    |  5 ++++-
 debian/tests/testsuite.xsession         | 11 ++++++-----
 debian/watch                            |  3 +++
 13 files changed, 136 insertions(+), 25 deletions(-)

diff --cc debian/changelog
index 42a9af2,1dd65fc..7319fc3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,18 +1,38 @@@
 +kdecoration (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:24:55 +0200
 +
 +kdecoration (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Plasma 5.3 beta
 +  * new upstream release
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:26:45 +0200
 +
+ kdecoration (4:5.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.3.0).
+   * Update symbols files.
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 12:00:48 +0200
+ 
+ kdecoration (4:5.2.2-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+   * New upstream release (5.2.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:18:04 +0100
+ 
  kdecoration (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/libkdecorations2-5.symbols
index 74e031a,7768b7c..8d93fc7
--- a/debian/libkdecorations2-5.symbols
+++ b/debian/libkdecorations2-5.symbols
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +# SymbolsHelper-Confirmed: 4:5.2.2+git20150416.0912+15.04 amd64 i386
++=======
+ # SymbolsHelper-Confirmed: 4:5.3.0 amd64
++>>>>>>> master
  libkdecorations2.so.5 libkdecorations2-5 #MINVER#
   _ZN12KDecoration210Decoration10setBordersERK8QMargins at Base 5.1.50
   _ZN12KDecoration210Decoration10wheelEventEP11QWheelEvent at Base 5.1.50
@@@ -229,8 -229,8 +233,13 @@@
   _ZNK12KDecoration215DecoratedClient21isMaximizedVerticallyEv at Base 5.1.50
   _ZNK12KDecoration215DecoratedClient23isMaximizedHorizontallyEv at Base 5.1.50
   _ZNK12KDecoration215DecoratedClient4iconEv at Base 5.1.50
++<<<<<<< HEAD
 + _ZNK12KDecoration215DecoratedClient5colorEN8QPalette10ColorGroupENS1_9ColorRoleE at Base 4:5.2.2+git20150416.0912+15.04
 + _ZNK12KDecoration215DecoratedClient5colorENS_10ColorGroupENS_9ColorRoleE at Base 4:5.2.2+git20150416.0912+15.04
++=======
+  _ZNK12KDecoration215DecoratedClient5colorEN8QPalette10ColorGroupENS1_9ColorRoleE at Base 4:5.3.0
+  _ZNK12KDecoration215DecoratedClient5colorENS_10ColorGroupENS_9ColorRoleE at Base 4:5.3.0
++>>>>>>> master
   _ZNK12KDecoration215DecoratedClient5widthEv at Base 5.1.50
   _ZNK12KDecoration215DecoratedClient6heightEv at Base 5.1.50
   _ZNK12KDecoration215DecoratedClient7captionEv at Base 5.1.50
diff --cc debian/libkdecorations2private5.symbols
index 3bb0c1f,ce31e8b..f562c11
--- a/debian/libkdecorations2private5.symbols
+++ b/debian/libkdecorations2private5.symbols
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +# SymbolsHelper-Confirmed: 4:5.2.2+git20150416.0912+15.04 amd64 i386
++=======
+ # SymbolsHelper-Confirmed: 4:5.3.0 amd64
++>>>>>>> master
  libkdecorations2private.so.5 libkdecorations2private5 #MINVER#
   _ZN12KDecoration216DecorationBridge11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.1.50
   _ZN12KDecoration216DecorationBridge11qt_metacastEPKc at Base 5.1.50
@@@ -30,7 -30,7 +34,11 @@@
   _ZN12KDecoration225DecorationSettingsPrivateD2Ev at Base 5.1.50
   _ZNK12KDecoration216DecorationBridge10metaObjectEv at Base 5.1.50
   _ZNK12KDecoration222DecoratedClientPrivate10decorationEv at Base 5.1.50
++<<<<<<< HEAD
 + _ZNK12KDecoration222DecoratedClientPrivate5colorENS_10ColorGroupENS_9ColorRoleE at Base 4:5.2.2+git20150416.0912+15.04
++=======
+  _ZNK12KDecoration222DecoratedClientPrivate5colorENS_10ColorGroupENS_9ColorRoleE at Base 4:5.3.0
++>>>>>>> master
   _ZNK12KDecoration225DecorationSettingsPrivate11fontMetricsEv at Base 5.1.50
   _ZNK12KDecoration225DecorationSettingsPrivate12largeSpacingEv at Base 5.1.50+git20141213.0014+15.04
   _ZNK12KDecoration225DecorationSettingsPrivate12smallSpacingEv at Base 5.1.50+git20141213.0014+15.04

-- 
kdecoration packaging