[Python-modules-commits] [pythonqt] 01/01: Merg Erik's patches

[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 5dd8ad83bc99f847399982ff1e7a9a68879b7fbf
Author: Jonathan Carter <jcarter at linux.com>
Date:   Tue Dec 5 08:33:16 2017 +0200

    Merg Erik's patches
---
 debian/changelog                                 | 12 ++++++++++--
 debian/control                                   |  8 ++++----
 debian/docs                                      |  1 -
 debian/{docs => libpythonqt-qt5-common-dev.docs} |  1 -
 debian/rules                                     |  6 +++---
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 17a21a5..b8a52be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pythonqt (3.2-6~exp1) experimental; urgency=medium
+
+  * Make common dev packages architecture: all
+  * Don't install compiled example code
+  * Move example files to dev package
+
+ -- Erik Lundin <erik at lun.nu>  Fri, 01 Dec 2017 14:19:42 +0100
+
 pythonqt (3.2-5) unstable; urgency=medium
 
   * Upload to unstable
@@ -6,9 +14,9 @@ pythonqt (3.2-5) unstable; urgency=medium
 
 pythonqt (3.2-5~exp1) experimental; urgency=medium
 
-  * Add Erik Lunde's patch to fix builds on ppc64
+  * Add Erik Lundin's patch to fix builds on ppc64
     (Closes: #881685)
-  * Add Erik Lunde's patch to fix files shipped in multiple binaries
+  * Add Erik Lundin'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
diff --git a/debian/control b/debian/control
index a28f565..acbdf43 100644
--- a/debian/control
+++ b/debian/control
@@ -44,8 +44,8 @@ Description: Dynamic Python binding for the Qt framework - runtime
  for Python 2.
 
 Package: libpythonqt-qt5-common-dev
-Architecture: any
-Multi-Arch: same
+Architecture: all
+Multi-Arch: foreign
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -108,8 +108,8 @@ Description: Dynamic Python binding for the Qt framework - runtime
  Qt classes from the embedded Python 2 code.
 
 Package: libpythonqt-qtall-qt5-common-dev
-Architecture: any
-Multi-Arch: same
+Architecture: all
+Multi-Arch: foreign
 Section: libdevel
 Depends: libpythonqt-qt5-common-dev (= ${binary:Version}),
          ${shlibs:Depends},
diff --git a/debian/docs b/debian/docs
index a89eb2b..e845566 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
 README
-examples
diff --git a/debian/docs b/debian/libpythonqt-qt5-common-dev.docs
similarity index 56%
copy from debian/docs
copy to debian/libpythonqt-qt5-common-dev.docs
index a89eb2b..1e107f5 100644
--- a/debian/docs
+++ b/debian/libpythonqt-qt5-common-dev.docs
@@ -1,2 +1 @@
-README
 examples
diff --git a/debian/rules b/debian/rules
index 8c0560a..7a00921 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ PY3VERS := $(shell py3versions -vd)
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure
+	dh_auto_configure --builddirectory=build-generator -- ../generator/generator.pro
 	for i in $(PY2VERS) $(PY3VERS); do \
 		export PYTHON_VERSION=$${i}; \
 		dh_auto_configure --builddirectory=build-py$${i} -- LIBS+=-L$$PWD/build-py$${i}/lib ../PythonQt.pro; \
@@ -23,7 +23,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	# Build the generator
-	dh_auto_build -- sub-generator
+	dh_auto_build --builddirectory=build-generator
 
 	# Run the generator to create wrapper code for Qt classes. The generator
 	# will look for folders under QTDIR/include. To easily create this, symlink
@@ -31,7 +31,7 @@ override_dh_auto_build:
 	cd generator; \
 	mkdir -p qtdir; \
 	ln -s `pkg-config --variable=includedir Qt5Core` qtdir/include; \
-	QTDIR=qtdir ./pythonqt_generator qtscript_masterinclude.h build_all.txt
+	QTDIR=qtdir ../build-generator/pythonqt_generator qtscript_masterinclude.h build_all.txt
 
 	for i in $(PY2VERS) $(PY3VERS); do \
 		export PYTHON_VERSION=$${i}; \

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