Version in base suite: 1.4.0-7 Base version: orocos-kdl_1.4.0-7 Target version: orocos-kdl_1.4.0-7+deb10u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/o/orocos-kdl/orocos-kdl_1.4.0-7.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/o/orocos-kdl/orocos-kdl_1.4.0-7+deb10u1.dsc changelog | 6 + patches/0005-Fixed-python3-std-string-conversion-issue.patch | 35 +++++++++++ patches/series | 1 3 files changed, 42 insertions(+) diff -Nru orocos-kdl-1.4.0/debian/changelog orocos-kdl-1.4.0/debian/changelog --- orocos-kdl-1.4.0/debian/changelog 2018-11-19 21:31:27.000000000 +0000 +++ orocos-kdl-1.4.0/debian/changelog 2020-04-09 16:46:55.000000000 +0000 @@ -1,3 +1,9 @@ +orocos-kdl (1.4.0-7+deb10u1) buster; urgency=medium + + * Add patch for python3 std string conversion (Closes: #956254) + + -- Jochen Sprickerhof Thu, 09 Apr 2020 18:46:55 +0200 + orocos-kdl (1.4.0-7) unstable; urgency=medium * Add missing dependency (Closes: #913803) diff -Nru orocos-kdl-1.4.0/debian/patches/0005-Fixed-python3-std-string-conversion-issue.patch orocos-kdl-1.4.0/debian/patches/0005-Fixed-python3-std-string-conversion-issue.patch --- orocos-kdl-1.4.0/debian/patches/0005-Fixed-python3-std-string-conversion-issue.patch 1970-01-01 00:00:00.000000000 +0000 +++ orocos-kdl-1.4.0/debian/patches/0005-Fixed-python3-std-string-conversion-issue.patch 2020-04-09 16:45:05.000000000 +0000 @@ -0,0 +1,35 @@ +From: Zihan Chen +Date: Mon, 14 May 2018 11:54:04 -0700 +Subject: Fixed python3 std string conversion issue + +--- + python_orocos_kdl/PyKDL/std_string.sip | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/python_orocos_kdl/PyKDL/std_string.sip b/python_orocos_kdl/PyKDL/std_string.sip +index e31324a..a399c9b 100644 +--- a/python_orocos_kdl/PyKDL/std_string.sip ++++ b/python_orocos_kdl/PyKDL/std_string.sip +@@ -47,17 +47,16 @@ + *sipCppPtr = new std::string; + return 1; + } +- if (PyUnicode_Check(sipPy)) { +- PyObject* s = PyUnicode_AsEncodedString(sipPy, "UTF-8", ""); +- *sipCppPtr = new std::string(PyUnicode_AS_DATA(s)); +- Py_DECREF(s); +- return 1; +- } + #if PY_MAJOR_VERSION < 3 + if (PyString_Check(sipPy)) { + *sipCppPtr = new std::string(PyString_AS_STRING(sipPy)); + return 1; + } ++#else ++ if (PyUnicode_Check(sipPy)) { ++ *sipCppPtr = new std::string(PyUnicode_AsUTF8(sipPy)); ++ return 1; ++ } + #endif + + return 0; diff -Nru orocos-kdl-1.4.0/debian/patches/series orocos-kdl-1.4.0/debian/patches/series --- orocos-kdl-1.4.0/debian/patches/series 2018-09-14 06:16:00.000000000 +0000 +++ orocos-kdl-1.4.0/debian/patches/series 2020-04-09 16:46:55.000000000 +0000 @@ -1,3 +1,4 @@ 0001-Added-CMakeLists-to-build-the-package.patch 0002-Support-in-tree-compilation.patch 0003-Don-t-install-OrocosKDLTargets.patch +0005-Fixed-python3-std-string-conversion-issue.patch