[Python-modules-commits] [pythonqt] 01/01: Merge bug fixes from Erik Lunde

[Jonathan Cristopher Carter]

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

jcc pushed a commit to branch master
in repository pythonqt.

commit 157d23d293d32a9ebc469836be9752893847eac3
Author: Jonathan Carter <jcarter at linux.com>
Date:   Mon Nov 20 04:28:56 2017 -0500

    Merge bug fixes from Erik Lunde
---
 debian/changelog                                | 9 +++++++++
 debian/libpythonqt-qt5-common-dev.install       | 4 ++--
 debian/libpythonqt-qtall-qt5-common-dev.install | 2 +-
 debian/rules                                    | 3 ++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1df5a3..7e9716d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pythonqt (3.2-4~exp5) experimental; urgency=medium
+
+  * Add Erik Lunde's patch to fix builds on ppc64
+    (Closes: #881685)
+  * Add Erik Lunde's patch to fix files shipped in multiple binaries
+    (Closes: #881710)
+
+ -- Jonathan Carter <jcc at debian.org>  Mon, 20 Nov 2017 10:21:26 +0200
+
 pythonqt (3.2-4~exp4) experimental; urgency=medium
 
   * Fix generator Qt include dir for multiarch
diff --git a/debian/libpythonqt-qt5-common-dev.install b/debian/libpythonqt-qt5-common-dev.install
index 61cb3a2..5f101c7 100644
--- a/debian/libpythonqt-qt5-common-dev.install
+++ b/debian/libpythonqt-qt5-common-dev.install
@@ -1,2 +1,2 @@
-src/*.h usr/include/PythonQt5/
-src/gui/*.h usr/include/PythonQt5/gui/
+src/PythonQt*.h usr/include/PythonQt5/
+src/gui/PythonQt*.h usr/include/PythonQt5/gui/
diff --git a/debian/libpythonqt-qtall-qt5-common-dev.install b/debian/libpythonqt-qtall-qt5-common-dev.install
index 67958bd..5955aed 100644
--- a/debian/libpythonqt-qtall-qt5-common-dev.install
+++ b/debian/libpythonqt-qtall-qt5-common-dev.install
@@ -1 +1 @@
-extensions/PythonQt_QtAll/*.h usr/include/PythonQt5/
+extensions/PythonQt_QtAll/PythonQt*.h usr/include/PythonQt5/
diff --git a/debian/rules b/debian/rules
index 2b48290..8c0560a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,8 @@ override_dh_auto_build:
 
 	for i in $(PY2VERS) $(PY3VERS); do \
 		export PYTHON_VERSION=$${i}; \
-		dh_auto_build --builddirectory=build-py$${i} -- sub-src sub-extensions; \
+		dh_auto_build --builddirectory=build-py$${i} -- sub-src; \
+		dh_auto_build --builddirectory=build-py$${i} -- sub-extensions; \
 	done
 
 override_dh_auto_clean:

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