[Python-modules-commits] [pyqt5] 01/02: Use --no-sip-files configure option.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository pyqt5.

commit 5843af7eb32ec559807b59c3fb82d5b3f00eba60
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Aug 9 20:56:13 2016 +0300

    Use --no-sip-files configure option.
    
    Instead of removing the .sip files after they are installed.
---
 debian/changelog | 2 ++
 debian/rules     | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 544a835..3b0aa63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ pyqt5 (5.7+dfsg-1) UNRELEASED; urgency=medium
   * Update for upstream changes to pyrcc5 and pylupdate5:
     - Add new files to debian/pyqt5-dev-tools.install.
     - Fix shebangs in /usr/bin/pylupdate5 and /usr/bin/pyrcc5 files.
+  * Use --no-sip-files configure option instead of removing the .sip files
+    after they are installed.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 04 Aug 2016 21:26:03 +0300
 
diff --git a/debian/rules b/debian/rules
index 56a662a..1eda7ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,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)
+			$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin --no-qml-plugin --no-tools) \
+			--no-sip-files
 	sed -i '/strip/d' build-$*/*/Makefile
 	touch $@
 
@@ -70,7 +71,7 @@ dbg-build-%/configure-stamp:
 			-l /usr/include/python$*$(if $(filter 3.%, $*),dm,_d) \
 			-d /usr/lib/python$*/dist-packages \
 			--sip-incdir /usr/include/python$*$(if $(filter 3.%, $*),dm,_d) \
-			--debug --no-designer-plugin --no-qml-plugin --no-tools
+			--debug --no-designer-plugin --no-qml-plugin --no-tools --no-sip-files
 	sed -i '/strip/d' dbg-build-$*/*/Makefile
 	sed -i 's/-isystem/-I/' dbg-build-$*/*/Makefile
 	touch $@
@@ -145,7 +146,6 @@ d3_qt5_dbg = debian/python3-pyqt5-dbg
 install-arch-3.%:
 	$(MAKE) -C build-3.$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C dbg-build-3.$* install INSTALL_ROOT=$(CURDIR)/$(d3_qt5_dbg) DESTDIR=$(CURDIR)/$(d3_qt5_dbg)
-	rm -rf $(CURDIR)/debian/tmp/usr/share/sip
 
 	mkdir -p $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
 	mv $(CURDIR)/debian/tmp$(py3_dbusmoddir)/pyqt5.so \
@@ -192,7 +192,6 @@ d_qt5_dbg = debian/python-pyqt5-dbg
 install-arch-2.%:
 	$(MAKE) -C build-2.$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C dbg-build-2.$* install INSTALL_ROOT=$(CURDIR)/$(d_qt5_dbg) DESTDIR=$(CURDIR)/$(d_qt5_dbg)
-	rm -rf $(CURDIR)/debian/tmp/usr/share/sip
 
 	mkdir -p $(CURDIR)/debian/python-dbus.mainloop.pyqt5/usr/lib/python2.$*/dist-packages/dbus/mainloop; \
 	mv $(CURDIR)/debian/tmp$(py_dbusmoddir)/pyqt5.so \
@@ -289,13 +288,11 @@ endif
 	dh_python2 --no-dbg-cleaning -N pyqt5-dev-tools -N pyqt5-examples
 	rm -rf $(CURDIR)/debian/python-pyqt5/usr/lib/python2.7/dist-packages/PyQt5/uic/port_v3
 	rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/bin
-	rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/share/sip
 	rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/lib/python2.7/dist-packages/PyQt5/uic
 	rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/lib/python2.7/dist-packages/dbus
 	dh_python3 --no-dbg-cleaning -N pyqt5-dev-tools -N pyqt5-examples
 	rm -rf $(CURDIR)/debian/python3-pyqt5/usr/lib/python3/dist-packages/PyQt5/uic/port_v2
 	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/bin
-	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/share/sip
 	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/lib/python3/dist-packages/PyQt5/uic
 	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/lib/python3/dist-packages/dbus
 	rm -rf $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/webkit/googlechat

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