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

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Feb 11 09:32:26 UTC 2017


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

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

    Mark QtInputSupport as linux-only.
    
    It needs evdev or libinput, both are available only on Linux.
---
 debian/changelog                   |  1 +
 debian/qtbase5-private-dev.install | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dfbe6a4..8d2909b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtbase-opensource-src (5.8.0+dfsg-2) UNRELEASED; urgency=medium
   * 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.
+  * Mark QtInputSupport as linux-only, because it needs libinput.
 
  -- 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
index 8fa83ce..88975fd 100755
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@ -6,6 +6,13 @@
 [!armel !armhf] usr/include/*/qt5/QtGlxSupport/qtglxsupportversion.h
 [!armel !armhf] usr/lib/*/libQt5GlxSupport.a
 [!armel !armhf] usr/lib/*/libQt5GlxSupport.prl
+[linux-any] usr/include/*/qt5/QtInputSupport/5.*/*
+[linux-any] usr/include/*/qt5/QtInputSupport/QtInputSupport
+[linux-any] usr/include/*/qt5/QtInputSupport/QtInputSupportDepends
+[linux-any] usr/include/*/qt5/QtInputSupport/QtInputSupportVersion
+[linux-any] usr/include/*/qt5/QtInputSupport/qtinputsupportversion.h
+[linux-any] usr/lib/*/libQt5InputSupport.a
+[linux-any] usr/lib/*/libQt5InputSupport.prl
 usr/include/*/qt5/QtAccessibilitySupport/5.*/*
 usr/include/*/qt5/QtAccessibilitySupport/QtAccessibilitySupport
 usr/include/*/qt5/QtAccessibilitySupport/QtAccessibilitySupportDepends
@@ -44,11 +51,6 @@ usr/include/*/qt5/QtFontDatabaseSupport/QtFontDatabaseSupportDepends
 usr/include/*/qt5/QtFontDatabaseSupport/QtFontDatabaseSupportVersion
 usr/include/*/qt5/QtFontDatabaseSupport/qtfontdatabasesupportversion.h
 usr/include/*/qt5/QtGui/5.*/*
-usr/include/*/qt5/QtInputSupport/5.*/*
-usr/include/*/qt5/QtInputSupport/QtInputSupport
-usr/include/*/qt5/QtInputSupport/QtInputSupportDepends
-usr/include/*/qt5/QtInputSupport/QtInputSupportVersion
-usr/include/*/qt5/QtInputSupport/qtinputsupportversion.h
 usr/include/*/qt5/QtLinuxAccessibilitySupport/5.*/*
 usr/include/*/qt5/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupport
 usr/include/*/qt5/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportDepends
@@ -88,8 +90,6 @@ usr/lib/*/libQt5FbSupport.a
 usr/lib/*/libQt5FbSupport.prl
 usr/lib/*/libQt5FontDatabaseSupport.a
 usr/lib/*/libQt5FontDatabaseSupport.prl
-usr/lib/*/libQt5InputSupport.a
-usr/lib/*/libQt5InputSupport.prl
 usr/lib/*/libQt5LinuxAccessibilitySupport.a
 usr/lib/*/libQt5LinuxAccessibilitySupport.prl
 usr/lib/*/libQt5PlatformCompositorSupport.a

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list