[SCM] qtbase packaging branch, experimental, updated. debian/5.8.0+dfsg-1-8-gd2643de

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit c848589d38b4c43b213d63d6edbc3afef0083549
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Feb 10 18:41:19 2017 +0300

    Do not install QtGlxSupport library on armel and armhf.
    
    It is not built when opengles2 is in use.
---
 debian/changelog                   |  2 ++
 debian/qtbase5-private-dev.install | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f597f8f..dfbe6a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtbase-opensource-src (5.8.0+dfsg-2) UNRELEASED; urgency=medium
     missing semicolon (qvnc_semicolon.diff).
   * Add a patch to fix compilation error on Hurd (hurd_tilde.diff).
   * Switch from *.install-* files to dh-exec based .install files.
+  * Do not install QtGlxSupport library on armel and armhf, it is not
+    built when opengles2 is in use.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 Feb 2017 16:46:27 +0300
 
diff --git a/debian/qtbase5-private-dev.install b/debian/qtbase5-private-dev.install
old mode 100644
new mode 100755
index 3d116da..8fa83ce
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@ -1,3 +1,11 @@
+#! /usr/bin/dh-exec
+[!armel !armhf] usr/include/*/qt5/QtGlxSupport/5.*/*
+[!armel !armhf] usr/include/*/qt5/QtGlxSupport/QtGlxSupport
+[!armel !armhf] usr/include/*/qt5/QtGlxSupport/QtGlxSupportDepends
+[!armel !armhf] usr/include/*/qt5/QtGlxSupport/QtGlxSupportVersion
+[!armel !armhf] usr/include/*/qt5/QtGlxSupport/qtglxsupportversion.h
+[!armel !armhf] usr/lib/*/libQt5GlxSupport.a
+[!armel !armhf] usr/lib/*/libQt5GlxSupport.prl
 usr/include/*/qt5/QtAccessibilitySupport/5.*/*
 usr/include/*/qt5/QtAccessibilitySupport/QtAccessibilitySupport
 usr/include/*/qt5/QtAccessibilitySupport/QtAccessibilitySupportDepends
@@ -35,11 +43,6 @@ usr/include/*/qt5/QtFontDatabaseSupport/QtFontDatabaseSupport
 usr/include/*/qt5/QtFontDatabaseSupport/QtFontDatabaseSupportDepends
 usr/include/*/qt5/QtFontDatabaseSupport/QtFontDatabaseSupportVersion
 usr/include/*/qt5/QtFontDatabaseSupport/qtfontdatabasesupportversion.h
-usr/include/*/qt5/QtGlxSupport/5.*/*
-usr/include/*/qt5/QtGlxSupport/QtGlxSupport
-usr/include/*/qt5/QtGlxSupport/QtGlxSupportDepends
-usr/include/*/qt5/QtGlxSupport/QtGlxSupportVersion
-usr/include/*/qt5/QtGlxSupport/qtglxsupportversion.h
 usr/include/*/qt5/QtGui/5.*/*
 usr/include/*/qt5/QtInputSupport/5.*/*
 usr/include/*/qt5/QtInputSupport/QtInputSupport
@@ -85,8 +88,6 @@ usr/lib/*/libQt5FbSupport.a
 usr/lib/*/libQt5FbSupport.prl
 usr/lib/*/libQt5FontDatabaseSupport.a
 usr/lib/*/libQt5FontDatabaseSupport.prl
-usr/lib/*/libQt5GlxSupport.a
-usr/lib/*/libQt5GlxSupport.prl
 usr/lib/*/libQt5InputSupport.a
 usr/lib/*/libQt5InputSupport.prl
 usr/lib/*/libQt5LinuxAccessibilitySupport.a

-- 
qtbase packaging