Merging debian version 1:2.12.0-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 40 insertions, 453 deletions

diff --git a/debian/patches/04-xine_add_more_formats.patch b/debian/patches/04-xine_add_more_formats.patch
index ccd408c..f174f41 100644
--- a/debian/patches/04-xine_add_more_formats.patch
+++ b/debian/patches/04-xine_add_more_formats.patch
@@ -4,27 +4,24 @@ Origin: vendor
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/311525
 Bug-Debian: https://bugs.debian.org/496162
 
----
- bash_completion     |    8 ++++----
- completions/mplayer |    2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
---- bash-completion.orig/bash_completion
-+++ bash-completion/bash_completion
-@@ -1967,13 +1967,13 @@ _install_xspec '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
- _install_xspec '!*.texi*' makeinfo texi2html
- _install_xspec '!*.@(?(la)tex|texi|dtx|ins|ltx|dbj)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi xetex xelatex luatex lualatex
- _install_xspec '!*.mp3' mpg123 mpg321 madplay
--_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmv]|OG[AGMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' xine aaxine fbxine
--_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmv]|OG[AGMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' kaffeine dragon totem
-+_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmvx]|OG[AGMVX]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' xine aaxine fbxine
-+_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmvx]|OG[AGMVX]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' kaffeine dragon totem
- _install_xspec '!*.@(avi|asf|wmv)' aviplay
- _install_xspec '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
- _install_xspec '!*.@(mpg|mpeg|avi|mov|qt)' xanim
- _install_xspec '!*.@(og[ag]|m3u|flac|spx)' ogg123
--_install_xspec '!*.@(mp3|ogg|pls|m3u)' gqmpeg freeamp
-+_install_xspec '!*.@(mp3|og[ag]|pls|m3u)' gqmpeg freeamp
- _install_xspec '!*.fig' xfig
- _install_xspec '!*.@(mid?(i)|cmf)' playmidi
- _install_xspec '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)' timidity
+diff --git a/bash_completion b/bash_completion
+index 59c273ca..f6830e7a 100644
+--- a/bash_completion
++++ b/bash_completion
+@@ -3079,13 +3079,13 @@ _comp__init_install_xspec '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 p
+ _comp__init_install_xspec '!*.texi*' makeinfo texi2html
+ _comp__init_install_xspec '!*.@(?(la)tex|texi|dtx|ins|ltx|dbj)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi xetex xelatex luatex lualatex
+ _comp__init_install_xspec '!*.mp3' mpg123 mpg321 madplay
+-_comp__init_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmv]|OG[AGMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' xine aaxine cacaxine fbxine
+-_comp__init_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmv]|OG[AGMV]|opus|OPUS|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' kaffeine dragon totem
++_comp__init_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmvx]|OG[AGMVX]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' xine aaxine cacaxine fbxine
++_comp__init_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmvx]|OG[AGMVX]|opus|OPUS|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' kaffeine dragon totem
+ _comp__init_install_xspec '!*.@(avi|asf|wmv)' aviplay
+ _comp__init_install_xspec '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
+ _comp__init_install_xspec '!*.@(mpg|mpeg|avi|mov|qt)' xanim
+ _comp__init_install_xspec '!*.@(og[ag]|m3u|flac|spx)' ogg123
+-_comp__init_install_xspec '!*.@(mp3|ogg|pls|m3u)' gqmpeg freeamp
++_comp__init_install_xspec '!*.@(mp3|og[ag]|pls|m3u)' gqmpeg freeamp
+ _comp__init_install_xspec '!*.fig' xfig
+ _comp__init_install_xspec '!*.@(mid?(i)|cmf)' playmidi
+ _comp__init_install_xspec '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)' timidity
diff --git a/debian/patches/06-xpdf_support_compressed_pdf.patch b/debian/patches/06-xpdf_support_compressed_pdf.patch
index de050f4..99d285e 100644
--- a/debian/patches/06-xpdf_support_compressed_pdf.patch
+++ b/debian/patches/06-xpdf_support_compressed_pdf.patch
@@ -3,19 +3,15 @@ Subject: xpdf in Debian also supports compressed PDFs
 Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702498
 Bug-Debian: https://bugs.debian.org/702498
 
