Walter Lapchynski has proposed merging ~wxl/kubuntu-packaging/+git/kwin:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/kwin:kubuntu_unstable.
Requested reviews: Simon Quigley (tsimonq2) For more details, see: https://code.launchpad.net/~wxl/kubuntu-packaging/+git/kwin/+merge/310606 I merged from kubuntu_zesty_archive to kubuntu_unstable, solving http://kci.pangea.pub/job/merger_kwin/997/console Had to remove debian/patches and move José's last bulletpoint in the changelog to do so. Regarding the former, please reference this commit to kubuntu_zesty_archive: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kwin/commit/?id=7686532fbd041703bda5b08212a5c4262ed67d72 -- Your team Kubuntu Packagers is subscribed to branch ~kubuntu-packagers/kubuntu-packaging/+git/kwin:kubuntu_unstable.
diff --git a/debian/changelog b/debian/changelog index 29cea75..e59372b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -kwin (4:5.7.5-0ubuntu3) UNRELEASED; urgency=medium +kwin (4:5.8.3-0ubuntu1) UNRELEASED; urgency=medium + [ José Manuel Santamaría Lema ] * Soname bump for library packages * Update Vcs-Git fields to use https:// instead of git:// * Update symbols and remove missing + [ Simon Quigley ] + * New upstream release (5.8.3) + -- José Manuel Santamaría Lema <[email protected]> Sat, 29 Oct 2016 16:48:35 +0200 kwin (4:5.7.5-0ubuntu2) yakkety; urgency=medium diff --git a/debian/control b/debian/control index 88aa8b8..1f2aa03 100644 --- a/debian/control +++ b/debian/control @@ -4,14 +4,14 @@ Priority: optional Maintainer: Ubuntu Developers <[email protected]> XSBC-Original-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <[email protected]> Uploaders: Maximiliano Curia <[email protected]> -Build-Depends: breeze-dev (>= 4:5.7.5~), +Build-Depends: breeze-dev (>= 4:5.8.3~), cmake (>= 2.8.12), debhelper (>= 9), extra-cmake-modules (>= 5.24.0~), kdoctools-dev (>= 5.24.0~), kinit-dev (>= 5.24.0~), kio-dev (>= 5.24.0~), - kscreenlocker-dev (>= 5.7.5~), + kscreenlocker-dev (>= 5.8.3~), kwayland-dev (>= 4:5.24.0~), libegl1-mesa-dev (>= 1.2~), libepoxy-dev (>= 1.2), @@ -20,7 +20,7 @@ Build-Depends: breeze-dev (>= 4:5.7.5~), libgbm-dev, libice-dev, libinput-dev (>= 0.10~), - libkdecorations2-dev (>= 4:5.7.5~), + libkdecorations2-dev (>= 4:5.8.3~), libkf5activities-dev (>= 5.24.0~), libkf5completion-dev (>= 5.24.0~), libkf5config-dev (>= 5.24.0~), diff --git a/debian/patches/kubuntu_disable_failing_test.diff b/debian/patches/kubuntu_disable_failing_test.diff deleted file mode 100644 index 9a7f479..0000000 --- a/debian/patches/kubuntu_disable_failing_test.diff +++ /dev/null @@ -1,33 +0,0 @@ -Author: José Manuel Santamaría Lema <[email protected]> -Forwarded: no -Description: Disable failing test, so far it doesn't seem possible to get it - running correctly, not even with xvfb-run ---- a/autotests/wayland/pointer_input.cpp -+++ b/autotests/wayland/pointer_input.cpp -@@ -71,7 +71,7 @@ private Q_SLOTS: - void testMouseActionActiveWindow_data(); - void testMouseActionActiveWindow(); - void testCursorImage(); -- void testEffectOverrideCursorImage(); -+ /*void testEffectOverrideCursorImage();*/ - - private: - void render(KWayland::Client::Surface *surface, const QSize &size = QSize(100, 50)); -@@ -880,7 +880,7 @@ public: - ~HelperEffect() {} - }; - --void PointerInputTest::testEffectOverrideCursorImage() -+/*void PointerInputTest::testEffectOverrideCursorImage() - { - // this test verifies the effect cursor override handling - using namespace KWayland::Client; -@@ -953,7 +953,7 @@ void PointerInputTest::testEffectOverrid - effects->stopMouseInterception(effect.data()); - QVERIFY(enteredSpy.wait()); - QVERIFY(p->cursorImage().isNull()); --} -+}*/ - - } - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index f9b0faf..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -#kubuntu_disable_failing_test.diff
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
