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

[Jonathan Riddell]

Git commit 6300009a8d9d13cfc6175188c75a023df68ffad1 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  +29   -13   debian/changelog
M  +7    -4    debian/rules

https://invent.kde.org/neon/qt/qtcharts/commit/6300009a8d9d13cfc6175188c75a023df68ffad1

diff --cc debian/rules
index f97d1fe,f211a80..502f3b2
--- a/debian/rules
+++ b/debian/rules
@@@ -16,9 -16,15 +16,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 paths from prl files.
+ 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5Charts.prl
+ 
  override_dh_auto_install-indep:
  	$(MAKE) install_docs -Csrc INSTALL_ROOT=$(CURDIR)/debian/tmp