[Python-modules-commits] [pyqt5] 02/02: merge patched 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 69385139105dea3d1bfaac51bd4bc987c618e8d8
Merge: a6f9336 e7a659b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Oct 22 11:35:46 2015 +0300

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 debian/patches/0001-Add-support-for-Qt-5.5.1.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 sip/QtCore/QtCoremod.sip                           |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 5ac0441,0000000..1cdbcff
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 88b06df51cb6358e44fd8b4dd1c86910486170a6
- 88b06df51cb6358e44fd8b4dd1c86910486170a6
++e7a659bd9a8ce0432cbeb862a379fe4437cb5e5d
++e7a659bd9a8ce0432cbeb862a379fe4437cb5e5d
 +88b06df51cb6358e44fd8b4dd1c86910486170a6
 +88b06df51cb6358e44fd8b4dd1c86910486170a6
 +pyqt5_5.5+dfsg.orig.tar.gz
 +d05e92f6e227355835d42974f894cb43e18c859d
 +3055555
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Add-support-for-Qt-5.5.1.patch
index 0000000,0000000..22233f8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-support-for-Qt-5.5.1.patch
@@@ -1,0 -1,0 +1,22 @@@
++From e7a659bd9a8ce0432cbeb862a379fe4437cb5e5d Mon Sep 17 00:00:00 2001
++From: Dmitry Shachnev <mitya57 at gmail.com>
++Date: Thu, 22 Oct 2015 11:35:37 +0300
++Subject: Add support for Qt 5.5.1
++
++---
++ sip/QtCore/QtCoremod.sip | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip
++index 3ec90ba..1dcd379 100644
++--- a/sip/QtCore/QtCoremod.sip
+++++ b/sip/QtCore/QtCoremod.sip
++@@ -22,7 +22,7 @@
++ 
++ %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1)
++ 
++-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0}
+++%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1}
++ 
++ %Platforms {WS_X11 WS_WIN WS_MACX}
++ 
diff --cc debian/patches/series
index 0000000,0000000..47dd8c1
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-support-for-Qt-5.5.1.patch

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