diff -Nru mycli-1.20.1/debian/changelog mycli-1.20.1/debian/changelog --- mycli-1.20.1/debian/changelog 2020-01-22 16:40:08.000000000 +0000 +++ mycli-1.20.1/debian/changelog 2020-02-12 15:16:05.000000000 +0000 @@ -1,3 +1,9 @@ +mycli (1.20.1-4) unstable; urgency=medium + + * Fix for wrong path in vendorized package (Closes: #949753) + + -- Lennart Weller Wed, 12 Feb 2020 16:16:05 +0100 + mycli (1.20.1-3) unstable; urgency=medium * Fix patch that dropped sqlparse dependency (Closes: #949596) diff -Nru mycli-1.20.1/debian/patches/0002-vendorized-cli_helpers.patch mycli-1.20.1/debian/patches/0002-vendorized-cli_helpers.patch --- mycli-1.20.1/debian/patches/0002-vendorized-cli_helpers.patch 2020-01-22 16:40:08.000000000 +0000 +++ mycli-1.20.1/debian/patches/0002-vendorized-cli_helpers.patch 2020-02-12 15:16:05.000000000 +0000 @@ -16,7 +16,8 @@ .../tabular_output/tsv_output_adapter.py | 16 ++ .../tabular_output/vertical_table_adapter.py | 66 +++++ mycli/packages/cli_helpers/utils.py | 70 ++++++ - 13 files changed, 1217 insertions(+), 3 deletions(-) + mycli/packages/tabular_output/sql_format.py | 2 +- + 14 files changed, 1218 insertions(+), 4 deletions(-) create mode 100644 mycli/packages/cli_helpers/__init__.py create mode 100644 mycli/packages/cli_helpers/compat.py create mode 100644 mycli/packages/cli_helpers/config.py @@ -1333,3 +1334,16 @@ + for r in replace: + s = s.replace(*r) + return s +diff --git a/mycli/packages/tabular_output/sql_format.py b/mycli/packages/tabular_output/sql_format.py +index b5e4346..6212bcd 100644 +--- a/mycli/packages/tabular_output/sql_format.py ++++ b/mycli/packages/tabular_output/sql_format.py +@@ -2,7 +2,7 @@ + """Format adapter for sql.""" + + from __future__ import unicode_literals +-from cli_helpers.utils import filter_dict_by_key ++from mycli.packages.cli_helpers.utils import filter_dict_by_key + from mycli.packages.parseutils import extract_tables + + supported_formats = ('sql-insert', 'sql-update', 'sql-update-1',