[SCM] qtbase packaging branch, experimental, updated. debian/5.4.2+dfsg-4-7-g5690814

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 5690814abcd5185382d4965d0abcc69ea9c7fcb3
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jul 3 13:01:42 2015 -0300

    Refresh gnukfreebsd.diff.
---
 debian/changelog                | 1 +
 debian/patches/gnukfreebsd.diff | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4348d91..dcd6a17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtbase-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
   * Remove backported patches already present in this release:
     - upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
     - upstream_small-improvements-to-the-hurd-g-mkspec.patch
+  * Refresh gnukfreebsd.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Jun 2015 14:41:08 +0300
 
diff --git a/debian/patches/gnukfreebsd.diff b/debian/patches/gnukfreebsd.diff
index c940e2b..243b282 100644
--- a/debian/patches/gnukfreebsd.diff
+++ b/debian/patches/gnukfreebsd.diff
@@ -2,7 +2,7 @@ Author: Pino Toscano <toscano.pino at tiscali.it>
 Description: Initial GNU/kFreeBSD support
  - add a gnukfreebsd-g++ qmake mkspec, mostly copied from the hurd-g++ one
  - properly use LD_LIBRARY_PATH on GNU/* systems
-Last-Update: 2014-12-31
+Last-Update: 2015-06-03
 Forwarded: no
 
 ---
@@ -157,12 +157,12 @@ Forwarded: no
 +#endif // QPLATFORMDEFS_H
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -272,6 +272,8 @@ defineTest(qtAddTargetEnv) {
+@@ -273,6 +273,8 @@ defineTest(qtAddTargetEnv) {
              deppath.name = PATH
          } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
              deppath.name = LD_LIBRARY_PATH
 +        } else:contains(QMAKE_HOST.os, ^GNU/.*) {
 +            deppath.name = LD_LIBRARY_PATH
+         } else:contains(QMAKE_HOST.os, Haiku) {
+             deppath.name = LIBRARY_PATH
          } else:equals(QMAKE_HOST.os, Darwin) {
-             contains(QT_CONFIG, qt_framework): \
-                 deppath.name = DYLD_FRAMEWORK_PATH

-- 
qtbase packaging