[SCM] qtbase packaging branch, experimental, updated. debian/5.4.1+dfsg-2-37-gab91ed9

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Mon May 25 22:32:37 UTC 2015


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

The following commit has been merged in the experimental branch:
commit 4389fd3389ff3b2e19879120c2143be1f047df2f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 25 19:24:47 2015 -0300

    Refresh gnukfreebsd.diff.
---
 debian/changelog                | 1 +
 debian/patches/gnukfreebsd.diff | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d1adbc0..15867c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtbase-opensource-src (5.4.1+dfsg-5) UNRELEASED; urgency=medium
   * libqt5gui5: demote libqt5libqgtk2 to a suggestion.
   * Update symbols files with buildds' logs.
   * Bump qtbase-abi to 5-4-2.
+  * Refresh gnukfreebsd.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 18 May 2015 18:35:01 -0300
 
diff --git a/debian/patches/gnukfreebsd.diff b/debian/patches/gnukfreebsd.diff
index 94beb88..c940e2b 100644
--- a/debian/patches/gnukfreebsd.diff
+++ b/debian/patches/gnukfreebsd.diff
@@ -157,7 +157,7 @@ Forwarded: no
 +#endif // QPLATFORMDEFS_H
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -266,6 +266,8 @@
+@@ -272,6 +272,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

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list