← Back to branch summary

~ubuntu-branches/ubuntu/trusty/bash-completion/trusty-updates

« back to all changes in this revision

Viewing changes to debian/patches/101_bash_completion.oga_ogv.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2012-07-23 16:07:59 UTC
  • mfrom: (5.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120723160759-lt9vn33dl3nak9l0
Tags: 1:2.0-1ubuntu1
https://launchpad.net/bugs/311525
https://launchpad.net/bugs/743208
https://launchpad.net/bugs/720541
* debian/maintscript, debian/postinst:
  - clean etc conffiles on upgrade since completion files are in /usr
    with the new version
* Resync with Debian, remaining diff
  * debian/patches/disable-avahi-browse.diff: Disable avahi-browse since
    it scales poorly in the current form: refresh patch
  * patches/101_bash_completion.oga_ogv.patch: Increase support for other
    OGG formats including .oga, .ogx, etc. (LP: #311525)
  * patches/103_colormake.patch: Add support for colormake to the make
    completion rules. (LP: #743208)
* Dropped changes:
  * Add conffile upgrade handling for a run of conffiles that were dropped
    since lucid: lucid upgrades are only supported to precise.
* Those fixes are in the new version
  * debian/patches/apt-get-changelog.patch:
  * Drop whitelists if they fail to produce any results:
  * patches/apt-get-download.patch: Add download as an apt-get
    sub-command (LP: #720541)
  * patches/102_manpager.patch: Override MANPAGER when generating perldoc
    completions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/101_bash_completion.oga_ogv.patch
1
 
diff -Nurp bash-completion-1.3//bash_completion bash-completion-1.3-oga//bash_completion
2
 
--- bash-completion-1.3//bash_completion        2011-10-03 18:12:45.000000000 -0700
3
 
+++ bash-completion-1.3-oga//bash_completion    2011-10-03 18:43:06.835446982 -0700
4
 
@@ -92,13 +92,13 @@ complete -f -X '!*.@(?(e)ps|pdf)' ps2pdf
5
 
 complete -f -X '!*.texi*' makeinfo texi2html
6
 
 complete -f -X '!*.@(?(la)tex|texi|dtx|ins|ltx)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
7
 
 complete -f -X '!*.mp3' mpg123 mpg321 madplay
8
 
-complete -f -X '!*@(.@(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
9
 
-complete -f -X '!*@(.@(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
10
 
+complete -f -X '!*@(.@(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
11
 
+complete -f -X '!*@(.@(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
12
 
 complete -f -X '!*.@(avi|asf|wmv)' aviplay
13
 
 complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
14
 
 complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim
15
 
-complete -f -X '!*.@(ogg|m3u|flac|spx)' ogg123
16
 
-complete -f -X '!*.@(mp3|ogg|pls|m3u)' gqmpeg freeamp
17
 
+complete -f -X '!*.@(og[ag]|m3u|flac|spx)' ogg123
18
 
+complete -f -X '!*.@(mp3|og[ag]|pls|m3u)' gqmpeg freeamp
19
 
 complete -f -X '!*.fig' xfig
20
 
 complete -f -X '!*.@(mid?(i)|cmf)' playmidi
21
 
 complete -f -X '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)' timidity
22
 
diff -Nurp bash-completion-1.3//completions/mplayer bash-completion-1.3-oga//completions/mplayer
23
 
--- bash-completion-1.3//completions/mplayer    2011-01-29 13:32:55.000000000 -0800
24
 
+++ bash-completion-1.3-oga//completions/mplayer        2011-10-03 18:41:45.151199918 -0700
25
 
@@ -28,7 +28,7 @@ _mplayer()
 
1
Index: bash-completion-2.0/bash_completion
 
2
===================================================================
 
3
--- bash-completion-2.0.orig/bash_completion    2012-07-23 16:19:44.000000000 +0200
 
4
+++ bash-completion-2.0/bash_completion 2012-07-23 16:32:18.433422452 +0200
 
5
@@ -1874,13 +1874,13 @@
 
6
 _install_xspec '!*.texi*' makeinfo texi2html
 
7
 _install_xspec '!*.@(?(la)tex|texi|dtx|ins|ltx|dbj)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
 
8
 _install_xspec '!*.mp3' mpg123 mpg321 madplay
 
9
-_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
 
10
-_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
 
11
+_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
 
12
+_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
 
13
 _install_xspec '!*.@(avi|asf|wmv)' aviplay
 
14
 _install_xspec '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
 
15
 _install_xspec '!*.@(mpg|mpeg|avi|mov|qt)' xanim
 
16
-_install_xspec '!*.@(ogg|m3u|flac|spx)' ogg123
 
17
-_install_xspec '!*.@(mp3|ogg|pls|m3u)' gqmpeg freeamp
 
18
+_install_xspec '!*.@(og[ag]|m3u|flac|spx)' ogg123
 
19
+_install_xspec '!*.@(mp3|og[ag]|pls|m3u)' gqmpeg freeamp
 
20
 _install_xspec '!*.fig' xfig
 
21
 _install_xspec '!*.@(mid?(i)|cmf)' playmidi
 
22
 _install_xspec '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)' timidity
 
23
Index: bash-completion-2.0/completions/mplayer
 
24
===================================================================
 
25
--- bash-completion-2.0.orig/completions/mplayer        2012-06-15 11:21:55.000000000 +0200
 
26
+++ bash-completion-2.0/completions/mplayer     2012-07-23 16:32:18.437422453 +0200
 
27
@@ -26,7 +26,7 @@
26
28
             return 0
27
29
             ;;
28
30
         -audiofile)