[neon/qt/qtconnectivity/Neon/testing] debian: merge master

[Jonathan Riddell]

Git commit 0d08194bf37d011b88b909ad6a0de37de5129578 by Jonathan Riddell.
Committed on 23/10/2020 at 09:17.
Pushed by jriddell into branch 'Neon/testing'.

merge master

M  +16   -18   debian/changelog
M  +8    -1    debian/rules

https://invent.kde.org/neon/qt/qtconnectivity/commit/0d08194bf37d011b88b909ad6a0de37de5129578

diff --cc debian/rules
index fef22a6,b438a58..f5e63c4
--- a/debian/rules
+++ b/debian/rules
@@@ -19,9 -19,16 +19,16 @@@ override_dh_auto_configure
  		PKG_CONFIG_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
  		QT_BUILD_PARTS+=tests
  
 -override_dh_auto_build-indep:
 +override_dh_auto_build-indep: build-arch
  	dh_auto_build -Smakefile -- docs
  
+ override_dh_auto_install-arch:
+ 	dh_auto_install
+ 
+ 	# Reproducible builds: remove build paths from prl files.
+ 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5Bluetooth.prl
+ 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5Nfc.prl
+ 
  override_dh_auto_install-indep:
  	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs