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

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit e60a9ca61df220f1805dc651e27d2dd4cb532b73
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Aug 14 10:36:42 2015 +0300

    Copy patch from qt4-x11 to link ibase sql plugin against firebird.
---
 debian/changelog                  |  4 +++-
 debian/patches/link_fbclient.diff | 23 +++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 34490bf..97b21e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ 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.
+    - Resurrect libqt5sql5-ibase binary package.
+    - Copy patch from qt4-x11 to link ibase sql plugin against firebird
+      (link_fbclient.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 05 Aug 2015 20:18:52 +0300
 
diff --git a/debian/patches/link_fbclient.diff b/debian/patches/link_fbclient.diff
new file mode 100644
index 0000000..6e2afef
--- /dev/null
+++ b/debian/patches/link_fbclient.diff
@@ -0,0 +1,23 @@
+Description: build ibase sql plugin against firebird
+Author: Fathi Boudra <fabo at debian.org>
+Forwarded: no
+Last-Update: 2015-08-14
+
+--- a/config.tests/unix/ibase/ibase.pro
++++ b/config.tests/unix/ibase/ibase.pro
+@@ -1,3 +1,3 @@
+ SOURCES = ibase.cpp
+ CONFIG -= qt dylib
+-LIBS += -lgds
++LIBS += -lfbclient
+--- a/src/sql/drivers/ibase/qsql_ibase.pri
++++ b/src/sql/drivers/ibase/qsql_ibase.pri
+@@ -2,7 +2,7 @@
+ SOURCES += $$PWD/qsql_ibase.cpp
+ 
+ unix {
+-    !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
++    !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lfbclient
+ } else {
+     !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
+         LIBS += -lgds32_ms
diff --git a/debian/patches/series b/debian/patches/series
index 5e1917a..148b172 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ no_htmlinfo_example.diff
 remove_privacy_breachs.diff
 hurd-forkfd.diff
 gnukfreebsd_processNameByPid.diff
+link_fbclient.diff

-- 
qtbase packaging