From: Boyuan Yang <073plan@gmail.com>
Date: Thu, 22 Mar 2018 07:39:08 +0000 (+0800)
Subject: debian: Prepare new release.
X-Git-Tag: archive/raspbian/5.7.12-2+rpi1^2~128
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e04da33145419ec3c61cc187d737eaf32037a06c;p=dtkcore.git

debian: Prepare new release.
---

diff --git a/debian/changelog b/debian/changelog
index 436d4ba..cf8d8ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dtkcore (2.0.7.1-2) unstable; urgency=medium
+
+  * Deal with Qt headers to ensure compatibility against Qt 5.10.1.
+
+ -- Boyuan Yang <073plan@gmail.com>  Thu, 22 Mar 2018 15:38:38 +0800
+
 dtkcore (2.0.7.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 6b880c2..be2a03a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,8 @@ include /usr/share/dpkg/pkg-info.mk
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-_QT_COMPAT_VERSION := 5.9.2
+_QT_COMPAT_VERSION_LIST := 5.9.2 5.10.1
 _TMPDIR := debian/tmp
-_QTXCBDIR := $(_TMPDIR)/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtXcb/$(_QT_COMPAT_VERSION)/QtXcb/private
 
 #
 # DTK: Automatic version parsing
@@ -51,6 +50,9 @@ override_dh_installchangelogs:
 	dh_installchangelogs -k CHANGELOG.md
 
 override_dh_install:
-	mkdir -p $(_QTXCBDIR)
-	cp -t $(_QTXCBDIR)/ libqt5xcbqpa-dev/$(_QT_COMPAT_VERSION)/*.h
+	for i in $(QT_COMPAT_VERSION_LIST); do \
+	        _QTXCBDIR=$(_TMPDIR)/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtXcb/$${i}/QtXcb/private ; \
+	        mkdir -p $${_QTXCBDIR} ; \
+	        cp -t $${_QTXCBDIR}/ libqt5xcbqpa-dev/$${i}/*.h ; \
+	done
 	dh_install