[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.1+dfsg-10-275-gebd7676

[Dmitry Shachnev]

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

The following commit has been merged in the ubuntu+1 branch:
commit ebd7676b52e56499a29928fdc47ec6c4a671ee71
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Sep 23 20:52:09 2017 +0300

    Reduce the delta a bit more.
---
 debian/changelog | 2 +-
 debian/control   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5308d9..4e50237 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 qtbase-opensource-src (5.9.1+dfsg-10ubuntu1) UNRELEASED; urgency=medium
 
   * Merge with Debian unstable, remaining changes:
-    - Compile without firebird support.
     - Depend on libssl1.0.0 instead of libssl1.0.2.
     - Enable tests for amd64, armhf, and i386.
     - Add arm64 to the architectures that GLES is enabled on.
+    - Make qt5-default Multi-Arch: same.
   * Build with firebird support to reduce delta with Debian.
 
  -- Dmitry Shachnev <mitya57 at ubuntu.com>  Sat, 23 Sep 2017 20:13:55 +0300
diff --git a/debian/control b/debian/control
index 2f5eab2..ad7ed46 100644
--- a/debian/control
+++ b/debian/control
@@ -149,7 +149,7 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libqt5sql5-sqlite | libqt5sql5-mysql | libqt5sql5-odbc | libqt5sql5-psql
+Recommends: libqt5sql5-sqlite | libqt5sql5-mysql | libqt5sql5-odbc | libqt5sql5-psql | libqt5sql5-tds | libqt5sql5-ibase [kfreebsd-any linux-any]
 Description: Qt 5 SQL module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -323,6 +323,7 @@ Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
          ${misc:Depends}
 Recommends: libqt5opengl5-dev (= ${binary:Version})
 Suggests: default-libmysqlclient-dev,
+          firebird-dev,
           libegl1-mesa-dev,
           libgl1-mesa-dev,
           libpq-dev,

-- 
qtbase packaging