----
- bash_completion |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- bash-completion.orig/bash_completion
-+++ bash-completion/bash_completion
-@@ -1958,7 +1958,8 @@ _install_xspec '!*.@(gif|jp?(e)g?(2)|j2[ck]|jp[2f]|tif?(f)|png|p[bgp]m|bmp|x[bp]
- _install_xspec '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2|.Z))' gv ggv kghostview
- _install_xspec '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' xdvi kdvi
- _install_xspec '!*.dvi' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
--_install_xspec '!*.[pf]df' acroread gpdf xpdf
-+_install_xspec '!*.[pf]df' acroread gpdf
-+_install_xspec '!*.@(pdf|fdf)?(.@(gz|GZ|bz2|BZ2|Z))' xpdf
- _install_xspec '!*.@(?(e)ps|pdf)' kpdf
- _install_xspec '!*.@(okular|@(?(e|x)ps|?(E|X)PS|[pf]df|[PF]DF|dvi|DVI|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|epub|EPUB|odt|ODT|fb?(2)|FB?(2)|mobi|MOBI|g3|G3|chm|CHM)?(.?(gz|GZ|bz2|BZ2|xz|XZ)))' okular
- _install_xspec '!*.pdf' epdfview pdfunite
+diff --git a/bash_completion b/bash_completion
+index f6830e7a..82a349fd 100644
+--- a/bash_completion
++++ b/bash_completion
+@@ -3071,6 +3071,7 @@ _comp__init_install_xspec '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2|.Z))
+ _comp__init_install_xspec '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' xdvi kdvi
+ _comp__init_install_xspec '!*.dvi' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
+ _comp__init_install_xspec '!*.[pf]df' acroread gpdf xpdf
++_comp__init_install_xspec '!*.@(pdf|fdf)?(.@(gz|GZ|bz2|BZ2|Z))' xpdf
+ _comp__init_install_xspec '!*.@(?(e)ps|pdf)' kpdf
+ _comp__init_install_xspec '!*.@(okular|@(?(e|x)ps|?(E|X)PS|[pf]df|[PF]DF|dvi|DVI|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|epub|EPUB|odt|ODT|fb?(2)|FB?(2)|mobi|MOBI|g3|G3|chm|CHM|md|markdown)?(.?(gz|GZ|bz2|BZ2|xz|XZ)))' okular
+ _comp__init_install_xspec '!*.pdf' epdfview pdfunite
diff --git a/debian/patches/07-dpkg_support_raw-extract_vextract.patch b/debian/patches/07-dpkg_support_raw-extract_vextract.patch
deleted file mode 100644
index 9c619bb..0000000
--- a/debian/patches/07-dpkg_support_raw-extract_vextract.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Uwe Storbeck <uwe@ibr.ch>
-Subject: support more options for dpkg-deb
-Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698977
-Bug-Debian: https://bugs.debian.org/698977
-Forwarded: no
-
----
- completions/dpkg |   44 +++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 41 insertions(+), 3 deletions(-)
-
---- bash-completion.orig/completions/dpkg
-+++ bash-completion/completions/dpkg
-@@ -81,7 +81,45 @@ _dpkg()
-     COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
-     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
- } &&
--    complete -F _dpkg dpkg dpkg-deb dpkg-query
-+    complete -F _dpkg dpkg dpkg-query
-+
-+# Debian dpkg-deb(1) completion
-+#
-+_dpkg_deb()
-+{
-+    local cur prev words cword split
-+    _init_completion -s || return
-+
-+    _expand || return 0
-+
-+    local i=$cword
-+
-+    # find the last option flag
-+    if [[ $cur != -* ]]; then
-+        while [[ $prev != -* && $i -ne 1 ]]; do
-+            i=$((i-1))
-+            prev=${words[i-1]}
-+        done
-+    fi
-+
-+    case $prev in
-+        -c|-I|-W|-f|-e|-x|-X|-R|--contents|--info|--show|--field|--control| \
-+        --extract|--vextract|--raw-extract|--fsys-tarfile)
-+            _filedir '?(u|d)deb'
-+            return 0
-+            ;;
-+        -b|--build)
-+            _filedir -d
-+            return 0
-+            ;;
-+    esac
-+
-+    $split && return
-+
-+    COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
-+    [[ $COMPREPLY == *= ]] && compopt -o nospace
-+} &&
-+complete -F _dpkg_deb dpkg-deb
- 
- # Debian GNU dpkg-reconfigure(8) completion
- #
diff --git a/debian/patches/12-properly-handle-TERM-and-other-envvars.patch b/debian/patches/12-properly-handle-TERM-and-other-envvars.patch
deleted file mode 100644
index 5194b81..0000000
--- a/debian/patches/12-properly-handle-TERM-and-other-envvars.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 79a504a44cefa119f1ef8c0db28e7fa674aeaf32 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Mon, 7 Dec 2020 01:12:10 +0200
-Subject: [PATCH] _variables: split out _variable_assignments, use in export
-
-Closes https://github.com/scop/bash-completion/issues/457
----
- bash_completion     | 77 +++++++++++++++++++++++++++++----------------
- completions/export  |  5 +--
- test/t/test_grep.py | 10 ++++++
- 3 files changed, 61 insertions(+), 31 deletions(-)
-
-diff --git a/bash_completion b/bash_completion
-index 2114ea05086..1a097417d72 100644
---- a/bash_completion
-+++ b/bash_completion
-@@ -679,37 +679,60 @@ _variables()
-         COMPREPLY+=("$cur}")
-         __ltrim_colon_completions "$cur"
-         return 0
--    else
--        case ${prev-} in
--            TZ)
--                cur=/usr/share/zoneinfo/$cur
--                _filedir
--                for i in "${!COMPREPLY[@]}"; do
--                    if [[ ${COMPREPLY[i]} == *.tab ]]; then
--                        unset 'COMPREPLY[i]'
--                        continue
--                    elif [[ -d ${COMPREPLY[i]} ]]; then
--                        COMPREPLY[i]+=/
--                        compopt -o nospace
--                    fi
--                    COMPREPLY[i]=${COMPREPLY[i]#/usr/share/zoneinfo/}
--                done
--                return 0
--                ;;
--            TERM)
--                _terms
--                return 0
--                ;;
--            LANG | LC_*)
--                COMPREPLY=($(compgen -W '$(locale -a 2>/dev/null)' \
--                    -- "$cur"))
--                return 0
--                ;;
--        esac
-     fi
-     return 1
- }
- 
-+# Complete assignment of various known environment variables.
-+# The word to be completed is expected to contain the entire
-+# assignment, including the variable name and the "=". See related
-+# parameters to _init_completion.
-+#
-+# @param  $1 variable assignment to be completed
-+# @return True (0) if variable value completion was attempted,
-+#         False (> 0) if not.
-+_variable_assignments()
-+{
-+    local cur=${1-}
-+
-+    if [[ $cur =~ ^([A-Za-z_][A-Za-z0-9_]*)=(.*)$ ]]; then
-+        prev=${BASH_REMATCH[1]}
-+        cur=${BASH_REMATCH[2]}
-+    else
-+        return 1
-+    fi
-+
-+    case $prev in
-+        TZ)
-+            cur=/usr/share/zoneinfo/$cur
-+            _filedir
-+            for i in "${!COMPREPLY[@]}"; do
-+                if [[ ${COMPREPLY[i]} == *.tab ]]; then
-+                    unset 'COMPREPLY[i]'
-+                    continue
-+                elif [[ -d ${COMPREPLY[i]} ]]; then
-+                    COMPREPLY[i]+=/
-+                    compopt -o nospace
-+                fi
-+                COMPREPLY[i]=${COMPREPLY[i]#/usr/share/zoneinfo/}
-+            done
-+            ;;
-+        TERM)
-+            _terms
-+            ;;
-+        LANG | LC_*)
-+            COMPREPLY=($(compgen -W '$(locale -a 2>/dev/null)' \
-+                -- "$cur"))
-+            ;;
-+        *)
-+            _variables && return 0
-+            _filedir
-+            ;;
-+    esac
-+
-+    return 0
-+}
-+
- # Initialize completion and deal with various general things: do file
- # and variable completion where appropriate, and adjust prev, words,
- # and cword as if no redirections exist so that completions do not
-diff --git a/completions/export b/completions/export
-index 8d823614aaf..9cf94277678 100644
---- a/completions/export
-+++ b/completions/export
-@@ -25,10 +25,7 @@ _export()
-     done
- 
-     if [[ $cur == *=* ]]; then
--        local ocur=$cur oprev=$prev
--        prev=${cur%%=*} cur=${cur#*=}
--        _variables && return
--        cur=$ocur prev=$oprev
-+        _variable_assignments $cur && return
-     fi
- 
-     case $cur in
-diff --git a/test/t/test_grep.py b/test/t/test_grep.py
-index a249122eb12..10956b1f5e9 100644
---- a/test/t/test_grep.py
-+++ b/test/t/test_grep.py
-@@ -14,3 +14,13 @@ def test_2(self, completion):
-         Not really a grep option, but tests _longopt.
-         """
-         assert completion == "foo foo.d/".split()
-+
-+    @pytest.mark.complete("grep TZ ", cwd="shared/default")
-+    def test_no_variable_assignment_confusion(self, completion):
-+        """
-+        Test TZ doesn't trigger known variable value assignment completion.
-+
-+        Not really a grep specific, but good to test somewhere.
-+        Refs https://github.com/scop/bash-completion/issues/457
-+        """
-+        assert "foo" in completion
-
diff --git a/debian/patches/13-backport-support-for-python-9.patch b/debian/patches/13-backport-support-for-python-9.patch
deleted file mode 100644
index de75f45..0000000
--- a/debian/patches/13-backport-support-for-python-9.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit dc1c404b3c14cd3e3627a6720cf32a4e27079285
-Author: Ville Skyttä <ville.skytta@iki.fi>
-Date:   Sun Sep 6 22:57:28 2020 +0300
-
-    python, pyvenv: install for 3.9
-
-diff --git a/completions/Makefile.am b/completions/Makefile.am
-index e43d0e3c..ba75fa48 100644
---- a/completions/Makefile.am
-+++ b/completions/Makefile.am
-@@ -677,11 +677,13 @@ CLEANFILES = \
- 	python3.6 \
- 	python3.7 \
- 	python3.8 \
-+	python3.9 \
- 	pyvenv-3.4 \
- 	pyvenv-3.5 \
- 	pyvenv-3.6 \
- 	pyvenv-3.7 \
- 	pyvenv-3.8 \
-+	pyvenv-3.9 \
- 	qemu-kvm \
- 	qemu-system-i386 \
- 	qemu-system-x86_64 \
-@@ -894,9 +896,11 @@ symlinks: $(DATA)
- 	$(ss) pylint \
- 		pylint-2 pylint-3
- 	$(ss) python \
--		micropython pypy pypy3 python2 python2.7 python3 python3.3 python3.4 python3.5 python3.6 python3.7 python3.8
-+		micropython pypy pypy3 python2 python2.7 python3 python3.3 \
-+		python3.4 python3.5 python3.6 python3.7 python3.8 python3.9
- 	$(ss) pyvenv \
--		pyvenv-3.4 pyvenv-3.5 pyvenv-3.6 pyvenv-3.7 pyvenv-3.8
-+		pyvenv-3.4 pyvenv-3.5 pyvenv-3.6 pyvenv-3.7 pyvenv-3.8 \
-+		pyvenv-3.9
- 	$(ss) qdbus \
- 		dcop
- 	$(ss) qemu \
-diff --git a/completions/python b/completions/python
-index d50c18f0..d7e18b90 100644
---- a/completions/python
-+++ b/completions/python
-@@ -62,6 +62,6 @@ _python()
-         COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
-     fi
- } &&
--    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
-+    complete -F _python python python2 python2.7 python3 python3.{3..9} pypy pypy3 micropython
- 
- # ex: filetype=sh
-diff --git a/completions/pyvenv b/completions/pyvenv
-index 527a3840..3a1ecb37 100644
---- a/completions/pyvenv
-+++ b/completions/pyvenv
-@@ -20,6 +20,6 @@ _pyvenv()
- 
-     _filedir -d
- } &&
--    complete -F _pyvenv pyvenv pyvenv-3.{4..8}
-+    complete -F _pyvenv pyvenv pyvenv-3.{4..9}
- 
- # ex: filetype=sh
diff --git a/debian/patches/14-backport-support-for-long-options-in-perltidy.patch b/debian/patches/14-backport-support-for-long-options-in-perltidy.patch
deleted file mode 100644
index 02a56c0..0000000
--- a/debian/patches/14-backport-support-for-long-options-in-perltidy.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit a283b6963421adb3acf087c9816614a9c0c4c214
-Author: Ville Skyttä <ville.skytta@iki.fi>
-Date:   Tue Apr 13 17:02:12 2021 +0300
-
-    feat(perltidy): support long variants of arg completed options
-
-diff --git a/completions/perltidy b/completions/perltidy
-index 4404cf8..a6ee36b 100644
---- a/completions/perltidy
-+++ b/completions/perltidy
-@@ -16,25 +16,34 @@ _perltidy()
-     esac
- 
-     case $cur in
--        -pro=*)
-+        -pro=* | --profile=*)
-             cur="${cur#*=}"
-             _filedir
-             return
-             ;;
--        -ole=*)
-+        -ole=* | --output-line-ending=*)
-             COMPREPLY=($(compgen -W 'dos win mac unix' -- "${cur#*=}"))
-             return
-             ;;
--        -bt=* | -pt=* | -sbt=* | -bvt=* | -pvt=* | -sbvt=* | -bvtc=* | -pvtc=* | -sbvtc=* | \
--            -cti=* | -kbl=* | -vt=*)
-+        -bt=* | --brace-tightness=* | -pt=* | --paren-tightness=* | \
-+            -sbt=* | --square-bracket-tightness=* | \
-+            -bvt=* | --brace-vertical-tightness=* | \
-+            -pvt=* | --paren-vertical-tightness=* | \
-+            -sbvt=* | --square-bracket-vertical-tightness=* | \
-+            -bvtc=* | --brace-vertical-tightness-closing=* | \
-+            -pvtc=* | --paren-vertical-tightness-closing=* | \
-+            -sbvtc=* | --square-bracket-vertical-tightness-closing=* | \
-+            -cti=* | --closing-token-indentation=* | \
-+            -kbl=* | --keep-old-blank-lines=* | \
-+            -vt=* | --vertical-tightness=*)
-             COMPREPLY=($(compgen -W '0 1 2' -- "${cur#*=}"))
-             return
-             ;;
--        -vtc=*)
-+        -vtc=* | --vertical-tightness-closing=*)
-             COMPREPLY=($(compgen -W '0 1' -- "${cur#*=}"))
-             return
-             ;;
--        -cab=*)
-+        -cab=* | --comma-arrow-breakpoints=*)
-             COMPREPLY=($(compgen -W '0 1 2 3' -- "${cur#*=}"))
-             return
-             ;;
diff --git a/debian/patches/15-find-exec.patch b/debian/patches/15-find-exec.patch
deleted file mode 100644
index fcb963e..0000000
--- a/debian/patches/15-find-exec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit f1ddf810e4ee6693acb9fab1be1794586aa111a0
-Author: Ville Skyttä <ville.skytta@iki.fi>
-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 --git a/debian/patches/16-freecad-extension.patch b/debian/patches/16-freecad-extension.patch
deleted file mode 100644
index 317c336..0000000
--- a/debian/patches/16-freecad-extension.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit fcaf3d4118af251973a57028302bf057a9681f1f
-Author: steelman <stlman@poczta.fm>
-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 --git a/debian/patches/17-ssh-pubacceptedalgorithms.patch b/debian/patches/17-ssh-pubacceptedalgorithms.patch
deleted file mode 100644
index 7cb62e5..0000000
--- a/debian/patches/17-ssh-pubacceptedalgorithms.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 7c0084e0f4d82a9b4d76f72e28b8afe773146de7
-Author: Gabriel F. T. Gomes <gabriel@inconstante.net.br>
-Date:   Sun Apr 9 22:34:28 2023 -0700
-
-    fix(ssh): deprecated option PubkeyAcceptedKeyTypes
-    
-    As reported by a Debian user in https://bugs.debian.org/1033642, ssh
-    changed the option name from PubkeyAcceptedKeyTypes to
-    PubkeyAcceptedAlgorithms. The old name still works, but no longer
-    presented in the manpages.
-
-diff --git a/completions/ssh b/completions/ssh
-index 907c039..4f83c48 100644
---- a/completions/ssh
-+++ b/completions/ssh
-@@ -53,7 +53,7 @@ _ssh_options()
-         NoHostAuthenticationForLocalhost NumberOfPasswordPrompts
-         PasswordAuthentication PermitLocalCommand PKCS11Provider Port
-         PreferredAuthentications ProxyCommand ProxyJump ProxyUseFdpass
--        PubkeyAcceptedKeyTypes PubkeyAuthentication RekeyLimit RemoteCommand
-+        PubkeyAcceptedAlgorithms PubkeyAuthentication RekeyLimit RemoteCommand
-         RemoteForward RequestTTY RevokedHostKeys SendEnv ServerAliveCountMax
-         ServerAliveInterval SmartcardDevice StreamLocalBindMask
-         StreamLocalBindUnlink StrictHostKeyChecking SyslogFacility TCPKeepAlive
-@@ -172,7 +172,7 @@ _ssh_suboption()
-         proxycommand | remotecommand | localcommand)
-             COMPREPLY=($(compgen -c -- "$cur"))
-             ;;
--        pubkeyacceptedkeytypes)
-+        pubkeyacceptedalgorithms | pubkeyacceptedkeytypes)
-             COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
-             ;;
-         requesttty)
diff --git a/debian/patches/18-aptitude-showsrc-source b/debian/patches/18-aptitude-showsrc-source
index d1cc74c..f94b750 100644
--- a/debian/patches/18-aptitude-showsrc-source
+++ b/debian/patches/18-aptitude-showsrc-source
@@ -3,21 +3,21 @@ Author: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
 Date:   Mon Apr 25 14:51:16 2022 +0200
 
     completions/aptitude: add showsrc source
-    
+
     Add missing sub-commands.
-    
+
     Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
 
 diff --git a/completions/aptitude b/completions/aptitude
-index e5ea163..558be7c 100644
+index 827395a0..54a90693 100644
 --- a/completions/aptitude
 +++ b/completions/aptitude
-@@ -110,7 +110,7 @@ _aptitude()
-             clean autoclean install reinstall remove hold unhold purge markauto
+@@ -98,7 +98,7 @@ _comp_cmd_aptitude()
+             autoclean install reinstall remove hold unhold purge markauto
              unmarkauto why why-not dist-upgrade full-upgrade download search
              show forbid-version changelog keep keep-all build-dep add-user-tag
--            remove-user-tag versions' -- "$cur"))
-+            remove-user-tag showsrc source versions' -- "$cur"))
+-            remove-user-tag versions'
++            remove-user-tag showsrc source versions'
      fi
  
  } &&
diff --git a/debian/patches/19-clean-wine-symlinks b/debian/patches/19-clean-wine-symlinks
deleted file mode 100644
index 0ba834c..0000000
--- a/debian/patches/19-clean-wine-symlinks
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/completions/Makefile.am b/completions/Makefile.am
-index 723b42f..b130bc7 100644
---- a/completions/Makefile.am
-+++ b/completions/Makefile.am
-@@ -738,6 +738,8 @@ CLEANFILES = \
- 	vgsplit \
- 	vigr \
- 	whatis \
-+	wine-development \
-+	wine-stable \
- 	xpovray \
- 	xvnc4viewer \
- 	ypcat
diff --git a/debian/patches/series b/debian/patches/series
index a7b1f18..ca74e6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,4 @@
 04-xine_add_more_formats.patch
 06-xpdf_support_compressed_pdf.patch
-07-dpkg_support_raw-extract_vextract.patch
 11-add-completions-for-openrc-rc-service.patch
-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
-17-ssh-pubacceptedalgorithms.patch
 18-aptitude-showsrc-source
-19-clean-wine-symlinks