[SCM] qtbase packaging branch, ubuntu+1, updated. ubuntu/5.9.2+dfsg-4ubuntu6-16-g389bae5

[Simon Quigley]

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

The following commit has been merged in the ubuntu+1 branch:
commit ffd3258b52e232ec19e1705c74b77133843ab9ce
Merge: d286f3154a334e9eb76fbd650e3c2ec790350bb7 6f1504c18d97a58e73a94c7cc885be7374039914
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Wed Nov 29 18:52:18 2017 -0600

    Merge branch 'master' into ubuntu+1

 debian/changelog                  |  16 ++
 debian/control                    |   1 +
 debian/patches/postgresql_10.diff | 408 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |   1 +
 debian/qt.conf.in                 |  18 ++
 debian/qt5-qmake.install          |   2 +
 debian/rules                      |  15 ++
 7 files changed, 461 insertions(+)

diff --cc debian/changelog
index fb0ddc0,e25214c..9dfdace
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,53 -1,19 +1,69 @@@
+ qtbase-opensource-src (5.9.2+dfsg-5) UNRELEASED; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Ship /usr/lib/${DEB_HOST_MULTIARCH}/qt.conf in qt5-qmake, which can be
+     passed to qmake as -qtconf option for cross-building.
+   * Ship /usr/bin/${DEB_HOST_GNU_TYPE}-qmake wrapper script in qt5-qmake, for
+     using qmake with autoconf and AC_CHECK_TOOL.
+   * Backport upstream patches for PostgreSQL 10 support (closes: #879960).
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Make libqt5opengl5-dev provide libqt5opengl5-desktop-dev on !armel and !armhf.
+     In this way packages depending on Desktop OpenGL can use this package as
+     a dependency without the need to keep an arch list (Closes: #881943).
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 07 Nov 2017 13:57:18 +0300
+ 
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu6) bionic; urgency=medium
 +
 +  * No-change rebuild for icu soname change.
 +
 + -- Matthias Klose <doko at ubuntu.com>  Tue, 07 Nov 2017 09:01:19 +0000
 +
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu5) bionic; urgency=medium
 +
 +  * Revert tools location to non-multiarch.
 +
 + -- Dmitry Shachnev <mitya57 at ubuntu.com>  Thu, 02 Nov 2017 14:12:29 +0300
 +
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu4) bionic; urgency=medium
 +
 +  * Really install the tools in the multiarch location too.
 +    (there is the same configuration option to find and install
 +     tools, so we also need this hack)
 +
 + -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 01 Nov 2017 11:44:27 +0100
 +
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu3) bionic; urgency=medium
 +
 +  * Use /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin to find the old tools,
 +    because we didn't have a fully built 5.9.2 yet in Ubuntu, so lets
 +    force the old location (this change will be reverted once the current one
 +    publishes)
 +
 + -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 01 Nov 2017 10:19:07 +0100
 +
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu2) bionic; urgency=medium
 +
 +  * Temporarily lower the build dep on qttools so that we aren't depwait on
 +    arch:all.
 +
 + -- Simon Quigley <tsimonq2 at ubuntu.com>  Tue, 31 Oct 2017 17:25:22 -0500
 +
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu1) bionic; urgency=medium
 +
 +  [ Simon Quigley ]
 +  * Merge from Debian Sid. Remaining changes:
 +    - Depend on libssl1.0.0 instead of libssl1.0.2.
 +    - Add arm64 to the architectures that GLES is enabled on.
 +    - Make qt5-default Multi-Arch: same.
 +
 +  [ Dmitry Shachnev ]
 +  * The tests are not run currently anyway, so drop the tests-related
 +    delta with Debian.
 +
 + -- Simon Quigley <tsimonq2 at ubuntu.com>  Tue, 31 Oct 2017 08:45:58 -0500
 +
  qtbase-opensource-src (5.9.2+dfsg-4) unstable; urgency=medium
  
    * Upload to unstable.

-- 
qtbase packaging