[SCM] qt3d packaging branch, experimental, updated. debian/5.9.2+dfsg-1-3-g45abe6d

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Oct 20 18:05:10 UTC 2017


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

The following commit has been merged in the experimental branch:
commit 5fb19fda0d45fc34917f2f687a1b9106b9aa5857
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 20 16:24:13 2017 +0300

    Install qgltf to the new location, provide a compatibility symlink.
---
 debian/changelog               | 3 +++
 debian/qt3d5-dev-tools.install | 2 +-
 debian/rules                   | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c704fb7..c996a2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qt3d-opensource-src (5.9.2+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Update for Qt binaries location change in qtbase 5.9.2+dfsg-3.
+    - Install qgltf to the new location, provide a compatibility symlink.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Oct 2017 16:18:30 +0300
 
diff --git a/debian/qt3d5-dev-tools.install b/debian/qt3d5-dev-tools.install
index 837ac4c..bb6912a 100644
--- a/debian/qt3d5-dev-tools.install
+++ b/debian/qt3d5-dev-tools.install
@@ -1 +1 @@
-usr/lib/*/qt5/bin/qgltf
+usr/lib/qt5/bin/qgltf
diff --git a/debian/rules b/debian/rules
index d2493f1..ac8a324 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,9 @@ override_dh_auto_install-arch:
 override_dh_auto_install-indep:
 	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
+override_dh_link:
+	dh_link -pqt3d5-dev-tools usr/lib/qt5/bin/qgltf usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qgltf
+
 override_dh_auto_test-arch:
 	# Hangs on ppc*, hppa: https://bugreports.qt.io/browse/QTBUG-63864
 	-xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX +extension EGL" \

-- 
qt3d packaging



More information about the pkg-kde-commits mailing list