[SCM] libkscreen packaging branch, kubuntu_unstable, updated. debian/5.2.2-1-24-ga712fa0

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a712fa088e56eeac380d0f4c7c4fc8f27a35180a
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jul 2 12:32:05 2015 +0000

    fix merge
---
 debian/libkf5screen6.symbols | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/debian/libkf5screen6.symbols b/debian/libkf5screen6.symbols
index 50c5216..cc8146a 100644
--- a/debian/libkf5screen6.symbols
+++ b/debian/libkf5screen6.symbols
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# SymbolsHelper-Confirmed: 4:5.2.2+git20150403.0042 amd64 i386
-=======
 # SymbolsHelper-Confirmed: 4:5.3.0 amd64
->>>>>>> master
 KSC_Fake.so libkf5screen6 #MINVER#
  qt_plugin_instance at Base 5.1.80
  qt_plugin_query_metadata at Base 5.1.80
@@ -145,11 +141,7 @@ libKF5Screen.so.6 libkf5screen6 #MINVER#
  _ZN7KScreen6Config11outputAddedERK14QSharedPointerINS_6OutputEE at Base 5.1.1
  _ZN7KScreen6Config11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.1.1
  _ZN7KScreen6Config11qt_metacastEPKc at Base 5.1.1
-<<<<<<< HEAD
- _ZN7KScreen6Config12canBeAppliedERK14QSharedPointerIS0_E6QFlagsINS0_12ValidityFlagEE at Base 4:5.2.1+git20150307.0128+15.04
-=======
  _ZN7KScreen6Config12canBeAppliedERK14QSharedPointerIS0_E6QFlagsINS0_12ValidityFlagEE at Base 4:5.3.0
->>>>>>> master
  _ZN7KScreen6Config12canBeAppliedERK14QSharedPointerIS0_E at Base 5.1.1
  _ZN7KScreen6Config12removeOutputEi at Base 5.1.1
  _ZN7KScreen6Config13outputRemovedEi at Base 5.1.1
@@ -157,21 +149,12 @@ libKF5Screen.so.6 libkf5screen6 #MINVER#
  _ZN7KScreen6Config16staticMetaObjectE at Base 5.1.1
  _ZN7KScreen6Config20primaryOutputChangedERK14QSharedPointerINS_6OutputEE at Base 5.1.1
  _ZN7KScreen6Config5applyERK14QSharedPointerIS0_E at Base 5.1.1
-<<<<<<< HEAD
- _ZN7KScreen6Config7Private11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.2.2+git20150403.0042
- _ZN7KScreen6Config7Private11qt_metacastEPKc at Base 4:5.2.2+git20150403.0042
- _ZN7KScreen6Config7Private16staticMetaObjectE at Base 4:5.2.2+git20150403.0042
- _ZN7KScreen6Config7PrivateD0Ev at Base 4:5.2.2+git20150403.0042
- _ZN7KScreen6Config7PrivateD1Ev at Base 4:5.2.2+git20150403.0042
- _ZN7KScreen6Config7PrivateD2Ev at Base 4:5.2.2+git20150403.0042
-=======
  _ZN7KScreen6Config7Private11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.0
  _ZN7KScreen6Config7Private11qt_metacastEPKc at Base 4:5.3.0
  _ZN7KScreen6Config7Private16staticMetaObjectE at Base 4:5.3.0
  _ZN7KScreen6Config7PrivateD0Ev at Base 4:5.3.0
  _ZN7KScreen6Config7PrivateD1Ev at Base 4:5.3.0
  _ZN7KScreen6Config7PrivateD2Ev at Base 4:5.3.0
->>>>>>> master
  _ZN7KScreen6Config8setValidEb at Base 5.1.1
  _ZN7KScreen6Config9addOutputERK14QSharedPointerINS_6OutputEE at Base 5.1.1
  _ZN7KScreen6Config9setScreenERK14QSharedPointerINS_6ScreenEE at Base 5.1.1
@@ -277,11 +260,7 @@ libKF5Screen.so.6 libkf5screen6 #MINVER#
  _ZNK7KScreen6Config5cloneEv at Base 5.1.1
  _ZNK7KScreen6Config6outputEi at Base 5.1.1
  _ZNK7KScreen6Config6screenEv at Base 5.1.1
-<<<<<<< HEAD
- _ZNK7KScreen6Config7Private10metaObjectEv at Base 4:5.2.2+git20150403.0042
-=======
  _ZNK7KScreen6Config7Private10metaObjectEv at Base 4:5.3.0
->>>>>>> master
  _ZNK7KScreen6Config7isValidEv at Base 5.1.1
  _ZNK7KScreen6Config7outputsEv at Base 5.1.1
  _ZNK7KScreen6Output10metaObjectEv at Base 5.1.1
@@ -323,11 +302,7 @@ libKF5Screen.so.6 libkf5screen6 #MINVER#
  _ZTIN7KScreen18SetConfigOperationE at Base 5.1.1
  _ZTIN7KScreen4EdidE at Base 5.1.1
  _ZTIN7KScreen4ModeE at Base 5.1.1
-<<<<<<< HEAD
- _ZTIN7KScreen6Config7PrivateE at Base 4:5.2.2+git20150403.0042
-=======
  _ZTIN7KScreen6Config7PrivateE at Base 4:5.3.0
->>>>>>> master
  _ZTIN7KScreen6ConfigE at Base 5.1.1
  _ZTIN7KScreen6OutputE at Base 5.1.1
  _ZTIN7KScreen6ScreenE at Base 5.1.1
@@ -340,11 +315,7 @@ libKF5Screen.so.6 libkf5screen6 #MINVER#
  _ZTSN7KScreen18SetConfigOperationE at Base 5.1.1
  _ZTSN7KScreen4EdidE at Base 5.1.1
  _ZTSN7KScreen4ModeE at Base 5.1.1
-<<<<<<< HEAD
- _ZTSN7KScreen6Config7PrivateE at Base 4:5.2.2+git20150403.0042
-=======
  _ZTSN7KScreen6Config7PrivateE at Base 4:5.3.0
->>>>>>> master
  _ZTSN7KScreen6ConfigE at Base 5.1.1
  _ZTSN7KScreen6OutputE at Base 5.1.1
  _ZTSN7KScreen6ScreenE at Base 5.1.1
@@ -357,11 +328,7 @@ libKF5Screen.so.6 libkf5screen6 #MINVER#
  _ZTVN7KScreen18SetConfigOperationE at Base 5.1.1
  _ZTVN7KScreen4EdidE at Base 5.1.1
  _ZTVN7KScreen4ModeE at Base 5.1.1
-<<<<<<< HEAD
- _ZTVN7KScreen6Config7PrivateE at Base 4:5.2.2+git20150403.0042
-=======
  _ZTVN7KScreen6Config7PrivateE at Base 4:5.3.0
->>>>>>> master
  _ZTVN7KScreen6ConfigE at Base 5.1.1
  _ZTVN7KScreen6OutputE at Base 5.1.1
  _ZTVN7KScreen6ScreenE at Base 5.1.1

-- 
libkscreen packaging