[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-13ubuntu2-16-g03c6ec4

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=03c6ec4

The following commit has been merged in the ubuntu branch:
commit 03c6ec497e436661274d26e25ba91e6035e1886c
Merge: a6888e31033db62499a3aea1d6b15190225f9a42 3ac88cc61888dc624549ef7aaabd7bc5ddc0e01d
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Feb 23 14:13:49 2016 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                   |  20 ++
 debian/copyright                   |   4 +-
 debian/patches/dbusmenu_fixes.diff | 364 +++++++++++++++++++++++++++++++++++++
 debian/patches/dbustray_fixes.diff |  80 ++++++++
 debian/patches/series              |   2 +
 5 files changed, 468 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 355b24a,8394e75..03f9f3d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,22 +1,42 @@@
 +qtbase-opensource-src (5.5.1+dfsg-14ubuntu2) UNRELEASED; urgency=medium
 +
 +  * debian/patches/enable-tests.patch: some qnetworkcookiejar tests have 
 +    started failing without any Qt changes (LP: #1548686)
 +  * debian/patches/Fix-for-deferredDelete-bug-when-calling-the-glib-loo.patch:
 +    - Fix DeferredDelete events handling. (LP: #1460970)
 +  * xcb-Use-a-placeholder-QScreen-when-there-are-no-outp.patch:
 +    - Another multi-monitor crasher fix (LP: #1548766)
 +  * Rebase the xcb-Use-a-placeholder-QScreen-when-there-are-no-outp.patch to 
 +    apply to Qt 5.5.
++  * Merge with unreleased Debian's 5.5.1+dfsg-15
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 19 Feb 2016 08:46:28 +0000
 +
+ qtbase-opensource-src (5.5.1+dfsg-15) UNRELEASED; urgency=medium
+ 
+   [ Timo Jyrinki ]
+   * Backport XCB patch related to screen disconnection handling QTBUG-42985:
+     - xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
+   * debian/patches/Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch:
+     - Backport. Prefer QT_PLUGIN_PATH over compiled-in paths (LP: #1519927)
+   * Fix Chinese glyph font rendering with new backported upstream patches:
+     - debian/patches/Fix-falsely-reported-style-for-fallback-font.patch
+     - debian/patches/Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
+       (LP: #1475205)
+ 
+   [ Dmitry Shachnev ]
+   * Backport several upstream dbusmenu/dbustray related fixes from 5.6 branch.
+   * Correct license of japanese_230_50.qpf font in debian/copyright. Thanks to
+     Arnout Vandecappelle for the patch (closes: #815616).
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Feb 2016 10:15:48 +0000
+ 
 +qtbase-opensource-src (5.5.1+dfsg-14ubuntu1) xenial; urgency=medium
 +
 +  * Merge with Debian.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 17 Feb 2016 09:50:07 +0000
 +
  qtbase-opensource-src (5.5.1+dfsg-14) unstable; urgency=medium
  
    * Backport fix_not_delivering_focus.patch to fix not delivering focusIn event
diff --cc debian/patches/series
index ccb786e,1c71482..19b0a0b
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -25,8 -18,8 +25,10 @@@ xcb_dont_select_XInput_events_on_root_w
  xcb_fix_drag_and_drop_when_window_is_hidden.patch
  fix_not_delivering_focus.patch
  fix_potential_division_by_zero.patch
 +Fix-for-deferredDelete-bug-when-calling-the-glib-loo.patch
 +xcb-Use-a-placeholder-QScreen-when-there-are-no-outp.patch
+ dbusmenu_fixes.diff
+ dbustray_fixes.diff
  
  # Debian specific.
  gnukfreebsd.diff

-- 
qtbase packaging