[SCM] libkscreen packaging branch, kubuntu_unstable, updated. debian/5.2.2-1-22-gdc51b25
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Mon Jun 29 16:40:06 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libkscreen.git;a=commitdiff;h=dc51b25
The following commit has been merged in the kubuntu_unstable branch:
commit dc51b25ec8c11ccc2bd879dd39486f7e130de90b
Merge: eb65df779ac2a37a2316e161fdacd83a6ab6b7bd 96614222b3237c3bca997800744c83426f8cf01c
Author: Jonathan Riddell <jr at jriddell.org>
Date: Mon Jun 29 18:27:43 2015 +0200
merge master
debian/.gitattributes | 1 +
debian/changelog | 60 ++++++++++++--------
debian/control | 52 +++++-------------
debian/copyright | 119 +++++++++++++++-------------------------
debian/libkf5screen-dev.acc.in | 20 +++++++
debian/libkf5screen-dev.install | 9 +--
debian/libkf5screen6.install | 4 +-
debian/libkf5screen6.symbols | 33 +++++++++++
debian/rules | 3 +-
debian/source/lintian-overrides | 1 -
debian/tests/acc | 11 ++++
debian/tests/control | 6 ++
debian/tests/testsuite | 3 +
debian/watch | 5 +-
14 files changed, 180 insertions(+), 147 deletions(-)
diff --cc debian/changelog
index 8feaab8,969f895..8b7fda1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,17 +1,40 @@@
+libkscreen (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 29 Jun 2015 17:30:01 +0200
+
+libkscreen (4:5.3.1-0ubuntu1) wily; urgency=medium
+
+ [ Scarlett Clark ]
+ * Manual merge kubuntu_stable.
+
+ [ 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:35:42 +0200
+
+ libkscreen (4:5.3.1-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.3.0).
+ * New upstream release (5.3.1).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 05 Jun 2015 11:55:03 +0200
+
+ libkscreen (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:17:37 +0100
+
libkscreen (4:5.2.2-0ubuntu1) vivid; urgency=medium
* New upstream release
diff --cc debian/libkf5screen6.symbols
index b846b1f,cc8146a..50c5216
--- a/debian/libkf5screen6.symbols
+++ b/debian/libkf5screen6.symbols
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< 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
@@@ -141,7 -141,7 +145,11 @@@ 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
@@@ -149,12 -149,12 +157,21 @@@
_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
@@@ -260,7 -260,7 +277,11 @@@
_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
@@@ -302,7 -302,7 +323,11 @@@
_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
@@@ -315,7 -315,7 +340,11 @@@
_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
@@@ -328,7 -328,7 +357,11 @@@
_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
More information about the pkg-kde-commits
mailing list