[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.0+dfsg-1-262-g84f9758

Simon Quigley tsimonq2-guest at moszumanska.debian.org
Mon Jun 12 13:30:01 UTC 2017


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

The following commit has been merged in the ubuntu+1 branch:
commit 84f9758c2ee5a1cc40d5484f7986808542e48674
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Mon Jun 12 08:20:18 2017 -0500

    Add arm64 to the arches GLES is built on in qtbase5-private-dev.install.
---
 debian/changelog                   |  2 ++
 debian/qtbase5-private-dev.install | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d625715..68ec94f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ qtbase-opensource-src (5.9.0+dfsg-1ubuntu1) UNRELEASED; urgency=medium
   * Add revert-automatic-code-attribution-docs.patch which reverts a
     commit from upstream because it requires a tool introduced in a Qt
     Tools version (5.8) that Ubuntu skipped.
+  * Add arm64 to the arches GLES is built on in qtbase5-private-
+    dev.install.
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Thu, 08 Jun 2017 13:48:28 +0300
 
diff --git a/debian/qtbase5-private-dev.install b/debian/qtbase5-private-dev.install
index f079a79..0fda7fb 100755
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@ -1,11 +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
+[!armel !armhf !arm64] usr/include/*/qt5/QtGlxSupport/5.*/*
+[!armel !armhf !arm64] usr/include/*/qt5/QtGlxSupport/QtGlxSupport
+[!armel !armhf !arm64] usr/include/*/qt5/QtGlxSupport/QtGlxSupportDepends
+[!armel !armhf !arm64] usr/include/*/qt5/QtGlxSupport/QtGlxSupportVersion
+[!armel !armhf !arm64] usr/include/*/qt5/QtGlxSupport/qtglxsupportversion.h
+[!armel !armhf !arm64] usr/lib/*/libQt5GlxSupport.a
+[!armel !armhf !arm64] usr/lib/*/libQt5GlxSupport.prl
 [kfreebsd-any linux-any] usr/include/*/qt5/QtEglFSDeviceIntegration/5.*/*
 [kfreebsd-any linux-any] usr/include/*/qt5/QtEglFSDeviceIntegration/QtEglFSDeviceIntegration
 [kfreebsd-any linux-any] usr/include/*/qt5/QtEglFSDeviceIntegration/QtEglFSDeviceIntegrationDepends

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list