diff -Nru libkscreen-5.5.4/debian/changelog libkscreen-5.5.4/debian/changelog --- libkscreen-5.5.4/debian/changelog 2016-01-27 20:13:44.000000000 +0000 +++ libkscreen-5.5.4/debian/changelog 2016-03-07 15:12:23.000000000 +0000 @@ -1,61 +1,37 @@ -libkscreen (4:5.5.4-0ubuntu1~ubuntu16.04~ppa1) xenial; urgency=medium - - [ Scarlett Clark ] - * New upstream release Xenial - * The .so in this tar is version 6. Update all - files to reflect that. - * Add the renamed files in git. +libkscreen (4:5.5.4-2~ubuntu1~ubuntu16.04~ppa50) xenial; urgency=medium [ Clive Johnston ] - * new upstream release + * Merge with debian git master [ Philip Muškovac ] - * Set the SOVERSION back to 6 in the symbols file - - [ Clive Johnston ] - * New upstream release - - [ Scarlett Clark ] - * merge unstable to get debian merge into archive. - Left so verion at 6 for compatibility with release tar. - * Fix control file to reflect so version 6. - * Some more cleanup to fix archive. - - [ Clive Johnston ] - * New upstream release + * libkf5kscreen-bin breaks/replaces libkf5screen6 << 4:5.5.4-2~ * PPA build - -- Clive Johnston Wed, 27 Jan 2016 20:13:44 +0000 - -libkscreen (4:5.5.1-0ubuntu2) UNRELEASED; urgency=medium + -- Philip Muškovac Mon, 07 Mar 2016 16:12:23 +0100 - [ Scarlett Clark ] - * Fix unstable build to reflect the .so version of 7. - * Add the new files and fix the install file. - * Fix symbols file merge markers. - * Fix the .so version in the symbols file. - * Refresh symbols. +libkscreen (4:5.5.4-2~) UNRELEASED; urgency=medium - [ Bhushan Shah ] - * Add build-dep to kwayland-dev + * Avoid circular dependencies. + * Bump Standards-Version to 3.9.7, no changes needed. - -- Scarlett Clark Sat, 19 Dec 2015 08:10:24 -0800 + -- Maximiliano Curia Mon, 29 Feb 2016 16:20:21 +0100 -libkscreen (4:5.5.1-0ubuntu1) UNRELEASED; urgency=medium +libkscreen (4:5.5.4-1) experimental; 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. + * New upstream release (5.5.0). + * Split -bin package from libkf5screen6. + * New upstream release (5.5.1). + * New upstream release (5.5.2). + * New upstream release (5.5.3). + * New upstream release (5.5.4). - -- Scarlett Clark Fri, 18 Dec 2015 07:36:47 -0800 + -- Maximiliano Curia Wed, 27 Jan 2016 16:48:59 +0100 -libkscreen (4:5.4.3-1~) UNRELEASED; urgency=medium +libkscreen (4:5.4.3-1) unstable; urgency=medium * New upstream release (5.4.3). - -- Maximiliano Curia Thu, 05 Nov 2015 16:57:17 +0100 + -- Maximiliano Curia Tue, 01 Dec 2015 11:45:49 +0100 libkscreen (4:5.4.3-0ubuntu1) xenial; urgency=medium diff -Nru libkscreen-5.5.4/debian/control libkscreen-5.5.4/debian/control --- libkscreen-5.5.4/debian/control 2016-01-27 20:13:39.000000000 +0000 +++ libkscreen-5.5.4/debian/control 2016-03-07 15:12:10.000000000 +0000 @@ -5,8 +5,7 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 1.3.0~), - kwayland-dev (>= 4:5.5.1~), + extra-cmake-modules (>= 5.14.0~), libqt5x11extras5-dev (>= 5.4), libx11-dev, libx11-xcb-dev, @@ -15,13 +14,11 @@ libxrandr-dev, pkg-config, pkg-kde-tools (>= 0.15.15ubuntu1~), - qtbase5-dev (>= 5.4), - xauth, - xvfb -Standards-Version: 3.9.6 + qtbase5-dev (>= 5.4) +Standards-Version: 3.9.7 Homepage: https://projects.kde.org/projects/kde/workspace/libkscreen -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/libkscreen.git -Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/libkscreen.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/plasma/libkscreen.git +Vcs-Git: https://anonscm.debian.org/git/pkg-kde/plasma/libkscreen.git Package: libkf5screen-dev Section: libdevel @@ -38,6 +35,7 @@ Package: libkf5screen6 Architecture: any +Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: libkf5screen5 (<< 4:5.2.0) Replaces: libkf5screen5 (<< 4:5.2.0) @@ -48,15 +46,15 @@ . This package contains the shared library -Package: libkscreen-dbg -Section: debug -Priority: extra +Package: libkf5screen-bin Architecture: any -Recommends: qtbase5-dbg -Depends: libkf5screen6 (= ${binary:Version}), ${misc:Depends} -Description: library for screen management - debug info +Multi-Arch: foreign +Depends: ${misc:Depends}, ${shlibs:Depends} +Breaks: libkf5screen6 (<< 4:5.5.4-2~) +Replaces: libkf5screen6 (<< 4:5.5.4-2~) +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 of monitors as simple as plugging them to your computer. . - This package contains the debugging symbols. + This package contains the library helpers and the corresponding dbus service. diff -Nru libkscreen-5.5.4/debian/libkf5screen6.install libkscreen-5.5.4/debian/libkf5screen6.install --- libkscreen-5.5.4/debian/libkf5screen6.install 2016-01-27 20:13:39.000000000 +0000 +++ libkscreen-5.5.4/debian/libkf5screen6.install 2016-03-07 15:12:10.000000000 +0000 @@ -1,5 +1,3 @@ usr/lib/*/libKF5Screen.so.5.* usr/lib/*/libKF5Screen.so.6 -usr/lib/*/libexec/kf5/kscreen_backend_launcher usr/lib/*/qt5/plugins/kf5/kscreen/ -usr/share/dbus-1/services/org.kde.kscreen.service diff -Nru libkscreen-5.5.4/debian/libkf5screen6.symbols libkscreen-5.5.4/debian/libkf5screen6.symbols --- libkscreen-5.5.4/debian/libkf5screen6.symbols 2016-01-27 20:13:39.000000000 +0000 +++ libkscreen-5.5.4/debian/libkf5screen6.symbols 2016-03-07 15:12:10.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 4:5.4.3+git20151204.0801+16.04 amd64 i386 +# SymbolsHelper-Confirmed: 4:5.5.0 amd64 KSC_Fake.so libkf5screen6 #MINVER# qt_plugin_instance@Base 5.1.80 qt_plugin_query_metadata@Base 5.1.80 @@ -11,7 +11,7 @@ KSC_XRandR11.so libkf5screen6 #MINVER# qt_plugin_instance@Base 5.1.80 qt_plugin_query_metadata@Base 5.1.80 -libKF5Screen.so.6 libkf5screen6 #MINVER# +libKF5Screen.so.6 libkf5screen6 #MINVER#, libkf5screen-bin _ZN7KScreen13ConfigMonitor11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.1.1 _ZN7KScreen13ConfigMonitor11qt_metacastEPKc@Base 5.1.1 _ZN7KScreen13ConfigMonitor12removeConfigERK14QSharedPointerINS_6ConfigEE@Base 5.1.1 @@ -38,14 +38,14 @@ _ZN7KScreen14BackendManager11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.1.1 _ZN7KScreen14BackendManager11qt_metacastEPKc@Base 5.1.1 _ZN7KScreen14BackendManager12backendReadyEP29OrgKdeKscreenBackendInterface@Base 5.1.1 - _ZN7KScreen14BackendManager12startBackendERK7QStringRK4QMapIS1_8QVariantE@Base 4:5.4.2+git20151012.1045 + _ZN7KScreen14BackendManager12startBackendERK7QStringRK4QMapIS1_8QVariantE@Base 4:5.5.0 _ZN7KScreen14BackendManager14requestBackendEv@Base 5.1.1 _ZN7KScreen14BackendManager14sMaxCrashCountE@Base 5.1.1 _ZN7KScreen14BackendManager15shutdownBackendEv@Base 5.1.1 _ZN7KScreen14BackendManager16emitBackendReadyEv@Base 5.1.1 _ZN7KScreen14BackendManager16staticMetaObjectE@Base 5.1.1 _ZN7KScreen14BackendManager19invalidateInterfaceEv@Base 5.1.1 - _ZN7KScreen14BackendManager20onBackendRequestDoneEP23QDBusPendingCallWatcher@Base 4:5.4.2+git20151012.1045 + _ZN7KScreen14BackendManager20onBackendRequestDoneEP23QDBusPendingCallWatcher@Base 4:5.5.0 _ZN7KScreen14BackendManager26backendServiceUnregisteredERK7QString@Base 5.1.1 _ZN7KScreen14BackendManager8instanceEv@Base 5.1.1 _ZN7KScreen14BackendManager9sInstanceE@Base 5.1.1 @@ -58,7 +58,7 @@ _ZN7KScreen15AbstractBackend11qt_metacastEPKc@Base 5.1.1 _ZN7KScreen15AbstractBackend13configChangedERK14QSharedPointerINS_6ConfigEE@Base 5.1.1 _ZN7KScreen15AbstractBackend16staticMetaObjectE@Base 5.1.1 - _ZN7KScreen15AbstractBackend4initERK4QMapI7QString8QVariantE@Base 4:5.4.2+git20151012.1045 + _ZN7KScreen15AbstractBackend4initERK4QMapI7QString8QVariantE@Base 4:5.5.0 _ZN7KScreen15ConfigOperation10emitResultEv@Base 5.1.1 _ZN7KScreen15ConfigOperation11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.1.1 _ZN7KScreen15ConfigOperation11qt_metacastEPKc@Base 5.1.1 diff -Nru libkscreen-5.5.4/debian/libkf5screen-bin.install libkscreen-5.5.4/debian/libkf5screen-bin.install --- libkscreen-5.5.4/debian/libkf5screen-bin.install 1970-01-01 00:00:00.000000000 +0000 +++ libkscreen-5.5.4/debian/libkf5screen-bin.install 2016-03-07 15:12:10.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libexec/kf5/kscreen_backend_launcher +usr/share/dbus-1/services/org.kde.kscreen.service diff -Nru libkscreen-5.5.4/debian/rules libkscreen-5.5.4/debian/rules --- libkscreen-5.5.4/debian/rules 2016-01-27 20:13:39.000000000 +0000 +++ libkscreen-5.5.4/debian/rules 2016-03-07 15:12:10.000000000 +0000 @@ -3,8 +3,13 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk +override_dh_shlibdeps: + $(overridden_command) $(foreach p,$(shell dh_listpackages -a | egrep ^lib.*[0-9]+$$),-p$p) -- -xlibkf5screen-bin + $(overridden_command) --remaining-packages + override_dh_strip: - $(overridden_command) --dbg-package=libkscreen-dbg + $(overridden_command) --dbgsym-migration='libkscreen-dbg (<= 4:5.5.4-2~~)' override_dh_auto_test: - -xvfb-run -a dh_auto_test + # Disable tests at build time + : diff -Nru libkscreen-5.5.4/debian/tests/control libkscreen-5.5.4/debian/tests/control --- libkscreen-5.5.4/debian/tests/control 2016-01-27 20:13:39.000000000 +0000 +++ libkscreen-5.5.4/debian/tests/control 2016-03-07 15:12:10.000000000 +0000 @@ -1,6 +1,6 @@ -# Tests: testsuite -# Depends: @, @builddeps@, build-essential -# Restrictions: build-needed +Tests: testsuite +Depends: @, @builddeps@, build-essential, xvfb, xauth, dbus-x11, libgl1-mesa-dri +Restrictions: build-needed Tests: acc Depends: @, dh-acc, exuberant-ctags diff -Nru libkscreen-5.5.4/debian/tests/testsuite libkscreen-5.5.4/debian/tests/testsuite --- libkscreen-5.5.4/debian/tests/testsuite 2016-01-27 20:13:39.000000000 +0000 +++ libkscreen-5.5.4/debian/tests/testsuite 2016-03-07 15:12:10.000000000 +0000 @@ -1,3 +1,9 @@ #!/bin/sh -dh_auto_test +export LANG=C.UTF-8 +export LC_ALL=C.UTF-8 +export HOME=$(mktemp -d) +trap "rm -rf ${HOME}" EXIT + +xvfb-run -a --server-args="-screen 0 1024x768x24" \ + dbus-launch --exit-with-session dh_auto_test