[Bash-completion-commits] [debian] 05/19: xine_add_more_formats.patch: add oga and ogx to multimedia players (Closes: #496162, LP: #311525)

[David Paleino]

This is an automated email from the git hooks/post-receive script.

dapal pushed a commit to branch master
in repository debian.

commit c05ee22c6a064ec265425b0b63276a442cbe100e
Author: David Paleino <dapal at debian.org>
Date:   Wed Mar 19 10:42:36 2014 +0100

    xine_add_more_formats.patch: add oga and ogx to multimedia players (Closes: #496162, LP: #311525)
---
 debian/changelog                              |  4 ++-
 debian/patches/04-xine_add_more_formats.patch | 42 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bd29b38..6e78446 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ bash-completion (1:2.1-3) UNRELEASED; urgency=medium
       Bacher (LP: #568404)
     - disable_avahi_browse.patch: slow, and doesn't scale to big
       networks, thanks to Chris Jones (Closes: #574950, LP: #510591)
+    - xine_add_more_formats.patch: add oga and ogx to multimedia players
+      (Closes: #496162, LP: #311525)
 
- -- David Paleino <dapal at debian.org>  Wed, 19 Mar 2014 10:34:55 +0100
+ -- David Paleino <dapal at debian.org>  Wed, 19 Mar 2014 10:42:06 +0100
 
 bash-completion (1:2.1-2) unstable; urgency=low
 
diff --git a/debian/patches/04-xine_add_more_formats.patch b/debian/patches/04-xine_add_more_formats.patch
new file mode 100644
index 0000000..e39001e
--- /dev/null
+++ b/debian/patches/04-xine_add_more_formats.patch
@@ -0,0 +1,42 @@
+From: j^ (j) <https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/311525/comments/2>
+Subject: Add oga and ogx formats
+Origin: vendor
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/311525
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=496162
+
+---
+ bash_completion     |    8 ++++----
+ completions/mplayer |    2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+--- bash-completion.orig/bash_completion
++++ bash-completion/bash_completion
+@@ -1892,13 +1892,13 @@ _install_xspec '!*.@(?(e)ps|pdf)' ps2pdf
+ _install_xspec '!*.texi*' makeinfo texi2html
+ _install_xspec '!*.@(?(la)tex|texi|dtx|ins|ltx|dbj)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
+ _install_xspec '!*.mp3' mpg123 mpg321 madplay
+-_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wma|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|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|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|wma|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|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|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|wma|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|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[agmvx]|OG[AGMVX]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|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|wma|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|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[agmvx]|OG[AGMVX]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|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 '!*.@(avi|asf|wmv)' aviplay
+ _install_xspec '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
+ _install_xspec '!*.@(mpg|mpeg|avi|mov|qt)' xanim
+-_install_xspec '!*.@(ogg|m3u|flac|spx)' ogg123
+-_install_xspec '!*.@(mp3|ogg|pls|m3u)' gqmpeg freeamp
++_install_xspec '!*.@(og[ag]|m3u|flac|spx)' ogg123
++_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
+--- bash-completion.orig/completions/mplayer
++++ bash-completion/completions/mplayer
+@@ -26,7 +26,7 @@ _mplayer()
+             return 0
+             ;;
+         -audiofile)
+-            _filedir '@(mp3|mpg|ogg|w?(a)v|mid|flac|mka|ape)'
++            _filedir '@(mp3|mpg|og[ag]|w?(a)v|mid|flac|mka|ape)'
+             return 0
+             ;;
+         -font|-subfont)
diff --git a/debian/patches/series b/debian/patches/series
index e223c3f..416bf03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 01-words_bad_array_subscript.patch
 02-dpkg_ddeb.patch
 03-disable_avahi_browse.patch
+04-xine_add_more_formats.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/debian.git