[Python-modules-commits] [pyqt5] 01/01: Revert the changes to pyqt5-dev-tools package.

[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 52b594403049500a9a7637761689c8727080c954
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Aug 9 20:44:07 2016 +0300

    Revert the changes to pyqt5-dev-tools package.
    
    The previous approach did not work well because it required doing the
    arch-dependent code build/install during arch-indep builds (which is wrong).
---
 debian/changelog               | 5 ++---
 debian/control                 | 4 ++--
 debian/pyqt5-dev-tools.install | 4 ++++
 debian/python3-pyqt5.install   | 4 ----
 debian/rules                   | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d198b7a..544a835 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,8 @@ pyqt5 (5.7+dfsg-1) UNRELEASED; urgency=medium
   * Update debian/copyright.
   * Stop installing Qt.pyi, it is no longer generated.
   * Update for upstream changes to pyrcc5 and pylupdate5:
-    - The actual code is now in python3-pyqt5 package.
-    - pyqt5-dev-tools is now an Architecure: all package containing
-      only executable wrappers.
+    - Add new files to debian/pyqt5-dev-tools.install.
+    - Fix shebangs in /usr/bin/pylupdate5 and /usr/bin/pyrcc5 files.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 04 Aug 2016 21:26:03 +0300
 
diff --git a/debian/control b/debian/control
index dcad6ec..613f671 100644
--- a/debian/control
+++ b/debian/control
@@ -59,10 +59,10 @@ Description: Development files for PyQt5
 
 Package: pyqt5-dev-tools
 Depends: python3,
-         python3-pyqt5 (>= ${source:Version}),
+         python3-pyqt5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Architecture: all
+Architecture: any
 Description: Development tools for PyQt5
  This package contains various support tools for PyQt5 developers:
   * a user interface compiler (pyuic5)
diff --git a/debian/pyqt5-dev-tools.install b/debian/pyqt5-dev-tools.install
index 1df36c6..9bec48b 100644
--- a/debian/pyqt5-dev-tools.install
+++ b/debian/pyqt5-dev-tools.install
@@ -1 +1,5 @@
 usr/bin/*
+usr/lib/python3*/dist-packages/PyQt5/pylupdate.so
+usr/lib/python3*/dist-packages/PyQt5/pylupdate_main.py
+usr/lib/python3*/dist-packages/PyQt5/pyrcc.so
+usr/lib/python3*/dist-packages/PyQt5/pyrcc_main.py
diff --git a/debian/python3-pyqt5.install b/debian/python3-pyqt5.install
index e348e7f..ca62cda 100644
--- a/debian/python3-pyqt5.install
+++ b/debian/python3-pyqt5.install
@@ -21,8 +21,4 @@ usr/lib/python3*/dist-packages/PyQt5/QtWidgets.so
 usr/lib/python3*/dist-packages/PyQt5/QtXml.pyi
 usr/lib/python3*/dist-packages/PyQt5/QtXml.so
 usr/lib/python3*/dist-packages/PyQt5/__init__.py
-usr/lib/python3*/dist-packages/PyQt5/pylupdate.so
-usr/lib/python3*/dist-packages/PyQt5/pylupdate_main.py
-usr/lib/python3*/dist-packages/PyQt5/pyrcc.so
-usr/lib/python3*/dist-packages/PyQt5/pyrcc_main.py
 usr/lib/python3*/dist-packages/PyQt5/uic/*
diff --git a/debian/rules b/debian/rules
index 7073e84..56a662a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,7 +96,6 @@ install-indep: build-indep
 	dh_prep -i
 	dh_installdirs -i
 	dh_install -i --fail-missing
-	sed -i 's,/usr/bin/python3[.0-9]*,/usr/bin/python3,' debian/pyqt5-dev-tools/usr/bin/*
 	dh_installexamples -Xactiveqt -i
 	# Use python3 shebangs and regenerate resource files
 	cd $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/; \
@@ -131,6 +130,7 @@ install-arch: build-arch
 	done
 
 	dh_install -a --fail-missing
+	sed -i 's,/usr/bin/python3[.0-9]*,/usr/bin/python3,' debian/pyqt5-dev-tools/usr/bin/*
 
 	find debian/python*-dbg ! -type d \
 		! \( -name '*.so' -o -name '*config_*d*.py' \) | xargs rm -f

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