[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-7-10-g5bc5e6e
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Sat Jul 6 01:44:23 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=c2649da
The following commit has been merged in the master branch:
commit c2649da32186ae3b736bc814629f4fe58d8a259f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Jul 5 22:37:40 2013 -0300
Refresh deppath_gnu.diff.
---
debian/changelog | 1 +
debian/patches/deppath_gnu.diff | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7017358..8b547d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtbase-opensource-src (5.1.0+dfsg-1) UNRELEASED; urgency=low
* Make libqt5core5 provide qtbase-abi-5-1-0.
* Update symbols files with latest 5.0.2 build logs.
* Remove patches applied upstream: undef_B0.diff.
+ * Refresh patches: deppath_gnu.diff.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 27 Jun 2013 14:04:21 -0300
diff --git a/debian/patches/deppath_gnu.diff b/debian/patches/deppath_gnu.diff
index f8fa9f3..4b88e84 100644
--- a/debian/patches/deppath_gnu.diff
+++ b/debian/patches/deppath_gnu.diff
@@ -7,8 +7,8 @@ Forwarded: no
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
-@@ -242,7 +242,7 @@ defineTest(qtAddTargetEnv) {
- deppath += $$shell_path($$eval(QT.$${dep}.libs))
+@@ -256,7 +256,7 @@ defineTest(qtAddTargetEnv) {
+ }
equals(QMAKE_HOST.os, Windows) {
deppath.name = PATH
- } else:contains(QMAKE_HOST.os, Linux|FreeBSD) {
--
qtbase packaging
More information about the pkg-kde-commits
mailing list