[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.2+dfsg-7-298-gba8dacc

[Dmitry Shachnev]

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

The following commit has been merged in the ubuntu+1 branch:
commit ba8dacc8ad45f831cf9f6524b792712b2fbf45a1
Merge: d3575c24754fce5e1cd86c5c55648e7af377813d 9ed77f7561f3311b6e09a28eda318401eab45239
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 19 17:40:05 2018 +0300

    Merge tag 'debian/5.9.2+dfsg-7' into ubuntu+1
    
    5.9.2+dfsg-7 unstable; urgency=medium

 debian/changelog                     |  25 +++
 debian/control                       |   7 +-
 debian/libqt5core5a.install          |   1 -
 debian/libqt5core5a.maintscript      |   1 +
 debian/patches/dead_key_symbols.diff | 301 +++++++++++++++++++++++++++++++++++
 debian/patches/series                |   1 +
 debian/qmake-cross-wrapper.in        |  16 ++
 debian/qt.conf.in                    |  20 +--
 debian/qtlogging.ini                 |   2 -
 debian/rules                         |  14 +-
 10 files changed, 361 insertions(+), 27 deletions(-)

diff --cc debian/changelog
index d447a11,8274bfa..5471d1d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,19 +1,37 @@@
++qtbase-opensource-src (5.9.3+dfsg-0ubuntu2) UNRELEASED; urgency=medium
++
++  * Merge from Debian unstable, remaining changes:
++    - New upstream release (5.9.3), drop upstream patches.
++    - Depend on libssl1.0.0 instead of libssl1.0.2.
++    - Add arm64 to the architectures that GLES is enabled on.
++
++ -- Dmitry Shachnev <mitya57 at ubuntu.com>  Fri, 19 Jan 2018 17:25:15 +0300
++
 +qtbase-opensource-src (5.9.3+dfsg-0ubuntu1) bionic; urgency=medium
 +
 +  * New upstream release.
 +  * Refresh patches, and delete reverse-applicable ones:
 +    - postgresql_10.diff
 +    - qglxconvenience_nullptr.diff
 +
 + -- Simon Quigley <tsimonq2 at ubuntu.com>  Thu, 30 Nov 2017 16:51:16 -0600
 +
+ qtbase-opensource-src (5.9.2+dfsg-7) unstable; urgency=medium
+ 
+   * Remove qtlogging.ini file, the underlying issue has been fixed, and
+     it causes too many problems (closes: #886437, LP: #1744260).
+   * Backport upstream patch to add missing dead key symbols (closes: #799824).
+   * Make ${DEB_HOST_GNU_TYPE}-qmake script set QMAKE_QMAKE to itself.
+     This is needed for properly building configuration tests.
+   * Pass toolchain-related variable assignments as early flags to qmake.
+     Switch to default mode after passing them.
+   * Support <triplet>-qmake -query something (closes: #886542). Thanks to
+     Helmut Grohne.
+   * Mark qtbase5-examples and qt5-default packages as Multi-Arch: same.
+   * Bump Standards-Version to 4.1.3, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 19 Jan 2018 15:19:19 +0300
+ 
  qtbase-opensource-src (5.9.2+dfsg-6) unstable; urgency=medium
  
    [ Lisandro Damián Nicanor Pérez Meyer ]
diff --cc debian/control
index 41d2f54,5e72a22..942a8d3
--- a/debian/control
+++ b/debian/control
@@@ -65,9 -64,9 +65,9 @@@ Build-Depends: debhelper (>= 10.3)
                 publicsuffix,
                 unixodbc-dev,
                 zlib1g-dev
 -Build-Depends-Indep: libqt5sql5-sqlite (>= 5.8.0+dfsg~) <!nodoc>,
 +Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.2+dfsg~) <!nodoc>,
                       qttools5-dev-tools (>= 5.9.2-2~) <!nodoc>
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.3
  Homepage: http://qt-project.org/
  Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtbase.git
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git
@@@ -366,7 -365,7 +366,7 @@@ Depends: libqt5opengl5 (= ${binary:Vers
           ${misc:Depends}
  Breaks: qtbase5-dev (<< 5.4.0+dfsg-6~)
  Replaces: qtbase5-dev (<< 5.4.0+dfsg-6~)
--Provides: libqt5opengl5-desktop-dev (= ${binary:Version}) [!armel !armhf]
++Provides: libqt5opengl5-desktop-dev (= ${binary:Version}) [!armel !armhf !arm64]
  Description: Qt 5 OpenGL library development files
   Qt is a cross-platform C++ application framework. Qt's primary feature
   is its rich set of widgets that provide standard GUI functionality.
diff --cc debian/patches/series
index 9510925,d09261b..b1184c7
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,8 +1,6 @@@
  # Backported from upstream.
 -qglxconvenience_nullptr.diff
 -postgresql_10.diff
  qdnslookup_crash.diff
+ dead_key_symbols.diff
  
  # Debian specific.
  gnukfreebsd.diff

-- 
qtbase packaging