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

[Jonathan Riddell]

Git commit d369ddbf23375fddd103eb40c4638854d38b06ee 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  +6    -6    debian/rules

https://invent.kde.org/neon/qt/qtxmlpatterns/commit/d369ddbf23375fddd103eb40c4638854d38b06ee

diff --cc debian/rules
index 8955b96,e341e3a..ff9c65f
--- a/debian/rules
+++ b/debian/rules
@@@ -13,9 -13,15 +13,15 @@@ 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 path from the prl file.
+ 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5XmlPatterns.prl
+ 
  override_dh_auto_install-indep:
  	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs