[SCM] qtbase packaging branch, experimental, updated. debian/5.5.0+dfsg-3-3-ga8a0e06

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit a8a0e069d5d09049c374fa244ba3dfc14f70d756
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Aug 14 00:11:13 2015 +0300

    Resurrect libqt5sql5-ibase binary package.
    
    And build it on all Linux and kFreeBSD architectures.
---
 debian/changelog |  2 ++
 debian/control   | 15 +++++++++++++--
 debian/rules     |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1916717..34490bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtbase-opensource-src (5.5.0+dfsg-4) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Update symbols files with buildds logs.
+  * Build firebird plugin on all Linux and kFreeBSD architectures.
+  * Resurrect libqt5sql5-ibase binary package.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 05 Aug 2015 20:18:52 +0300
 
diff --git a/debian/control b/debian/control
index 65aa029..294920e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
            Dmitry Shachnev <mitya57 at debian.org>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
-               firebird-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc],
+               firebird-dev [kfreebsd-any linux-any],
                freetds-dev,
                gdb,
                libasound2-dev [linux-any],
@@ -142,7 +142,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 | libqt5sql5-ibase [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc]
+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.
@@ -205,6 +205,17 @@ Description: Qt 5 FreeTDS database driver
  Install it if you intend to use or write Qt programs that are to access a
  MS SQL or Sybase SQL server.
 
+Package: libqt5sql5-ibase
+Architecture: kfreebsd-any linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 Firebird database driver
+ This package contains the Firebird plugin for Qt 5.
+ .
+ Install it if you intend to use or write Qt programs that are to access a
+ Firebird/InterBase DB.
+
 Package: libqt5xml5
 Architecture: any
 Multi-Arch: same
diff --git a/debian/rules b/debian/rules
index 3ff01a0..6182a92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ pkgs_with_arch = $(patsubst debian/%.install-$(DEB_HOST_ARCH),%,$(wildcard debia
 pkgs_with_os = $(patsubst debian/%.install-$(DEB_HOST_ARCH_OS),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH_OS)))
 
 
-ifneq (,$(filter %-sql-ibase,$(shell dh_listpackages)))
+ifneq (,$(filter libqt5sql5-ibase,$(shell dh_listpackages)))
 	extra_configure_opts += -plugin-sql-ibase
 else
 	extra_configure_opts += -no-sql-ibase

-- 
qtbase packaging