diffstat of debian/ for libkscreen_5.13.4-1 libkscreen_5.16.0-0ubuntu1 changelog | 445 ++++++++++++++++++++++++++++ control | 24 - libkf5screen-dev.acc.in | 1 libkf5screen7.install | 1 libkf5screen7.lintian-overrides | 1 libkf5screen7.symbols | 21 - meta/upstream_scm.json | 4 patches/Make-kwayland-optional.patch | 43 +- patches/kubuntu_disable_failing_tests.patch | 17 + patches/series | 1 tests/control | 4 tests/testsuite | 4 12 files changed, 517 insertions(+), 49 deletions(-) diff -Nru libkscreen-5.13.4/debian/changelog libkscreen-5.16.0/debian/changelog --- libkscreen-5.13.4/debian/changelog 2018-08-19 21:18:08.000000000 +0000 +++ libkscreen-5.16.0/debian/changelog 2019-06-11 10:36:28.000000000 +0000 @@ -1,3 +1,96 @@ +libkscreen (4:5.16.0-0ubuntu1) eoan; urgency=medium + + * New upstream release (5.16.0) + + -- Rik Mills Tue, 11 Jun 2019 11:36:28 +0100 + +libkscreen (4:5.15.90-0ubuntu1) eoan; urgency=medium + + * New upstream (beta) release (5.15.90) + + -- Rik Mills Sat, 18 May 2019 08:49:36 +0100 + +libkscreen (4:5.15.5-0ubuntu1) eoan; urgency=medium + + * New upstream release (5.15.5) + + -- Rik Mills Fri, 10 May 2019 13:48:27 +0100 + +libkscreen (4:5.15.4-0ubuntu1) disco; urgency=medium + + * New upstream bugfix release (5.15.4) + + -- Rik Mills Thu, 04 Apr 2019 17:10:05 +0100 + +libkscreen (4:5.15.3-0ubuntu1) disco; urgency=medium + + * New upstream release (5.15.3) + + -- Rik Mills Wed, 13 Mar 2019 09:09:30 +0000 + +libkscreen (4:5.15.2-0ubuntu1) disco; urgency=medium + + * New upstream release (5.15.2) + + -- Rik Mills Tue, 26 Feb 2019 19:14:20 +0000 + +libkscreen (4:5.15.1-0ubuntu1) disco; urgency=medium + + * New upstream release (5.15.1) + + -- Rik Mills Tue, 19 Feb 2019 21:34:02 +0000 + +libkscreen (4:5.15.0-0ubuntu1) disco; urgency=medium + + * New upstream release (5.15.0) + + -- Rik Mills Tue, 12 Feb 2019 09:53:37 +0000 + +libkscreen (4:5.14.90-0ubuntu1) disco; urgency=medium + + * Install libkscreen.categories file. + * Update symbols. + * New upstream (beta) release (5.14.90) + + -- Rik Mills Sat, 19 Jan 2019 08:24:50 +0000 + +libkscreen (4:5.14.5-0ubuntu1) disco; urgency=medium + + * New upstream release (5.14.5) + + -- Rik Mills Tue, 08 Jan 2019 23:48:31 +0000 + +libkscreen (4:5.14.4-0ubuntu1) disco; urgency=medium + + * Refresh patches + * New upstream release (5.13.90) + * New upstream release (5.14.0) + * New upstream release (5.14.1) + * New upstream release (5.14.2) + * New upstream release (5.14.3) + * New upstream release (5.14.4) + + -- Rik Mills Tue, 27 Nov 2018 23:15:35 +0000 + +libkscreen (4:5.13.5-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.13.5) + + -- Rik Mills Fri, 07 Sep 2018 16:35:13 +0100 + +libkscreen (4:5.13.4-1ubuntu1) cosmic; urgency=medium + + * Merge with Debian; remaining changes: + - d/patches: Keep kubuntu_disable_failing_tests.patch + - d/tests: control and testsuite tweaks for ubuntu infra, & pass + '-fno-keep-inline-functions' to acc test in library .acc.in file. + - d/control: Kubuntu packaging Vcs fields. + - d/control: Keep our Breaks/Replaces. + - Keep Kubuntu symbols files. + - Keep additional lintian-overrides. + + -- Rik Mills Tue, 04 Sep 2018 18:52:50 +0100 + libkscreen (4:5.13.4-1) unstable; urgency=medium * New upstream release (5.13.4). @@ -5,6 +98,22 @@ -- Maximiliano Curia Sun, 19 Aug 2018 23:18:08 +0200 +libkscreen (4:5.13.4-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.13.4) + + -- Rik Mills Fri, 03 Aug 2018 16:41:42 +0100 + +libkscreen (4:5.13.3-0ubuntu1) cosmic; urgency=medium + + * Update symbols from build logs + * New upstream release (5.13.0) + * New upstream release (5.13.1) + * New upstream release (5.13.2) + * New upstream release (5.13.3) + + -- Rik Mills Sat, 28 Jul 2018 17:26:17 +0100 + libkscreen (4:5.13.1-1) unstable; urgency=medium * New upstream release (5.12.2). @@ -17,6 +126,36 @@ -- Maximiliano Curia Tue, 26 Jun 2018 13:43:09 +0200 +libkscreen (4:5.12.6-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.12.6) + + -- Rik Mills Thu, 28 Jun 2018 15:31:30 +0100 + +libkscreen (4:5.12.5-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.12.5) + + -- Rik Mills Tue, 08 May 2018 19:24:27 +0100 + +libkscreen (4:5.12.4-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.12.4) + + -- Rik Mills Tue, 27 Mar 2018 20:53:50 +0100 + +libkscreen (4:5.12.3-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.12.3) + + -- Rik Mills Fri, 09 Mar 2018 13:49:33 +0000 + +libkscreen (4:5.12.2-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.12.2) + + -- Rik Mills Tue, 20 Feb 2018 22:43:08 +0000 + libkscreen (4:5.12.1-1) sid; urgency=medium * Use the salsa canonical urls @@ -26,6 +165,13 @@ -- Maximiliano Curia Tue, 20 Feb 2018 22:08:56 +0100 +libkscreen (4:5.12.1-0ubuntu1) bionic; urgency=medium + + * Update patch; make_kwayland_optional.diff + * New upstream release (5.12.1) + + -- Rik Mills Wed, 14 Feb 2018 12:13:11 +0000 + libkscreen (4:5.12.0-2) sid; urgency=medium * New revision @@ -48,6 +194,20 @@ -- Maximiliano Curia Thu, 08 Feb 2018 15:20:53 +0100 +libkscreen (4:5.12.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.11.95) + * Update symbols from build logs + * New upstream release (5.12.0) + + -- Rik Mills Tue, 06 Feb 2018 11:50:38 +0000 + +libkscreen (4:5.11.5-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.11.5) + + -- Rik Mills Wed, 03 Jan 2018 17:39:21 +0000 + libkscreen (4:5.11.4-1) experimental; urgency=medium * New upstream release (5.11.4). @@ -56,6 +216,22 @@ -- Maximiliano Curia Wed, 03 Jan 2018 16:49:05 -0300 +libkscreen (4:5.11.4-0ubuntu1) bionic; urgency=low + + * New upstream release (5.11.4) + + -- Simon Quigley Tue, 28 Nov 2017 21:15:38 -0600 + +libkscreen (4:5.11.3-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.10.95) + * New upstream release (5.11.0) + * New upstream release (5.11.1) + * New upstream release (5.11.2) + * New upstream release (5.11.3) + + -- Rik Mills Sat, 25 Nov 2017 17:58:44 +0000 + libkscreen (4:5.10.5-2) sid; urgency=medium * New revision @@ -82,6 +258,101 @@ -- Maximiliano Curia Mon, 28 Aug 2017 15:28:35 +0200 +libkscreen (4:5.10.5-0ubuntu2) bionic; urgency=medium + + * Skip testsuite on architectures Kubuntu does not officially support + + -- Rik Mills Mon, 20 Nov 2017 15:07:08 +0000 + +libkscreen (4:5.10.5-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.5) + + -- Simon Quigley Wed, 23 Aug 2017 14:40:32 +0100 + +libkscreen (4:5.10.4-0ubuntu2) artful; urgency=medium + + * Disable failing/unreliable test + + -- Rik Mills Fri, 11 Aug 2017 16:22:19 +0100 + +libkscreen (4:5.10.4-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.4) + + -- Rik Mills Wed, 19 Jul 2017 14:38:33 +0100 + +libkscreen (4:5.10.3-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.3) + + -- Rik Mills Sat, 01 Jul 2017 10:17:06 +0100 + +libkscreen (4:5.10.2-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.2) + + -- Rik Mills Thu, 15 Jun 2017 18:13:32 +0100 + +libkscreen (4:5.10.1-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.1) + + -- Rik Mills Tue, 06 Jun 2017 19:10:15 +0100 + +libkscreen (4:5.10.0-0ubuntu1) artful; urgency=low + + [ Rik Mills ] + * New upstream release (5.9.95) + * New upstream release (5.10.0) + + [ José Manuel Santamaría Lema ] + * Add upstream_fix_scaling_test.diff + + -- Rik Mills Tue, 30 May 2017 09:50:33 +0100 + +libkscreen (4:5.9.5-0ubuntu1) artful; urgency=low + + * New upstream release (5.9.5) + + -- José Manuel Santamaría Lema Sun, 30 Apr 2017 11:33:16 +0100 + +libkscreen (4:5.9.4-0ubuntu1) zesty; urgency=low + + * New upstream bugfix release (5.9.4) + + -- Rik Mills Thu, 23 Mar 2017 19:59:35 +0000 + +libkscreen (4:5.9.3-0ubuntu1) zesty; urgency=low + + * New upstream bugfix release (5.9.3) + + -- Rik Mills Thu, 02 Mar 2017 09:53:28 +0000 + +libkscreen (4:5.9.2-0ubuntu1) zesty; urgency=low + + * New upstream bugfix release (5.9.2) + + -- Rik Mills Mon, 20 Feb 2017 11:06:36 +0000 + +libkscreen (4:5.9.1-0ubuntu1) zesty; urgency=medium + + [ José Manuel Santamaría Lema ] + * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to + avoid possible spurious test failures. + + [ Rik Mills ] + * New upstream release (5.9.1) + + -- Rik Mills Tue, 14 Feb 2017 23:21:32 +0000 + +libkscreen (4:5.9.0-0ubuntu1) zesty; urgency=low + + * New upstream release (5.9.0) + * Update symbols from build logs + + -- Rik Mills Sat, 04 Feb 2017 00:55:59 +0000 + libkscreen (4:5.8.6-2) unstable; urgency=medium * Release to unstable. @@ -102,6 +373,14 @@ -- Maximiliano Curia Fri, 30 Dec 2016 18:46:19 +0100 +libkscreen (4:5.8.5-0ubuntu1) zesty; urgency=low + + * New upstream release (5.8.5) + * Refresh patch make_kwayland_optional.diff + * Update symbols from build logs + + -- Rik Mills Thu, 29 Dec 2016 16:46:18 +0000 + libkscreen (4:5.8.4-1) unstable; urgency=medium [ Automatic packaging ] @@ -112,6 +391,30 @@ -- Maximiliano Curia Wed, 23 Nov 2016 18:37:14 +0100 +libkscreen (4:5.8.4-0ubuntu1) zesty; urgency=medium + + [ José Manuel Santamaría Lema ] + * Update Vcs-Git fields to use https:// instead of git:// + * Update lintian override for libkf5screen7 against 'symbols-declares- + dependency-on-other-package' + * Add in libkfscreen-bin Breaks/Replaces against libkf5screen7 (<< + 4:5.8.3) due to file moving (/usr/lib/*/qt5/plugins/kf5/kscreen/) + * Create XDG_RUNTIME_DIR when running tests + * Now libkf5screen-bin Breaks/Replaces libkf5screen6 (<< 4:5.8.3) instead of + (<< 4:5.5.4-2~) in order to make sure the upgrades are safe with regarding + to /usr/lib/*/qt5/plugins/kf5/kscreen/ file moving. + * Remove undesired Breaks after debian merge. + + [ Simon Quigley ] + * New upstream release (5.8.3) + * Merge from Debian + + [ Rik Mills ] + * New upstream release (5.8.4) + * Refresh patch make_kwayland_optional.diff + + -- Rik Mills Mon, 05 Dec 2016 19:55:23 +0000 + libkscreen (4:5.8.2-1) unstable; urgency=medium [ Automatic packaging ] @@ -145,6 +448,13 @@ -- Maximiliano Curia Fri, 07 Oct 2016 14:04:50 +0200 +libkscreen (4:5.7.5-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.7.4) + * New upstream release (5.7.5) + + -- Rik Mills Tue, 20 Sep 2016 20:28:08 -0500 + libkscreen (4:5.7.4-1) unstable; urgency=medium [ Automatic packaging ] @@ -155,6 +465,14 @@ -- Maximiliano Curia Fri, 26 Aug 2016 15:04:49 +0200 +libkscreen (4:5.7.2-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.7.1) + * Refreshing symbols + * New upstream release (5.7.2) + + -- Clive Johnston Thu, 28 Jul 2016 12:06:44 +0000 + libkscreen (4:5.7.0-1) unstable; urgency=medium [ Automatic packaging ] @@ -174,6 +492,12 @@ -- Maximiliano Curia Tue, 21 Jun 2016 19:53:25 +0200 +libkscreen (4:5.6.5-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.6.5) + + -- Clive Johnston Fri, 15 Jul 2016 20:48:18 +0100 + libkscreen (4:5.6.4-3) unstable; urgency=medium * New patch: make_kwayland_optional.diff @@ -207,6 +531,49 @@ -- Maximiliano Curia Thu, 19 May 2016 10:24:31 +0200 +libkscreen (4:5.6.4-0ubuntu1) yakkety; urgency=medium + + [ Clive Johnston ] + * New upstream release + * Adding kwayland-dev as a build dep + * Bumping soversion from 6 to 7 + - Renamed libkf5screen install, symbols and overrides files + - Bumped version from 6 to 7 + * Refreshed symbols and removed MISSING + * Removed duplicate files installed in two install files + + [ Philip Muškovac ] + * Update the Vcs URLs now that the repositories are hosted on + Launchpad + + [ Clive Johnston ] + * New upstream release (5.6.4) + + -- Clive Johnston Wed, 18 May 2016 13:21:36 -0700 + +libkscreen (4:5.5.5-0ubuntu1) xenial; urgency=medium + + [ Philip Muškovac ] + * New upstream bugfix release + + [ Clive Johnston ] + * Adding kwayland-dev as build dep + * Add usr/bin/kscreen-doctor to libkf5screen-bin.install + * Added lintian override for libkf5screen-bin being declared in + symbols file. + + -- Philip Muškovac Thu, 14 Apr 2016 13:47:51 -0700 + +libkscreen (4:5.5.4-2~ubuntu1) xenial; urgency=medium + + [ Clive Johnston ] + * Merge with debian git master + + [ Philip Muškovac ] + * libkf5kscreen-bin breaks/replaces libkf5screen6 << 4:5.5.4-2~ + + -- Philip Muškovac Mon, 07 Mar 2016 21:25:30 +0100 + libkscreen (4:5.5.4-1) experimental; urgency=medium * New upstream release (5.5.0). @@ -224,6 +591,17 @@ -- Maximiliano Curia Tue, 01 Dec 2015 11:45:49 +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 Sun, 22 Nov 2015 16:36:03 +0100 + libkscreen (4:5.4.2-1) unstable; urgency=medium * New upstream release (5.4.2). @@ -231,12 +609,30 @@ -- Maximiliano Curia 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 Tue, 03 Nov 2015 15:34:53 +0100 + +libkscreen (4:5.4.2-0ubuntu1) wily; urgency=medium + + * New upstream release + + -- Scarlett Clark 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 Fri, 11 Sep 2015 18:45:14 +0200 +libkscreen (4:5.4.1-0ubuntu1) wily; urgency=medium + + * new upstream release + + -- Jonathan Riddell Tue, 08 Sep 2015 10:20:02 +0100 + libkscreen (4:5.4.0-1) unstable; urgency=medium * New upstream release (5.4.0). @@ -244,6 +640,18 @@ -- Maximiliano Curia Thu, 03 Sep 2015 17:59:24 +0200 +libkscreen (4:5.4.0-0ubuntu1) wily; urgency=medium + + * new upstream release + + -- Jonathan Riddell Mon, 31 Aug 2015 15:53:03 +0100 + +libkscreen (4:5.3.95-0ubuntu1) wily; urgency=medium + + * new upstream beta release + + -- Jonathan Riddell 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) @@ -257,6 +665,43 @@ -- Maximiliano Curia 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 Wed, 22 Jul 2015 20:00:44 +0200 + +libkscreen (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium + + * Vivid backport + + -- Scarlett Clark Thu, 02 Jul 2015 11:41:59 -0700 + +libkscreen (4:5.3.2-0ubuntu1) wily; urgency=medium + + * New upstream release + + -- Jonathan Riddell 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 Fri, 05 Jun 2015 02:35:42 +0200 + libkscreen (4:5.3.1-1) unstable; urgency=medium * New upstream release (5.3.0). diff -Nru libkscreen-5.13.4/debian/control libkscreen-5.16.0/debian/control --- libkscreen-5.13.4/debian/control 2018-08-19 21:18:08.000000000 +0000 +++ libkscreen-5.16.0/debian/control 2019-06-11 10:36:28.000000000 +0000 @@ -5,8 +5,8 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 3.0~), debhelper (>= 11~), - extra-cmake-modules (>= 5.42.0~), - libkf5wayland-dev (>= 4:5.42.0~) [linux-any], + extra-cmake-modules (>= 5.58.0~), + libkf5wayland-dev (>= 4:5.58.0~) [linux-any], libqt5x11extras5-dev (>= 5.9.0~), libx11-dev, libx11-xcb-dev, @@ -18,20 +18,18 @@ qtbase5-dev (>= 5.9.0~), Standards-Version: 4.1.3 Homepage: https://projects.kde.org/projects/kde/workspace/libkscreen -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libkscreen -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkscreen.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/libkscreen +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/libkscreen Package: libkf5screen-bin Architecture: any Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: kscreen (<< 4:5.13), - libkf5screen5, - libkf5screen6, - libpowerdevilcore2 (<< 4:5.13), - plasma-workspace (<< 4:5.7), - powerdevil (<< 4:5.12), -Replaces: libkf5screen5, libkf5screen6 +Breaks: libkf5screen5, libkf5screen6 (<< 4:5.8.3), libkf5screen7 (<< 4:5.8.3) +Replaces: libkf5screen-bin (<< 4:5.8.3), + libkf5screen5, + libkf5screen6 (<< 4:5.8.3), + libkf5screen7 (<< 4:5.8.3) Description: library for screen management - helpers The KDE multiple monitor support is trying be as smart as possible adapting the behavior of it to each use case making the configuration @@ -62,7 +60,3 @@ of monitors as simple as plugging them to your computer. . This package contains the shared library -Breaks: kscreen (<< 4:5.13), - libpowerdevilcore2 (<< 4:5.13), - plasma-workspace (<< 4:5.7), - powerdevil (<< 4:5.12), diff -Nru libkscreen-5.13.4/debian/libkf5screen-dev.acc.in libkscreen-5.16.0/debian/libkf5screen-dev.acc.in --- libkscreen-5.13.4/debian/libkf5screen-dev.acc.in 2018-08-19 21:18:08.000000000 +0000 +++ libkscreen-5.16.0/debian/libkf5screen-dev.acc.in 2019-06-11 10:36:28.000000000 +0000 @@ -15,6 +15,7 @@ -fPIC + -fno-keep-inline-functions diff -Nru libkscreen-5.13.4/debian/libkf5screen7.install libkscreen-5.16.0/debian/libkf5screen7.install --- libkscreen-5.13.4/debian/libkf5screen7.install 2018-08-19 21:18:08.000000000 +0000 +++ libkscreen-5.16.0/debian/libkf5screen7.install 2019-06-11 10:36:28.000000000 +0000 @@ -1,2 +1,3 @@ +etc/xdg/libkscreen.categories usr/lib/*/libKF5Screen.so.5.* usr/lib/*/libKF5Screen.so.7 diff -Nru libkscreen-5.13.4/debian/libkf5screen7.lintian-overrides libkscreen-5.16.0/debian/libkf5screen7.lintian-overrides --- libkscreen-5.13.4/debian/libkf5screen7.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libkscreen-5.16.0/debian/libkf5screen7.lintian-overrides 2019-06-11 10:36:28.000000000 +0000 @@ -0,0 +1 @@ +libkf5screen7: symbols-declares-dependency-on-other-package libkf5screen-bin * diff -Nru libkscreen-5.13.4/debian/libkf5screen7.symbols libkscreen-5.16.0/debian/libkf5screen7.symbols --- libkscreen-5.13.4/debian/libkf5screen7.symbols 2018-08-19 21:18:08.000000000 +0000 +++ libkscreen-5.16.0/debian/libkf5screen7.symbols 2019-06-11 10:36:28.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 4:5.13.1 amd64 +# SymbolsHelper-Confirmed: 4:5.14.80+git20190114 amd64 libKF5Screen.so.7 libkf5screen7 #MINVER#, libkf5screen-bin (>= 4:5.6.2~) _ZN7KScreen13ConfigMonitor11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.1.1 _ZN7KScreen13ConfigMonitor11qt_metacastEPKc@Base 5.1.1 @@ -43,7 +43,7 @@ _ZN7KScreen15AbstractBackend11qt_metacastEPKc@Base 5.1.1 _ZN7KScreen15AbstractBackend13configChangedERK14QSharedPointerINS_6ConfigEE@Base 5.1.1 _ZN7KScreen15AbstractBackend16staticMetaObjectE@Base 5.1.1 - _ZN7KScreen15AbstractBackend4initERK4QMapI7QString8QVariantE@Base 4:5.5.0 + _ZN7KScreen15AbstractBackend4initERK4QMapI7QString8QVariantE@Base 4:5.4.2+git20151012.1045 _ZN7KScreen15ConfigOperation10emitResultEv@Base 5.1.1 _ZN7KScreen15ConfigOperation11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.1.1 _ZN7KScreen15ConfigOperation11qt_metacastEPKc@Base 5.1.1 @@ -128,7 +128,7 @@ _ZN7KScreen4ModeD0Ev@Base 5.1.1 _ZN7KScreen4ModeD1Ev@Base 5.1.1 _ZN7KScreen4ModeD2Ev@Base 5.1.1 - _ZN7KScreen6Config10setOutputsE4QMapIi14QSharedPointerINS_6OutputEEE@Base 5.1.1 + _ZN7KScreen6Config10setOutputsERK4QMapIi14QSharedPointerINS_6OutputEEE@Base 4:5.14.80+git20190114 _ZN7KScreen6Config11outputAddedERK14QSharedPointerINS_6OutputEE@Base 5.1.1 _ZN7KScreen6Config11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.1.1 _ZN7KScreen6Config11qt_metacastEPKc@Base 5.1.1 @@ -157,7 +157,7 @@ _ZN7KScreen6Output11setRotationENS0_8RotationE@Base 5.1.1 _ZN7KScreen6Output11sizeChangedEv@Base 4:5.4.0 _ZN7KScreen6Output12modesChangedEv@Base 4:5.8.5 - _ZN7KScreen6Output12scaleChangedEv@Base 4:5.10.3 + _ZN7KScreen6Output12scaleChangedEv@Base 4:5.9.0 _ZN7KScreen6Output12setConnectedEb@Base 5.1.1 _ZN7KScreen6Output13clonesChangedEv@Base 5.1.1 _ZN7KScreen6Output13outputChangedEv@Base 5.1.1 @@ -169,6 +169,8 @@ _ZN7KScreen6Output17setPreferredModesERK11QStringList@Base 5.1.1 _ZN7KScreen6Output18isConnectedChangedEv@Base 5.1.1 _ZN7KScreen6Output20currentModeIdChangedEv@Base 5.1.1 + _ZN7KScreen6Output22setFollowPreferredModeEb@Base 4:5.14.80+git20190114 + _ZN7KScreen6Output26followPreferredModeChangedEb@Base 4:5.14.80+git20190114 _ZN7KScreen6Output5applyERK14QSharedPointerIS0_E@Base 5.1.1 _ZN7KScreen6Output5setIdEi@Base 5.1.1 _ZN7KScreen6Output6setPosERK6QPoint@Base 5.1.1 @@ -178,8 +180,8 @@ _ZN7KScreen6Output7setSizeERK5QSize@Base 4:5.4.0 _ZN7KScreen6Output7setTypeENS0_4TypeE@Base 5.1.1 _ZN7KScreen6Output8setModesERK4QMapI7QString14QSharedPointerINS_4ModeEEE@Base 5.1.1 - _ZN7KScreen6Output8setScaleEd@Base 4:5.10.3 - _ZN7KScreen6Output9setClonesE5QListIiE@Base 5.1.1 + _ZN7KScreen6Output8setScaleEd@Base 4:5.9.0 + _ZN7KScreen6Output9setClonesERK5QListIiE@Base 4:5.14.80+git20190114 _ZN7KScreen6Output9setSizeMmERK5QSize@Base 5.1.1 _ZN7KScreen6OutputC1EPNS0_7PrivateE@Base 5.1.1 _ZN7KScreen6OutputC1Ev@Base 5.1.1 @@ -248,6 +250,7 @@ _ZNK7KScreen6Config13primaryOutputEv@Base 5.1.1 _ZNK7KScreen6Config16connectedOutputsEv@Base 5.1.1 _ZNK7KScreen6Config17supportedFeaturesEv@Base 4:5.7.0 + _ZNK7KScreen6Config20connectedOutputsHashEv@Base 4:5.14.80+git20190114 _ZNK7KScreen6Config5cloneEv@Base 5.1.1 _ZNK7KScreen6Config6outputEi@Base 5.1.1 _ZNK7KScreen6Config6screenEv@Base 5.1.1 @@ -260,9 +263,11 @@ _ZNK7KScreen6Output13preferredModeEv@Base 5.1.1 _ZNK7KScreen6Output14preferredModesEv@Base 5.1.1 _ZNK7KScreen6Output15preferredModeIdEv@Base 5.1.1 + _ZNK7KScreen6Output19followPreferredModeEv@Base 4:5.14.80+git20190114 _ZNK7KScreen6Output2idEv@Base 5.1.1 _ZNK7KScreen6Output3posEv@Base 5.1.1 _ZNK7KScreen6Output4edidEv@Base 5.1.1 + _ZNK7KScreen6Output4hashEv@Base 4:5.14.80+git20190114 _ZNK7KScreen6Output4iconEv@Base 5.1.1 _ZNK7KScreen6Output4modeERK7QString@Base 5.1.1 _ZNK7KScreen6Output4nameEv@Base 5.1.1 @@ -270,7 +275,7 @@ _ZNK7KScreen6Output4typeEv@Base 5.1.1 _ZNK7KScreen6Output5cloneEv@Base 5.1.1 _ZNK7KScreen6Output5modesEv@Base 5.1.1 - _ZNK7KScreen6Output5scaleEv@Base 4:5.10.3 + _ZNK7KScreen6Output5scaleEv@Base 4:5.9.0 _ZNK7KScreen6Output6clonesEv@Base 5.1.1 _ZNK7KScreen6Output6sizeMmEv@Base 5.1.1 _ZNK7KScreen6Output8geometryEv@Base 5.1.1 @@ -321,5 +326,5 @@ _ZTVN7KScreen6OutputE@Base 5.1.1 _ZTVN7KScreen6ScreenE@Base 5.1.1 _Zls6QDebugRK14QSharedPointerIN7KScreen4ModeEE@Base 5.1.1 - _Zls6QDebugRK14QSharedPointerIN7KScreen6ConfigEE@Base 4:5.12.0 + _Zls6QDebugRK14QSharedPointerIN7KScreen6ConfigEE@Base 4:5.11.95 _Zls6QDebugRK14QSharedPointerIN7KScreen6OutputEE@Base 5.1.1 diff -Nru libkscreen-5.13.4/debian/meta/upstream_scm.json libkscreen-5.16.0/debian/meta/upstream_scm.json --- libkscreen-5.13.4/debian/meta/upstream_scm.json 2018-08-19 21:18:08.000000000 +0000 +++ libkscreen-5.16.0/debian/meta/upstream_scm.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -{ - "type" : "git", - "branch" : "frameworks" -} diff -Nru libkscreen-5.13.4/debian/patches/Make-kwayland-optional.patch libkscreen-5.16.0/debian/patches/Make-kwayland-optional.patch --- libkscreen-5.13.4/debian/patches/Make-kwayland-optional.patch 2018-08-19 21:18:08.000000000 +0000 +++ libkscreen-5.16.0/debian/patches/Make-kwayland-optional.patch 2019-06-11 10:36:28.000000000 +0000 @@ -10,12 +10,12 @@ tests/CMakeLists.txt | 4 +++- 4 files changed, 27 insertions(+), 19 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e1214da..7ce1bfc 100644 +Index: b/CMakeLists.txt +=================================================================== --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,7 +22,7 @@ include(CheckCXXCompilerFlag) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras) +@@ -24,7 +24,7 @@ + find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras) # Wayland backend -find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG REQUIRED) @@ -23,8 +23,8 @@ add_feature_info("KF5Wayland" KF5Wayland_FOUND "Required for building libkscreen's KWayland backend") # xrandr backend -diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt -index 774685c..7748d01 100644 +Index: b/autotests/CMakeLists.txt +=================================================================== --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -1,6 +1,9 @@ @@ -38,9 +38,9 @@ macro(KSCREEN_ADD_TEST) foreach(_testname ${ARGN}) -@@ -24,24 +27,25 @@ kscreen_add_test(testbackendloader) - kscreen_add_test(testlog) +@@ -25,24 +28,25 @@ kscreen_add_test(testmodelistchange) + kscreen_add_test(testedid) -set(KSCREEN_WAYLAND_LIBS - KF5::WaylandServer KF5::WaylandClient @@ -52,35 +52,38 @@ - ${CMAKE_SOURCE_DIR}/tests/kwayland/waylandtestserver.cpp -) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../backends/kwayland) +- +-kscreen_add_test(testkwaylandbackend) +-kscreen_add_test(testkwaylandconfig) +-kscreen_add_test(testkwaylanddpms) +- +-set(KSCREEN_WAYLAND_LIBS "") +-set(KSCREEN_WAYLAND_SRCS "") +- +if(${KF5Wayland_FOUND}) + set(KSCREEN_WAYLAND_LIBS + KF5::WaylandServer KF5::WaylandClient + ) - --kscreen_add_test(testkwaylandbackend) --kscreen_add_test(testkwaylandconfig) --kscreen_add_test(testkwaylanddpms) ++ + # For WaylandConfigReader and TestServer + set(KSCREEN_WAYLAND_SRCS + ${CMAKE_SOURCE_DIR}/tests/kwayland/waylandconfigreader.cpp + ${CMAKE_SOURCE_DIR}/tests/kwayland/waylandtestserver.cpp + ) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../backends/kwayland) - --set(KSCREEN_WAYLAND_LIBS "") --set(KSCREEN_WAYLAND_SRCS "") ++ + kscreen_add_test(testkwaylandbackend) + kscreen_add_test(testkwaylandconfig) + kscreen_add_test(testkwaylanddpms) - ++ + set(KSCREEN_WAYLAND_LIBS "") + set(KSCREEN_WAYLAND_SRCS "") +endif() if (ENABLE_XRANDR_TESTS) kscreen_add_test(textxrandr) -diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt -index 3563e13..5f44182 100644 +Index: b/backends/CMakeLists.txt +=================================================================== --- a/backends/CMakeLists.txt +++ b/backends/CMakeLists.txt @@ -1,6 +1,8 @@ @@ -93,8 +96,8 @@ if(${XCB_RANDR_FOUND}) message(STATUS "Will build xrandr backend.") -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 1489d21..e82f7f7 100644 +Index: b/tests/CMakeLists.txt +=================================================================== --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,6 @@ diff -Nru libkscreen-5.13.4/debian/patches/kubuntu_disable_failing_tests.patch libkscreen-5.16.0/debian/patches/kubuntu_disable_failing_tests.patch --- libkscreen-5.13.4/debian/patches/kubuntu_disable_failing_tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ libkscreen-5.16.0/debian/patches/kubuntu_disable_failing_tests.patch 2019-06-11 10:36:28.000000000 +0000 @@ -0,0 +1,17 @@ +Author: Rik Mills +Description: Disable failing/unreliable tests. + + +Index: b/autotests/CMakeLists.txt +=================================================================== +--- a/autotests/CMakeLists.txt ++++ b/autotests/CMakeLists.txt +@@ -42,7 +42,7 @@ + + kscreen_add_test(testkwaylandbackend) + kscreen_add_test(testkwaylandconfig) +- kscreen_add_test(testkwaylanddpms) ++# kscreen_add_test(testkwaylanddpms) + + set(KSCREEN_WAYLAND_LIBS "") + set(KSCREEN_WAYLAND_SRCS "") diff -Nru libkscreen-5.13.4/debian/patches/series libkscreen-5.16.0/debian/patches/series --- libkscreen-5.13.4/debian/patches/series 2018-08-19 21:18:08.000000000 +0000 +++ libkscreen-5.16.0/debian/patches/series 2019-06-11 10:36:28.000000000 +0000 @@ -1 +1,2 @@ Make-kwayland-optional.patch +kubuntu_disable_failing_tests.patch diff -Nru libkscreen-5.13.4/debian/tests/control libkscreen-5.16.0/debian/tests/control --- libkscreen-5.13.4/debian/tests/control 2018-08-19 21:18:08.000000000 +0000 +++ libkscreen-5.16.0/debian/tests/control 2019-06-11 10:36:28.000000000 +0000 @@ -1,6 +1,6 @@ Tests: testsuite -Depends: @, @builddeps@, build-essential, xvfb, xauth, dbus (>= 1.8), - libgl1-mesa-dri, dbus-x11 +Depends: @, @builddeps@, build-essential, xvfb, xauth, dbus-x11, libgl1-mesa-dri, + kwin-wayland-backend-fbdev Restrictions: build-needed Tests: acc diff -Nru libkscreen-5.13.4/debian/tests/testsuite libkscreen-5.16.0/debian/tests/testsuite --- libkscreen-5.13.4/debian/tests/testsuite 2018-08-19 21:18:08.000000000 +0000 +++ libkscreen-5.16.0/debian/tests/testsuite 2019-06-11 10:36:28.000000000 +0000 @@ -1,9 +1,13 @@ #!/bin/sh +dpkg-architecture -e amd64 || dpkg-architecture -e i386 || exit 0 + export LANG=C.UTF-8 export LC_ALL=C.UTF-8 export HOME=$(mktemp -d) trap "rm -rf ${HOME}" EXIT +export XDG_RUNTIME_DIR="${HOME}/runtime" +mkdir -p ${XDG_RUNTIME_DIR} || true xvfb-run -a --server-args="-screen 0 1024x768x24" \ dbus-run-session -- dh_auto_test --no-parallel