[SCM] qtbase packaging branch, master, updated. debian/5.1.0+dfsg-5-3-g7b78d48

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 7b78d482fbed79d0815bd72249bc7801a064cb10
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Aug 28 10:57:34 2013 -0300

    Remove deppath_gnu.diff, the fix is now included upstream.
---
 debian/changelog                |    1 +
 debian/patches/deppath_gnu.diff |   18 ------------------
 debian/patches/series           |    1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c26cf6c..28fb6f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.1.1+dfsg-1) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
+  * Remove deppath_gnu.diff, the fix is now included upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 28 Aug 2013 10:47:33 -0300
 
diff --git a/debian/patches/deppath_gnu.diff b/debian/patches/deppath_gnu.diff
deleted file mode 100644
index 4b88e84..0000000
--- a/debian/patches/deppath_gnu.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Description: Use LD_LIBRARY_PATH for deppath.name in any GNU system
- Use the right environment variable for deppath.name in any system based on
- GNU libc.
-Last-Update: 2013-04-21
-Forwarded: no
-
---- a/mkspecs/features/qt_functions.prf
-+++ b/mkspecs/features/qt_functions.prf
-@@ -256,7 +256,7 @@ defineTest(qtAddTargetEnv) {
-         }
-         equals(QMAKE_HOST.os, Windows) {
-             deppath.name = PATH
--        } else:contains(QMAKE_HOST.os, Linux|FreeBSD) {
-+        } else:contains(QMAKE_HOST.os, Linux|FreeBSD|GNU) {
-             deppath.name = LD_LIBRARY_PATH
-         } else:equals(QMAKE_HOST.os, Darwin) {
-             contains(QT_CONFIG, qt_framework): \
diff --git a/debian/patches/series b/debian/patches/series
index 6941803..e23f5bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-deppath_gnu.diff
 Dont_check_for_the_existence_of_priv_inc_dirs.patch
 sha3_64bit_BE.diff
 linux_no_perf.diff

-- 
qtbase packaging