[Python-modules-commits] [pyqt5] 01/03: Install sip files directly in the .install file.

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch debian/master
in repository pyqt5.

commit 1925b069e4ae27532b4986e034969440096b8e34
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 16 16:32:48 2017 +0300

    Install sip files directly in the .install file.
    
    Rather than relying on the upstream build system to install them and
    then copying.
    
    This is needed to fix the race condition when doing the arch+indep
    build: if the arch part installed the files earlier, the mv command
    in the indep part will fail with “Directory not empty” error.
---
 debian/changelog         | 2 ++
 debian/pyqt5-dev.install | 2 +-
 debian/rules             | 7 ++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 898f460..3ead663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pyqt5 (5.9.2+dfsg-2) UNRELEASED; urgency=medium
 
   * Preserve timestamps when copying jquery.min.js, to make pyrcc generate
     the resource file reproducibly.
+  * Install sip files directly in the .install file, to fix race condition
+    when doing arch+indep build.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 09 Dec 2017 21:25:16 +0300
 
diff --git a/debian/pyqt5-dev.install b/debian/pyqt5-dev.install
index 21d3c44..5330f28 100644
--- a/debian/pyqt5-dev.install
+++ b/debian/pyqt5-dev.install
@@ -1 +1 @@
-usr/share/sip/PyQt5/
+sip/Q* usr/share/sip/PyQt5/
diff --git a/debian/rules b/debian/rules
index 9b41270..fefeeea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,8 @@ build-%/configure-stamp:
 			-m $(shell python$*-config --configdir) \
 			-d /usr/lib/python$*/dist-packages \
 			--sip-incdir /usr/include/python$*$(if $(filter 3.%, $*),m,) \
-			$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin --no-qml-plugin --no-tools --no-sip-files)
+			--no-sip-files \
+			$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin --no-qml-plugin --no-tools)
 	sed -i '/strip/d' build-$*/*/Makefile
 	touch $@
 
@@ -108,10 +109,6 @@ install-indep: build-indep
 	mkdir -p tmp_install_root
 	$(MAKE) -C build-$(DEFAULT_PYTHON) install INSTALL_ROOT=$(CURDIR)/tmp_install_root
 
-	# Install the sip files generated by make install
-	mkdir -p debian/tmp/usr/share/
-	mv tmp_install_root/usr/share/sip/ debian/tmp/usr/share/
-
 	dh_installdirs -i
 	dh_install -i --fail-missing
 	dh_installexamples -Xactiveqt -i

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyqt5.git