diff -Nru bash-completion-2.11/debian/changelog bash-completion-2.11/debian/changelog --- bash-completion-2.11/debian/changelog 2021-11-15 21:58:12.000000000 +0000 +++ bash-completion-2.11/debian/changelog 2022-07-09 20:06:16.000000000 +0000 @@ -1,3 +1,24 @@ +bash-completion (1:2.11-6ubuntu1~22.04.sav0) jammy; urgency=low + + * Backport to Jammy + + -- Rob Savoury Sat, 09 Jul 2022 13:06:16 -0700 + +bash-completion (1:2.11-6ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Add 15-add_backslash_for_tilde.patch: Adding backslash makes sure that + tilde is not special character for bash, but character for purpose. + + -- Steve Langasek Sun, 01 May 2022 14:10:21 -0700 + +bash-completion (1:2.11-6) unstable; urgency=medium + + * Fix completion of find -exec commands (Closes: #1002010). + * Recognize freecad files as zip files (Closes: #1004128). + + -- Gabriel F. T. Gomes Sun, 03 Apr 2022 09:14:34 -0300 + bash-completion (1:2.11-5ubuntu1) jammy; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru bash-completion-2.11/debian/patches/15-find-exec.patch bash-completion-2.11/debian/patches/15-find-exec.patch --- bash-completion-2.11/debian/patches/15-find-exec.patch 1970-01-01 00:00:00.000000000 +0000 +++ bash-completion-2.11/debian/patches/15-find-exec.patch 2022-04-03 11:51:48.000000000 +0000 @@ -0,0 +1,20 @@ +commit f1ddf810e4ee6693acb9fab1be1794586aa111a0 +Author: Ville Skyttä +Date: Sat Mar 20 10:41:04 2021 +0200 + + fix(find): don't look for -exec etc command if completing before it + + Closes https://github.com/scop/bash-completion/issues/509 + +diff --git a/completions/find b/completions/find +index 64121eda..f18c7d7e 100644 +--- a/completions/find ++++ b/completions/find +@@ -10,6 +10,7 @@ _find() + local i + for i in ${!words[*]}; do + if [[ ${words[i]} == -@(exec|ok)?(dir) ]]; then ++ ((cword > i)) || break + _command_offset $((i + 1)) + return + fi diff -Nru bash-completion-2.11/debian/patches/16-freecad-extension.patch bash-completion-2.11/debian/patches/16-freecad-extension.patch --- bash-completion-2.11/debian/patches/16-freecad-extension.patch 1970-01-01 00:00:00.000000000 +0000 +++ bash-completion-2.11/debian/patches/16-freecad-extension.patch 2022-04-03 12:11:35.000000000 +0000 @@ -0,0 +1,21 @@ +commit fcaf3d4118af251973a57028302bf057a9681f1f +Author: steelman +Date: Thu Apr 22 21:39:19 2021 +0200 + + feat(unzip,zipinfo): recognize FreeCAD files (#520) + + https://wiki.freecadweb.org/File_Format_FCStd + +diff --git a/bash_completion b/bash_completion +index 51305148..fca32c57 100644 +--- a/bash_completion ++++ b/bash_completion +@@ -2132,7 +2132,7 @@ + } + # bzcmp, bzdiff, bz*grep, bzless, bzmore intentionally not here, see Debian: #455510 + _install_xspec '!*.?(t)bz?(2)' bunzip2 bzcat pbunzip2 pbzcat lbunzip2 lbzcat +-_install_xspec '!*.@(zip|[aegjswx]ar|exe|pk3|wsz|zargo|xpi|s[tx][cdiw]|sx[gm]|o[dt][tspgfc]|od[bm]|oxt|epub|apk|aab|ipa|do[ct][xm]|p[op]t[mx]|xl[st][xm]|pyz|whl)' unzip zipinfo ++_install_xspec '!*.@(zip|[aegjswx]ar|exe|pk3|wsz|zargo|xpi|s[tx][cdiw]|sx[gm]|o[dt][tspgfc]|od[bm]|oxt|epub|apk|aab|ipa|do[ct][xm]|p[op]t[mx]|xl[st][xm]|pyz|whl|[Ff][Cc][Ss]td)' unzip zipinfo + _install_xspec '*.Z' compress znew + # zcmp, zdiff, z*grep, zless, zmore intentionally not here, see Debian: #455510 + _install_xspec '!*.@(Z|[gGd]z|t[ag]z)' gunzip zcat diff -Nru bash-completion-2.11/debian/patches/series bash-completion-2.11/debian/patches/series --- bash-completion-2.11/debian/patches/series 2021-11-11 15:41:52.000000000 +0000 +++ bash-completion-2.11/debian/patches/series 2022-04-03 15:44:35.000000000 +0000 @@ -7,3 +7,5 @@ 12-properly-handle-TERM-and-other-envvars.patch 13-backport-support-for-python-9.patch 14-backport-support-for-long-options-in-perltidy.patch +15-find-exec.patch +16-freecad-extension.patch