[Python-modules-commits] [pyqt5] 03/04: Merge branch 'stretch' into master

[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 cccac213f34646f3d2d173b3a0c8d8ace7b944d9
Merge: 6fcef5f cbc5fda
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Feb 15 23:23:20 2017 +0300

    Merge branch 'stretch' into master

 debian/changelog                          |  17 +++++
 debian/control                            | 120 +++++++++++++++++++++++++++++-
 debian/python-pyqt5.qtwebchannel.install  |   1 +
 debian/python-pyqt5.qtwebengine.install   |   1 +
 debian/python3-pyqt5.qtwebchannel.install |   2 +
 debian/python3-pyqt5.qtwebengine.install  |   2 +
 debian/rules                              |  45 ++++++-----
 debian/tests/import                       |   1 +
 8 files changed, 170 insertions(+), 19 deletions(-)

diff --cc debian/changelog
index cbc129a,ac6560d..2bf51d7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,19 +1,28 @@@
 +pyqt5 (5.8+dfsg-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Drop bytes_conversion.diff, applied in the new release.
++  * Drop no_qml_debug.diff, applied in the new release.
 +  * Bump sip build-dependencies to 4.19, following configure.py.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 31 Dec 2016 00:09:57 +0300
 +
+ pyqt5 (5.7+dfsg-5) unstable; urgency=medium
+ 
+   * Make WebEngine packages depend on WebChannel, to avoid import errors.
+   * Disable implicit qml_debug option for debug builds (no_qml_debug.diff).
+     Patch taken from openSUSE, thanks Hans-Peter Jansen!
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 21 Jan 2017 11:26:05 +0300
+ 
+ pyqt5 (5.7+dfsg-4) unstable; urgency=medium
+ 
+   * Add Qt WebEngine support for amd64 and i386 (closes: #841830).
+   * Add Qt WebChannel support.
+   * Upload to unstable.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 09 Jan 2017 12:47:01 +0300
+ 
  pyqt5 (5.7+dfsg-3) experimental; urgency=medium
  
    * Build against Qt 5.7 for experimental.

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