[neon/qt/qtquickcontrols2/Neon/experimental] debian: Merge remote-tracking branch 'origin/master' into Neon/experimental

[Jonathan Riddell]

Git commit dff338af8d455a8bf62b73e34833739358ae76a0 by Jonathan Riddell.
Committed on 21/10/2020 at 11:09.
Pushed by jriddell into branch 'Neon/experimental'.

Merge remote-tracking branch 'origin/master' into Neon/experimental

M  +7    -0    debian/rules

https://invent.kde.org/neon/qt/qtquickcontrols2/commit/dff338af8d455a8bf62b73e34833739358ae76a0

diff --cc debian/rules
index 6a2fb62,8dc3706..15d8634
--- a/debian/rules
+++ b/debian/rules
@@@ -12,9 -12,16 +12,16 @@@ export QT_SELECT = qt
  override_dh_auto_configure:
  	dh_auto_configure -- QT_BUILD_PARTS+=tests
  
 -override_dh_auto_build-indep:
 +override_dh_auto_build-indep: build-arch
  	dh_auto_build -- 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)/libQt5QuickControls2.prl
+ 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5QuickTemplates2.prl
+ 
  override_dh_auto_install-indep:
  	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs