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

[Jonathan Riddell]

Git commit 927c34a70b262cd83b74863feb8f613c1a14d532 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  +76   -10   debian/rules

https://invent.kde.org/neon/qt/qtpim/commit/927c34a70b262cd83b74863feb8f613c1a14d532

diff --cc debian/rules
index ab3c914,015a18d..7be0550
--- a/debian/rules
+++ b/debian/rules
@@@ -19,17 -29,14 +29,16 @@@ override_dh_auto_clean
  	rm -f qml/*/*.so
  
  override_dh_auto_configure:
- 	mkdir .git
- 	qmake QT_BUILD_PARTS+=tests
+ 	dh_auto_configure -- 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:
 +override_dh_auto_install-indep:
 +	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 +
 +override_dh_auto_install-arch:
  	dh_auto_install
 -	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
  	
  	# Remove private stuff
  	rm -rfv debian/tmp/usr/include/*/qt5/QtContacts/*/QtContacts/private/