diff -Nru pyqt5-5.12.3+dfsg/debian/changelog pyqt5-5.12.3+dfsg/debian/changelog --- pyqt5-5.12.3+dfsg/debian/changelog 2019-07-03 18:22:54.000000000 +0000 +++ pyqt5-5.12.3+dfsg/debian/changelog 2019-09-06 11:40:10.000000000 +0000 @@ -1,3 +1,17 @@ +pyqt5 (5.12.3+dfsg-2) unstable; urgency=medium + + [ Ondřej Nový ] + * Use debhelper-compat instead of debian/compat. + * Bump Standards-Version to 4.4.0. + + [ Dmitry Shachnev ] + * Update python2_qstring.diff with the latest changes from upstream. + * Update Policy URL in the description of public_sip.diff. + * Add Qt 5.12.5 to the timeline (qt_5_12_5.diff). + * Upload to unstable. + + -- Dmitry Shachnev Fri, 06 Sep 2019 14:40:10 +0300 + pyqt5 (5.12.3+dfsg-1) experimental; urgency=medium * New upstream release. diff -Nru pyqt5-5.12.3+dfsg/debian/compat pyqt5-5.12.3+dfsg/debian/compat --- pyqt5-5.12.3+dfsg/debian/compat 2019-07-03 18:22:54.000000000 +0000 +++ pyqt5-5.12.3+dfsg/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru pyqt5-5.12.3+dfsg/debian/control pyqt5-5.12.3+dfsg/debian/control --- pyqt5-5.12.3+dfsg/debian/control 2019-07-03 18:22:54.000000000 +0000 +++ pyqt5-5.12.3+dfsg/debian/control 2019-09-06 11:40:10.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Python Modules Team Uploaders: Dmitry Shachnev -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper-compat (= 11), dh-python, dpkg-dev (>= 1.16.1~), libdbus-1-dev (>= 1.0.2), @@ -43,7 +43,7 @@ qtpositioning5-dev (>= 5.9.1), qttools5-dev (>= 5.9.1) Build-Depends-Indep: fdupes -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Homepage: https://riverbankcomputing.com/software/pyqt/intro Vcs-Git: https://salsa.debian.org/python-team/modules/pyqt5.git Vcs-Browser: https://salsa.debian.org/python-team/modules/pyqt5 diff -Nru pyqt5-5.12.3+dfsg/debian/patches/public_sip.diff pyqt5-5.12.3+dfsg/debian/patches/public_sip.diff --- pyqt5-5.12.3+dfsg/debian/patches/public_sip.diff 2019-07-03 18:22:54.000000000 +0000 +++ pyqt5-5.12.3+dfsg/debian/patches/public_sip.diff 2019-09-06 11:40:10.000000000 +0000 @@ -2,7 +2,7 @@ Date: Tue, 3 Jul 2018 09:46:42 +0300 Subject: Use the public version of sip module -Per https://www.debian.org/doc/debian-policy/#convenience-copies-of-code. +Per https://www.debian.org/doc/debian-policy/ch-source.html#convenience-copies-of-code. --- configure.py | 2 +- designer/pluginloader.cpp | 2 +- diff -Nru pyqt5-5.12.3+dfsg/debian/patches/python2_qstring.diff pyqt5-5.12.3+dfsg/debian/patches/python2_qstring.diff --- pyqt5-5.12.3+dfsg/debian/patches/python2_qstring.diff 2019-07-03 18:22:54.000000000 +0000 +++ pyqt5-5.12.3+dfsg/debian/patches/python2_qstring.diff 2019-09-06 11:40:10.000000000 +0000 @@ -1,29 +1,36 @@ From: Dmitry Shachnev -Date: Wed, 3 Jul 2019 21:52:10 +0300 +Date: Mon, 2 Sep 2019 15:51:37 +0300 Subject: Fixes for building against Python v2 -Origin: upstream, changeset e5dd514fdba6 +Origin: upstream, changesets e5dd514fdba6 and 81b34c9373b6. --- - qpy/QtCore/qpycore_qstring.cpp | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) + qpy/QtCore/qpycore_qstring.cpp | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/qpy/QtCore/qpycore_qstring.cpp b/qpy/QtCore/qpycore_qstring.cpp -index 2d04e3a..3897c3b 100644 +index 2d04e3a..4a188ce 100644 --- a/qpy/QtCore/qpycore_qstring.cpp +++ b/qpy/QtCore/qpycore_qstring.cpp -@@ -161,7 +161,14 @@ PyObject *qpycore_PyObject_FromQString(const QString &qstr) - // Convert a Python Unicode object to a QString. +@@ -158,9 +158,21 @@ PyObject *qpycore_PyObject_FromQString(const QString &qstr) + } + + +-// Convert a Python Unicode object to a QString. ++// Convert a Python string object to a QString. QString qpycore_PyObject_AsQString(PyObject *obj) { --#if defined(PYQT_PEP_393) -+#if PY_MAJOR_VERSION <= 2 -+ const char *obj_s = PyString_AsString(obj); ++#if PY_MAJOR_VERSION < 3 ++ if (PyString_Check(obj)) ++ { ++ const char *obj_s = PyString_AsString(obj); + -+ if (!obj_s) -+ return QString(); ++ if (!obj_s) ++ return QString(); + -+ return QString::fromUtf8(obj_s); -+#elif defined(PYQT_PEP_393) ++ return QString::fromUtf8(obj_s); ++ } ++#endif ++ + #if defined(PYQT_PEP_393) int char_size; Py_ssize_t len; - void *data = sipUnicodeData(obj, &char_size, &len); diff -Nru pyqt5-5.12.3+dfsg/debian/patches/qt_5_12_5.diff pyqt5-5.12.3+dfsg/debian/patches/qt_5_12_5.diff --- pyqt5-5.12.3+dfsg/debian/patches/qt_5_12_5.diff 1970-01-01 00:00:00.000000000 +0000 +++ pyqt5-5.12.3+dfsg/debian/patches/qt_5_12_5.diff 2019-09-06 11:40:10.000000000 +0000 @@ -0,0 +1,21 @@ +From: Dmitry Shachnev +Date: Fri, 6 Sep 2019 14:38:09 +0300 +Subject: Add Qt 5.12.5 to the timeline + +--- + 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 4641157..d6e5625 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", use_limited_api=True) + +-%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 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4} ++%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 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_12_5} + + %Platforms {WS_X11 WS_WIN WS_MACX} + diff -Nru pyqt5-5.12.3+dfsg/debian/patches/series pyqt5-5.12.3+dfsg/debian/patches/series --- pyqt5-5.12.3+dfsg/debian/patches/series 2019-07-03 18:22:54.000000000 +0000 +++ pyqt5-5.12.3+dfsg/debian/patches/series 2019-09-06 11:40:10.000000000 +0000 @@ -1,2 +1,3 @@ public_sip.diff python2_qstring.diff +qt_5_12_5.diff