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

[Jonathan Riddell]

Git commit 041ef0d6c65050cd97bf9e9d7d63cd871d7ce88f 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  +8    -3    debian/rules

https://invent.kde.org/neon/qt/qtx11extras/commit/041ef0d6c65050cd97bf9e9d7d63cd871d7ce88f

diff --cc debian/rules
index 4dce14a,04ffc79..c5bdf11
--- a/debian/rules
+++ b/debian/rules
@@@ -8,11 -10,14 +10,14 @@@ DEB_HOST_MULTIARCH ?= $(shell dpkg-arch
  %:
  	dh $@ --with pkgkde_symbolshelper
  
 -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 path from the prl file.
+ 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5X11Extras.prl
+ 
  override_dh_auto_install-indep:
  	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
- 
- override_dh_missing:
- 	dh_missing --fail-missing