[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0+dfsg-2-2-g591ae1f

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 591ae1f15e782772a4abac3955063e12a651dd3d
Author: Diederik de Haas <didi.debian at cknow.org>
Date:   Thu Mar 17 22:54:55 2016 +0100

    Don't fail the Xsession.d script if glxinfo is not installed.
---
 debian/90qt5-opengl | 23 ++++++++++++-----------
 debian/changelog    |  3 +++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/90qt5-opengl b/debian/90qt5-opengl
index 0986943..fe9a6cc 100644
--- a/debian/90qt5-opengl
+++ b/debian/90qt5-opengl
@@ -5,16 +5,17 @@
 # This file is sourced by Xsession(5), not executed.
 
 if [ "$(which glxinfo)" = "" ] ; then
-  echo "glxinfo not found"
-  echo "On Debian (based) systems, install the mesa-utils package"
-  #echo "On RedHat (based) systems, install the glx-utils package"
-fi
-OPENGL_VERSION=`LANG=C glxinfo | grep '^OpenGL version string: ' | head -n 1 | sed -e 's/^OpenGL version string: \([0-9]\).*$/
/g'`
-if [ -n "$OPENGL_VERSION" ] && [ "$OPENGL_VERSION" -lt 2 ]; then
-  QT_XCB_FORCE_SOFTWARE_OPENGL=1
-  export QT_XCB_FORCE_SOFTWARE_OPENGL
-elif [ -n "$OPENGL_VERSION" ] ; then
-  echo "OpenGL version: $OPENGL_VERSION"
+    echo "To detect whether software based rendering is needed for Qt 5 the glxinfo program is a requirement but it was not found on this system."
+    echo "On Debian (based) systems, install the mesa-utils package."
+    #echo "On RedHat (based) systems, install the glx-utils package."
 else
-  echo "OpenGL version not found"
+    OPENGL_VERSION=`LANG=C glxinfo | grep '^OpenGL version string: ' | head -n 1 | sed -e 's/^OpenGL version string: \([0-9]\).*$/
/g'`
+    if [ -n "$OPENGL_VERSION" ] && [ "$OPENGL_VERSION" -lt 2 ]; then
+        QT_XCB_FORCE_SOFTWARE_OPENGL=1
+        export QT_XCB_FORCE_SOFTWARE_OPENGL
+    elif [ -n "$OPENGL_VERSION" ] ; then
+        echo "OpenGL version: $OPENGL_VERSION."
+    else
+        echo "OpenGL version not found."
+    fi
 fi
diff --git a/debian/changelog b/debian/changelog
index 93cabc2..ba3d59d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.6.0+dfsg-3) UNRELEASED; urgency=medium
 
+  * Improve the Xsession.d script so it won't fail if mesa-utils is
+    not installed. Also log why glxinfo is needed for this script.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 17 Mar 2016 09:59:33 -0300
 
 qtbase-opensource-src (5.6.0+dfsg-2) experimental; urgency=medium

-- 
qtbase packaging