[SCM] qtbase packaging branch, experimental, updated. debian/5.2.1+dfsg-3-16-g42595a6

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 42595a629d2c6349f7e383c1ebc2aa1982afa4e8
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 20 00:58:21 2014 -0300

    Refresh hurd_opengl_incldir.diff.
---
 debian/changelog                        |  1 +
 debian/patches/hurd_opengl_incldir.diff | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e59a4a8..5c9dd1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ qtbase-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium
     it's just a false positive coming from the fact that the documentation is
     listing the license, but it's really not licensed under the RFC license.
   * Update symbols files with buildds' logs.
+  * Refresh hurd_opengl_incldir.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Mar 2014 10:10:09 -0300
 
diff --git a/debian/patches/hurd_opengl_incldir.diff b/debian/patches/hurd_opengl_incldir.diff
index 36bd93c..cc31add 100644
--- a/debian/patches/hurd_opengl_incldir.diff
+++ b/debian/patches/hurd_opengl_incldir.diff
@@ -3,9 +3,13 @@ Description: hurd mkspec: remove X11R6-related library and include dirs
  Such X11 dirs have not been there for years now, and they can cause build
  issues in cmake-based projects (as they make cmake look in those directories
  for extra stuff like libGL)
-Last-Update: 2013-10-06
+Last-Update: 2014-05-20
 Forwarded: no
 
+---
+ mkspecs/hurd-g++/qmake.conf |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 --- a/mkspecs/hurd-g++/qmake.conf
 +++ b/mkspecs/hurd-g++/qmake.conf
 @@ -12,10 +12,10 @@ QMAKE_CXXFLAGS_THREAD  += $$QMAKE_CFLAGS
@@ -20,6 +24,6 @@ Forwarded: no
 +QMAKE_LIBDIR_X11        =
 +QMAKE_INCDIR_OPENGL     =
 +QMAKE_LIBDIR_OPENGL     =
- QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
  QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+ QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+ QMAKE_INCDIR_EGL        =

-- 
qtbase packaging