[neon/forks/pyqt5/Neon/release-lts] debian: [sip5] Install .sip files into the new location.

[Dmitry Shachnev]

Git commit ed26706bf4eb1568a238b9016171e6d1d8b7cecf by Dmitry Shachnev.
Committed on 14/06/2020 at 11:46.
Pushed by jriddell into branch 'Neon/release-lts'.

[sip5] Install .sip files into the new location.

M  +1    -0    debian/changelog
M  +1    -1    debian/pyqt5-dev.install
M  +3    -5    debian/rules

https://invent.kde.org/neon/forks/pyqt5/commit/ed26706bf4eb1568a238b9016171e6d1d8b7cecf

diff --git a/debian/changelog b/debian/changelog
index 643458d8..4c069c03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pyqt5 (5.15.0+dfsg-2) UNRELEASED; urgency=medium
     - Update build-dependencies.
     - Build with sip-build instead of configure.py.
     - Drop debian/patches/public_sip.diff, not needed with sip5.
+    - Install .sip files into the new location.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 14 Jun 2020 14:19:50 +0300
 
diff --git a/debian/pyqt5-dev.install b/debian/pyqt5-dev.install
index 5330f287..66a7c167 100644
--- a/debian/pyqt5-dev.install
+++ b/debian/pyqt5-dev.install
@@ -1 +1 @@
-sip/Q* usr/share/sip/PyQt5/
+usr/lib/python3/dist-packages/PyQt5/bindings
diff --git a/debian/rules b/debian/rules
index 60799452..0f1b67a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,19 +84,18 @@ install-indep: build-indep
 	dh_prep -i
 
 	# Install the files to temporary location to be able to use pyrcc5 below
-	mkdir -p tmp_install_root
-	$(MAKE) -C build-$(DEFAULT_PYTHON) install INSTALL_ROOT=$(CURDIR)/tmp_install_root
+	$(MAKE) -C build-$(DEFAULT_PYTHON) install INSTALL_ROOT=$(CURDIR)/debian/tmp
 
 	dh_installdirs -i
 	dh_install -i
 	dh_installexamples -Xactiveqt -i
 	# Use python3 shebangs and regenerate resource files
-	export PYTHONPATH=$(CURDIR)/tmp_install_root/usr/lib/python3/dist-packages; \
+	export PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages; \
 	cd $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/; \
 		cp --preserve=timestamps /usr/share/javascript/jquery/jquery.min.js webkit/fancybrowser/; \
 		find . -name '*.py' -exec sed -i 's/\/env python/\/python3/g' {} +; \
 		find . -name '*.qrc' | sed 's/\.qrc//g' | QT_HASH_SEED=0 xargs -I {} \
-		$(CURDIR)/tmp_install_root/usr/bin/pyrcc5 {}.qrc -o {}_rc.py
+		$(CURDIR)/debian/tmp/usr/bin/pyrcc5 {}.qrc -o {}_rc.py
 	# Symlink duplicate files in examples. Based on Andrew Starr-Bochicchio's
 	# code in ubuntu-packaging-guide.
 	cd $(CURDIR)/debian/pyqt5-examples && \
@@ -138,7 +137,6 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -rf $(ALLPYTHONS:%=build-%) $(ALLPYTHONS:%=dbg-build-%)
-	rm -rf tmp_install_root
 	find . -type f -name .DS_Store -delete
 	find . -type f -name *.pyc -delete
 	find . -type d -name __pycache__ -delete