Update Debian patches after upstream version update

4 files changed, 49 insertions, 21 deletions

diff --git a/debian/patches/04-xine_add_more_formats.patch b/debian/patches/04-xine_add_more_formats.patch
index 95a6c2f8..b19acd5f 100644
--- a/debian/patches/04-xine_add_more_formats.patch
+++ b/debian/patches/04-xine_add_more_formats.patch
@@ -15,10 +15,10 @@ Bug-Debian: https://bugs.debian.org/496162
  _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))?(.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))?(.part)' kaffeine dragon
-+_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))?(.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))?(.part)' kaffeine dragon
+-_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
++_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
  _install_xspec '!*.@(avi|asf|wmv)' aviplay
  _install_xspec '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
  _install_xspec '!*.@(mpg|mpeg|avi|mov|qt)' xanim
diff --git a/debian/patches/06-xpdf_support_compressed_pdf.patch b/debian/patches/06-xpdf_support_compressed_pdf.patch
index fdd6aa34..de050f4c 100644
--- a/debian/patches/06-xpdf_support_compressed_pdf.patch
+++ b/debian/patches/06-xpdf_support_compressed_pdf.patch
@@ -17,5 +17,5 @@ Bug-Debian: https://bugs.debian.org/702498
 +_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)))' okular
+ _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/debian/patches/07-dpkg_support_raw-extract_vextract.patch b/debian/patches/07-dpkg_support_raw-extract_vextract.patch
index fcb6e1ec..692b1f7f 100644
--- a/debian/patches/07-dpkg_support_raw-extract_vextract.patch
+++ b/debian/patches/07-dpkg_support_raw-extract_vextract.patch
@@ -10,8 +10,8 @@ Forwarded: no
 
 --- bash-completion.orig/completions/dpkg
 +++ bash-completion/completions/dpkg
-@@ -85,7 +85,45 @@ _dpkg()
-     COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
+@@ -81,7 +81,45 @@ _dpkg()
+     COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
      [[ $COMPREPLY == *= ]] && compopt -o nospace
  } &&
 -complete -F _dpkg dpkg dpkg-deb dpkg-query
diff --git a/debian/patches/13-fix-perl-completions-with-a-space-between-option-and.patch b/debian/patches/13-fix-perl-completions-with-a-space-between-option-and.patch
index b7779f39..836fdf01 100644
--- a/debian/patches/13-fix-perl-completions-with-a-space-between-option-and.patch
+++ b/debian/patches/13-fix-perl-completions-with-a-space-between-option-and.patch
@@ -7,16 +7,17 @@ Forwarded: yes, https://github.com/scop/bash-completion/pull/258
 Most perl options do not allow a space between the switch and the
 argument, however, bash-completion incorrectly suggests completions for
 `-d', `-M` (or `-m'), and `-V', as reported in Debian bug #614775 [1],
-as well as for `-I', and `-x', which were not mentioned in the bug
-report.  This patch fixes the incorrect completions for these options,
-by falling back to regular _filedir completion when a space is present.
+as well as for `-x', which was not mentioned in the bug report.  This
+patch fixes the incorrect completions for these options, by falling back
+to regular _filedir completion when a space is present.
 
 On the other hand, and unlike all other perl options, a space between
-the `-e' and `-E' options and their arguments, e.g. `perl -e "exit 2"',
-*is* valid syntax.  However, the argument is neither a filename nor a
-directory, but one line of perl program.  So, in order to keep the old
-behavior, which was correct, this patch adds extra code that skips
-_filedir completion for `-e' and `-E' with a space.
+the `-e', `-E', and `-I' options and their arguments, e.g. `perl -e
+"exit 2"', *is* valid syntax.  However, the argument for `-e' and `-E'
+is neither a filename nor a directory, but one line of perl program.
+So, in order to keep the old behavior, which was correct, this patch
+adds extra code that skips _filedir completion for `-e' and `-E' with a
+space.
 
 Finally, the test case for `-x' requires changes, because it expects
 that `-x' with a space should complete only with directories.  That is
@@ -48,7 +49,8 @@ argument to `-x':
   Can't open perl script "perl/": Is a directory
 
 The rationale for the changes is based on `perl --help', which explains
-that there are no spaces between options and arguments:
+that there are no spaces between options and arguments (see note below
+for `-I'):
 
   $ perl --help | grep "\-d\|\-V\|-I\|-x\|-\[mM\]"
     -d[:debugger]     run program under debugger
@@ -63,10 +65,13 @@ When a space is required, `perl --help' makes it explicit:
     -e program        one line of program (several -e's allowed, omit programfile)
     -E program        like -e, but enables all optional features
 
+As an exception to this rule, `-I' does accept a space. ¬¬
+
 [1] https://bugs.debian.org/614775
+
 ---
 diff --git a/completions/perl b/completions/perl
-index 7b91d1b4..98a0b53b 100644
+index 98ddb9eb..325c58d9 100644
 --- a/completions/perl
 +++ b/completions/perl
 @@ -27,7 +27,6 @@ _perl()
@@ -76,8 +81,8 @@ index 7b91d1b4..98a0b53b 100644
 -    fi
  
      case $prev in
-         -D|-e|-E|-i|-F|-l)
-@@ -68,7 +67,15 @@ _perl()
+         -*[DeEiFl])
+@@ -68,7 +67,23 @@ _perl()
              ;;
      esac
  
@@ -90,7 +95,30 @@ index 7b91d1b4..98a0b53b 100644
 +    elif [[ "$prev" == -e ]] || [[ "$prev" == -E ]]; then
 +        return
 +
++    # Likewise, `-I' also accepts a space between option and argument
++    # and it takes a directory as value.
++    elif [[ "$prev" == -I ]]; then
++        local IFS=$'\n'
++        compopt -o filenames
++        COMPREPLY=( $(compgen -d $optPrefix $optSuffix -- "$cur") )
++        return
++
 +    elif [[ "$cur" == -* ]]; then
-         COMPREPLY=( $( compgen -W '-C -s -T -u -U -W -X -h -v -V -c -w -d -D -p
-             -n -a -F -l -0 -I -m -M -P -S -x -i -e' -- "$cur" ) )
+         COMPREPLY=( $(compgen -W '-C -s -T -u -U -W -X -h -v -V -c -w -d -D -p
+             -n -a -F -l -0 -I -m -M -P -S -x -i -e' -- "$cur") )
      else
+diff --git a/test/t/test_perl.py b/test/t/test_perl.py
+index 7c0c6094..21ac10f4 100644
+--- a/test/t/test_perl.py
++++ b/test/t/test_perl.py
+@@ -67,8 +67,8 @@ class TestPerl:
+ 
+     @pytest.mark.complete("perl -x shared/default/b")
+     def test_15(self, completion):
+-        """-x with space should complete dirs."""
+-        assert completion == ["shared/default/bar bar.d/"]
++        """-x with space should complete files+dirs."""
++        assert completion == ["bar", "bar bar.d/"]
+ 
+     @pytest.mark.complete("perl -d:", env=dict(PERL5LIB="$PWD/perl"))
+     def test_16(self, completion):