[neon/qt/qtx11extras/Neon/testing] debian: merge master

Jonathan Riddell null at kde.org
Fri Oct 23 10:25:25 BST 2020


Git commit 9cf3e5835f68dc9dfc37680a2e40c8775b69b66a by Jonathan Riddell.
Committed on 23/10/2020 at 09:17.
Pushed by jriddell into branch 'Neon/testing'.

merge master

M  +8    -3    debian/rules

https://invent.kde.org/neon/qt/qtx11extras/commit/9cf3e5835f68dc9dfc37680a2e40c8775b69b66a

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



More information about the Neon-commits mailing list