[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-14ubuntu3-9-g6ac150f

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 5fe9e1b56379ce97e7684a190cd23e518200fd75
Merge: e7c3a974862510bef6c53a6fd8675e5ded6557b8 f16123848853b072681aa240224136ed6e8c674d
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Mar 4 09:58:49 2016 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                                   | 48 +++++++++++++---------
 debian/control                                     | 17 ++------
 ...-falsely-reported-style-for-fallback-font.patch |  7 +---
 ...fer-QT_PLUGIN_PATH-over-compiled-in-paths.patch |  9 +---
 ...orical-4-padding-in-QFontEngine-alphaMapF.patch |  7 +---
 ...-another-crash-when-screens-are-disconnec.patch |  7 +---
 debian/rules                                       |  5 +--
 7 files changed, 37 insertions(+), 63 deletions(-)

diff --cc debian/changelog
index 778c955,b45ec35..5064c2c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,31 +1,60 @@@
+ qtbase-opensource-src (5.5.1+dfsg-15) unstable; 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/generateTLDs.sh: Set -e to fail when a subcommand fails.
+   * Call generateTLDs.sh with LC_ALL=C.UTF-8, to workaround a bug in grep.
+     See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22838.
+   * Use https URIs for Vcs fields.
+   * Bump Standards-Version to 3.9.7, no changes needed.
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Remove the transitional package libqt5xcbqpa5, there are no rdeps left in
+     sid or testing.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 03 Mar 2016 20:34:47 +0300
+ 
 +qtbase-opensource-src (5.5.1+dfsg-14ubuntu3) xenial; urgency=medium
 +
 +  * debian/patches/Xcb-fix-crash-on-screen-power-save.patch:
 +    - Fix additional cases where crash could occur on monitor disconnections 
 +      or power save. (LP: #1551122)
 +  * Build with C.UTF-8 locale to (LP: #1551145) and re-enable tests (LP: #1548686)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 02 Mar 2016 10:28:04 +0000
 +
 +qtbase-opensource-src (5.5.1+dfsg-14ubuntu2) xenial; urgency=medium
 +
 +  * debian/patches/enable-tests.patch: some qnetworkcookiejar tests have 
 +    started failing without any Qt changes (LP: #1548686)
 +  * Notify-when-the-primary-screen-changes.patch
 +    xcb-Handle-screen-siblings-in-QXcbVirtualDesktop.patch
 +    xcb-Use-a-placeholder-QScreen-when-there-are-no-outp.patch:
 +    - Another multi-monitor crasher fix and its pre-requirement patches
 +      (LP: #1548766)
 +    - Rebase the patches slightly to apply to Qt 5.5.
 +  * Merge with unreleased Debian's 5.5.1+dfsg-15
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 26 Feb 2016 07:03:24 +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/generateTLDs.sh: Set -e to fail when a subcommand fails.
- 
-  -- 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/control
index ca02d3e,c8a1065..b4c13e3
--- a/debian/control
+++ b/debian/control
@@@ -62,13 -62,12 +62,13 @@@ Build-Depends: debhelper (>= 9)
                 pkg-kde-tools (>= 0.15.17),
                 publicsuffix,
                 unixodbc-dev,
 +               xvfb,
                 zlib1g-dev
  Build-Conflicts: libmariadbclient-dev
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Homepage: http://qt-project.org/
- Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtbase.git
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtbase.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git
  
  Package: libqt5core5a
  Architecture: any

-- 
qtbase packaging