[SCM] libkscreen packaging branch, kubuntu_stable, updated. ubuntu/4%5.4.3-0ubuntu1-56-g37a26b0
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Fri Jan 15 16:50:35 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libkscreen.git;a=commitdiff;h=2f795a8
The following commit has been merged in the kubuntu_stable branch:
commit 2f795a834d33ca6ecd8c2b040c83ef287cad91b0
Merge: a156545391e5fc9af12622d945caba15b909b70e 571815b00a45769ff846d8499129122f4b6d0e79
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Sat Dec 19 07:56:22 2015 -0800
* New upstream release (5.4.3).
-- Maximiliano Curia <maxy at debian.org> Thu, 05 Nov 2015 16:57:17 +0100 * New upstream release (5.4.2). * Update symbols files from buildds logs (4:5.4.1-1).
-- Maximiliano Curia <maxy at debian.org> Tue, 06 Oct 2015 07:52:07 +0200 * New upstream release (5.4.1).
-- Maximiliano Curia <maxy at debian.org> Fri, 11 Sep 2015 18:45:14 +0200 * New upstream release (5.4.0). * Update symbols files.
-- Maximiliano Curia <maxy at debian.org> Thu, 03 Sep 2015 17:59:24 +0200 * Update symbols files for gcc5 compatibility. (Closes: #791728) Thanks to Martin Michlmayr
-- Maximiliano Curia <maxy at debian.org> Sat, 29 Aug 2015 11:37:43 +0200 * New upstream release (5.3.2).
-- Maximiliano Curia <maxy at debian.org> Tue, 30 Jun 2015 22:29:10 +0200
* New upstream release (5.4.3).
-- Maximiliano Curia <maxy at debian.org> Thu, 05 Nov 2015 16:57:17 +0100
* New upstream release (5.4.2).
* Update symbols files from buildds logs (4:5.4.1-1).
-- Maximiliano Curia <maxy at debian.org> Tue, 06 Oct 2015 07:52:07 +0200
* New upstream release (5.4.1).
-- Maximiliano Curia <maxy at debian.org> Fri, 11 Sep 2015 18:45:14 +0200
* New upstream release (5.4.0).
* Update symbols files.
-- Maximiliano Curia <maxy at debian.org> Thu, 03 Sep 2015 17:59:24 +0200
* Update symbols files for gcc5 compatibility. (Closes: #791728)
Thanks to Martin Michlmayr
-- Maximiliano Curia <maxy at debian.org> Sat, 29 Aug 2015 11:37:43 +0200
* New upstream release (5.3.2).
-- Maximiliano Curia <maxy at debian.org> Tue, 30 Jun 2015 22:29:10 +0200
debian/changelog | 44 ++++++++++++++++++++++++++++++++++++++++++--
debian/control | 1 -
debian/libkf5screen6.symbols | 16 ++++++++++++++--
3 files changed, 56 insertions(+), 5 deletions(-)
diff --cc debian/changelog
index 6adc0fd,0bca1ca..2385f58
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,91 -1,43 +1,131 @@@
+libkscreen (4:5.5.1-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release Xenial
+ * The .so in this tar is version 6. Update all
+ files to reflect that.
+ * Add the renamed files in git.
++ * Debian merge: No remaining changes.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 18 Dec 2015 07:36:47 -0800
+
+ libkscreen (4:5.4.3-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.4.3).
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 05 Nov 2015 16:57:17 +0100
+
+libkscreen (4:5.4.3-0ubuntu1) xenial; urgency=medium
+
+ [ Scarlett Clark ]
+ * Vivid backport
+ * New upstream bugfix release
+
+ [ Philip Muškovac ]
+ * New upstream bugfix release (LP: #1518598)
+
+ -- Philip Muškovac <yofel at kubuntu.org> Sun, 22 Nov 2015 16:36:03 +0100
+
+ libkscreen (4:5.4.2-1) unstable; urgency=medium
+
+ * New upstream release (5.4.2).
+ * Update symbols files from buildds logs (4:5.4.1-1).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 06 Oct 2015 07:52:07 +0200
+
+libkscreen (4:5.4.2-0ubuntu2) xenial; urgency=medium
+
+ * Fix autopackagetests by adding allow-stderr to the requirements.
+
+ -- Philip Muškovac <yofel at kubuntu.org> Tue, 03 Nov 2015 15:34:53 +0100
+
+libkscreen (4:5.4.2-0ubuntu1) wily; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 02 Oct 2015 15:57:41 +0100
+
+ libkscreen (4:5.4.1-1) unstable; urgency=medium
+
+ * New upstream release (5.4.1).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 11 Sep 2015 18:45:14 +0200
+
+libkscreen (4:5.4.1-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 08 Sep 2015 10:20:02 +0100
+
+ libkscreen (4:5.4.0-1) unstable; urgency=medium
+
+ * New upstream release (5.4.0).
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 03 Sep 2015 17:59:24 +0200
+
+libkscreen (4:5.4.0-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 31 Aug 2015 15:53:03 +0100
+
+libkscreen (4:5.3.95-0ubuntu1) wily; urgency=medium
+
+ * new upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 10 Aug 2015 23:17:17 +0200
+
+ libkscreen (4:5.3.2-2) unstable; urgency=medium
+
+ * Update symbols files for gcc5 compatibility. (Closes: #791728)
+ Thanks to Martin Michlmayr
+
+ -- Maximiliano Curia <maxy at debian.org> Sat, 29 Aug 2015 11:37:43 +0200
+
+ libkscreen (4:5.3.2-1) unstable; urgency=medium
+
+ * New upstream release (5.3.2).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 30 Jun 2015 22:29:10 +0200
+
+libkscreen (4:5.3.2-0ubuntu2) wily; urgency=medium
+
+ * Non-maintainer upload.
+ * Update symbols files: mark as optional the symbols gone after
+ building with GCC 5
+
+ -- José Manuel Santamaría Lema <panfaust at gmail.com> Wed, 22 Jul 2015 20:00:44 +0200
+
+libkscreen (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
+
+ * Vivid backport
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Thu, 02 Jul 2015 11:41:59 -0700
+
+libkscreen (4:5.3.2-0ubuntu1) wily; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 02 Jul 2015 12:40:13 +0000
+
+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~) wily; urgency=medium
+ libkscreen (4:5.3.1-1) unstable; urgency=medium
* New upstream release (5.3.0).
* New upstream release (5.3.1).
diff --cc debian/libkf5screen6.symbols
index 0d8d80c,8327cec..b00d77e
--- a/debian/libkf5screen6.symbols
+++ b/debian/libkf5screen6.symbols
@@@ -1,17 -1,17 +1,17 @@@
- # SymbolsHelper-Confirmed: 4:5.4.3+git20151204.0801+16.04 amd64 i386
- KSC_Fake.so libkf5screen7 #MINVER#
+ # SymbolsHelper-Confirmed: 4:5.4.1 alpha arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x
+ KSC_Fake.so libkf5screen6 #MINVER#
qt_plugin_instance at Base 5.1.80
qt_plugin_query_metadata at Base 5.1.80
-KSC_QScreen.so libkf5screen6 #MINVER#
+KSC_QScreen.so libkf5screen7 #MINVER#
qt_plugin_instance at Base 5.1.80
qt_plugin_query_metadata at Base 5.1.80
-KSC_XRandR.so libkf5screen6 #MINVER#
+KSC_XRandR.so libkf5screen7 #MINVER#
qt_plugin_instance at Base 5.1.80
qt_plugin_query_metadata at Base 5.1.80
-KSC_XRandR11.so libkf5screen6 #MINVER#
+KSC_XRandR11.so libkf5screen7 #MINVER#
qt_plugin_instance at Base 5.1.80
qt_plugin_query_metadata at Base 5.1.80
-libKF5Screen.so.6 libkf5screen6 #MINVER#
+libKF5Screen.so.6 libkf5screen7 #MINVER#
_ZN7KScreen13ConfigMonitor11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.1.1
_ZN7KScreen13ConfigMonitor11qt_metacastEPKc at Base 5.1.1
_ZN7KScreen13ConfigMonitor12removeConfigERK14QSharedPointerINS_6ConfigEE at Base 5.1.1
@@@ -162,7 -163,7 +162,11 @@@
_ZN7KScreen6Output11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.1.1
_ZN7KScreen6Output11qt_metacastEPKc at Base 5.1.1
_ZN7KScreen6Output11setRotationENS0_8RotationE at Base 5.1.1
++<<<<<<< HEAD
+ _ZN7KScreen6Output11sizeChangedEv at Base 4:5.3.95
++=======
+ _ZN7KScreen6Output11sizeChangedEv at Base 4:5.4.0
++>>>>>>> master
_ZN7KScreen6Output12setConnectedEb at Base 5.1.1
_ZN7KScreen6Output13clonesChangedEv at Base 5.1.1
_ZN7KScreen6Output13outputChangedEv at Base 5.1.1
@@@ -180,7 -181,7 +184,11 @@@
_ZN7KScreen6Output7setEdidERK10QByteArray at Base 5.1.1
_ZN7KScreen6Output7setIconERK7QString at Base 5.1.1
_ZN7KScreen6Output7setNameERK7QString at Base 5.1.1
++<<<<<<< HEAD
+ _ZN7KScreen6Output7setSizeERK5QSize at Base 4:5.3.95
++=======
+ _ZN7KScreen6Output7setSizeERK5QSize at Base 4:5.4.0
++>>>>>>> master
_ZN7KScreen6Output7setTypeENS0_4TypeE at Base 5.1.1
_ZN7KScreen6Output8setModesERK4QMapI7QString14QSharedPointerINS_4ModeEEE at Base 5.1.1
_ZN7KScreen6Output9setClonesE5QListIiE at Base 5.1.1
@@@ -271,7 -272,7 +279,11 @@@
_ZNK7KScreen6Output4iconEv at Base 5.1.1
_ZNK7KScreen6Output4modeERK7QString at Base 5.1.1
_ZNK7KScreen6Output4nameEv at Base 5.1.1
++<<<<<<< HEAD
+ _ZNK7KScreen6Output4sizeEv at Base 4:5.3.95
++=======
+ _ZNK7KScreen6Output4sizeEv at Base 4:5.4.0
++>>>>>>> master
_ZNK7KScreen6Output4typeEv at Base 5.1.1
_ZNK7KScreen6Output5cloneEv at Base 5.1.1
_ZNK7KScreen6Output5modesEv at Base 5.1.1
--
libkscreen packaging
More information about the pkg-kde-commits
mailing list