diffstat of debian/ for libkscreen_5.5.4-1 libkscreen_5.5.5-0ubuntu1 changelog | 106 ++++++++++++++++++++++++++++++++++++++++ control | 27 ++-------- libkf5screen-bin.install | 2 libkf5screen6.lintian-overrides | 1 libkf5screen6.symbols | 6 +- meta/upstream_scm.json | 4 - rules | 9 ++- tests/control | 6 +- tests/testsuite | 8 ++- 9 files changed, 134 insertions(+), 35 deletions(-) diff -Nru libkscreen-5.5.4/debian/changelog libkscreen-5.5.5/debian/changelog --- libkscreen-5.5.4/debian/changelog 2016-01-27 15:48:59.000000000 +0000 +++ libkscreen-5.5.5/debian/changelog 2016-04-14 20:47:51.000000000 +0000 @@ -1,3 +1,31 @@ +libkscreen (4:5.5.5-0ubuntu1) xenial; urgency=medium + + [ Philip Muškovac ] + * New upstream bugfix release + + [ Clive Johnston ] + * 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-2~) UNRELEASED; urgency=medium + + * Avoid circular dependencies. + * Bump Standards-Version to 3.9.7, no changes needed. + + -- Maximiliano Curia Mon, 29 Feb 2016 16:20:21 +0100 + libkscreen (4:5.5.4-1) experimental; urgency=medium * New upstream release (5.5.0). @@ -15,6 +43,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). @@ -22,12 +61,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). @@ -35,6 +92,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) @@ -48,6 +117,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.5.4/debian/control libkscreen-5.5.5/debian/control --- libkscreen-5.5.4/debian/control 2016-01-27 15:48:59.000000000 +0000 +++ libkscreen-5.5.5/debian/control 2016-04-14 20:47:51.000000000 +0000 @@ -14,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 @@ -52,24 +50,11 @@ Architecture: any Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libkf5screen6 (<< 4:5.5~) -Replaces: libkf5screen6 (<< 4:5.5~) +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 library helpers and the corresponding dbus service. - -Package: libkscreen-dbg -Section: debug -Priority: extra -Architecture: any -Recommends: qtbase5-dbg -Depends: libkf5screen6 (= ${binary:Version}), ${misc:Depends} -Description: library for screen management - debug info - 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. diff -Nru libkscreen-5.5.4/debian/libkf5screen-bin.install libkscreen-5.5.5/debian/libkf5screen-bin.install --- libkscreen-5.5.4/debian/libkf5screen-bin.install 2016-01-27 15:48:59.000000000 +0000 +++ libkscreen-5.5.5/debian/libkf5screen-bin.install 2016-04-14 20:47:51.000000000 +0000 @@ -1,2 +1,2 @@ -usr/share/dbus-1/services/org.kde.kscreen.service usr/lib/*/libexec/kf5/kscreen_backend_launcher +usr/share/dbus-1/services/org.kde.kscreen.service diff -Nru libkscreen-5.5.4/debian/libkf5screen6.lintian-overrides libkscreen-5.5.5/debian/libkf5screen6.lintian-overrides --- libkscreen-5.5.4/debian/libkf5screen6.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libkscreen-5.5.5/debian/libkf5screen6.lintian-overrides 2016-04-14 20:47:51.000000000 +0000 @@ -0,0 +1 @@ +libkf5screen6: symbols-declares-dependency-on-other-package libkf5screen-bin diff -Nru libkscreen-5.5.4/debian/libkf5screen6.symbols libkscreen-5.5.5/debian/libkf5screen6.symbols --- libkscreen-5.5.4/debian/libkf5screen6.symbols 2016-01-27 15:48:59.000000000 +0000 +++ libkscreen-5.5.5/debian/libkf5screen6.symbols 2016-04-14 20:47:51.000000000 +0000 @@ -162,7 +162,7 @@ _ZN7KScreen6Output11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.1.1 _ZN7KScreen6Output11qt_metacastEPKc@Base 5.1.1 _ZN7KScreen6Output11setRotationENS0_8RotationE@Base 5.1.1 - _ZN7KScreen6Output11sizeChangedEv@Base 4:5.4.0 + _ZN7KScreen6Output11sizeChangedEv@Base 4:5.3.95 _ZN7KScreen6Output12setConnectedEb@Base 5.1.1 _ZN7KScreen6Output13clonesChangedEv@Base 5.1.1 _ZN7KScreen6Output13outputChangedEv@Base 5.1.1 @@ -180,7 +180,7 @@ _ZN7KScreen6Output7setEdidERK10QByteArray@Base 5.1.1 _ZN7KScreen6Output7setIconERK7QString@Base 5.1.1 _ZN7KScreen6Output7setNameERK7QString@Base 5.1.1 - _ZN7KScreen6Output7setSizeERK5QSize@Base 4:5.4.0 + _ZN7KScreen6Output7setSizeERK5QSize@Base 4:5.3.95 _ZN7KScreen6Output7setTypeENS0_4TypeE@Base 5.1.1 _ZN7KScreen6Output8setModesERK4QMapI7QString14QSharedPointerINS_4ModeEEE@Base 5.1.1 _ZN7KScreen6Output9setClonesE5QListIiE@Base 5.1.1 @@ -271,7 +271,7 @@ _ZNK7KScreen6Output4iconEv@Base 5.1.1 _ZNK7KScreen6Output4modeERK7QString@Base 5.1.1 _ZNK7KScreen6Output4nameEv@Base 5.1.1 - _ZNK7KScreen6Output4sizeEv@Base 4:5.4.0 + _ZNK7KScreen6Output4sizeEv@Base 4:5.3.95 _ZNK7KScreen6Output4typeEv@Base 5.1.1 _ZNK7KScreen6Output5cloneEv@Base 5.1.1 _ZNK7KScreen6Output5modesEv@Base 5.1.1 diff -Nru libkscreen-5.5.4/debian/meta/upstream_scm.json libkscreen-5.5.5/debian/meta/upstream_scm.json --- libkscreen-5.5.4/debian/meta/upstream_scm.json 2016-01-27 15:48:59.000000000 +0000 +++ libkscreen-5.5.5/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.5.4/debian/rules libkscreen-5.5.5/debian/rules --- libkscreen-5.5.4/debian/rules 2016-01-27 15:48:59.000000000 +0000 +++ libkscreen-5.5.5/debian/rules 2016-04-14 20:47:51.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.5/debian/tests/control --- libkscreen-5.5.4/debian/tests/control 2016-01-27 15:48:59.000000000 +0000 +++ libkscreen-5.5.5/debian/tests/control 2016-04-14 20:47:51.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.5/debian/tests/testsuite --- libkscreen-5.5.4/debian/tests/testsuite 2016-01-27 15:48:59.000000000 +0000 +++ libkscreen-5.5.5/debian/tests/testsuite 2016-04-14 20:47:51.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