diff options
| -rw-r--r-- | debian/patches/0000_apt_markauto.diff | 20 | ||||
| -rw-r--r-- | debian/patches/0001_git_updates.diff | 112 | ||||
| -rw-r--r-- | debian/patches/0002_aptitude_dash_F_completion.diff | 55 | ||||
| -rw-r--r-- | debian/patches/0003_bts_completion_update.diff | 33 | ||||
| -rw-r--r-- | debian/patches/series | 4 |
5 files changed, 0 insertions, 224 deletions
diff --git a/debian/patches/0000_apt_markauto.diff b/debian/patches/0000_apt_markauto.diff deleted file mode 100644 index 7e1363725..000000000 --- a/debian/patches/0000_apt_markauto.diff +++ /dev/null @@ -1,20 +0,0 @@ -This fixes #631795: <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631795>. -Included upstream: <http://www.zsh.org/mla/workers/2011/msg00947.html>. - -Patch from: Sebastian Ramacher <s.ramacher@gmx.at> - -Index: pkg-zsh/Completion/Debian/Command/_apt -=================================================================== ---- pkg-zsh.orig/Completion/Debian/Command/_apt 2011-06-28 23:16:41.000000000 +0200 -+++ pkg-zsh/Completion/Debian/Command/_apt 2011-06-28 23:16:41.000000000 +0200 -@@ -438,7 +438,9 @@ - /$'build-dep\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \ - /$'autoremove\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \ - /$'help\0/' \| \ -- /"[]"/ ':argument-1::compadd "$expl_action[@]" update upgrade install remove purge dist-upgrade dselect-upgrade clean autoclean check source build-dep autoremove help' -+ /$'markauto\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \ -+ /$'unmarkauto\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \ -+ /"[]"/ ':argument-1::compadd "$expl_action[@]" update upgrade install remove purge dist-upgrade dselect-upgrade clean autoclean check source build-dep autoremove help markauto unmarkauto' - - _apt-get () { - local expl_action expl_packages diff --git a/debian/patches/0001_git_updates.diff b/debian/patches/0001_git_updates.diff deleted file mode 100644 index c141c002c..000000000 --- a/debian/patches/0001_git_updates.diff +++ /dev/null @@ -1,112 +0,0 @@ -This is an update for the _git completion. It's actually a number of patches -squashed into one: - - <http://www.zsh.org/mla/workers/2011/msg00952.html> - <http://www.zsh.org/mla/workers/2011/msg00953.html> - <http://www.zsh.org/mla/workers/2011/msg00955.html> - <http://www.zsh.org/mla/workers/2011/msg00961.html> - -Diffstat: - - _git | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 65 insertions(+), 1 deletion(-) - -These are included to fix `#630906'. All of them are included upstream. - - -Index: pkg-zsh/Completion/Unix/Command/_git -=================================================================== ---- pkg-zsh.orig/Completion/Unix/Command/_git 2011-07-01 09:58:04.000000000 +0200 -+++ pkg-zsh/Completion/Unix/Command/_git 2011-07-01 09:58:04.000000000 +0200 -@@ -17,6 +17,16 @@ - # - # You could even create a function _git-foo() to handle specific completion - # for that command. -+# -+# When _git does not know a given sub-command (say `bar'), it falls back to -+# completing file names for all arguments to that sub command. I.e.: -+# -+# % git bar <tab> -+# -+# ...will complete file names. If you do *not* want that fallback to be used, -+# use the `use-fallback' style like this: -+# -+# % zstyle ':completion:*:*:git*:*' use-fallback false - - # TODO: There is still undocumented configurability in here. - -@@ -4603,6 +4613,15 @@ - _describe -t plumbing-sync-commands 'plumbing sync command' plumbing_sync_commands && ret=0 - _describe -t plumbing-sync-helper-commands 'plumbing sync helper command' plumbing_sync_helper_commands && ret=0 - _describe -t plumbing-internal-helper-commands 'plumbing internal helper command' plumbing_internal_helper_commands && ret=0 -+ local -a addons -+ local a -+ for a in $_git_third_party; do -+ (( ${+commands[git-${a%%:*}]} )) && addons+=( $a ) -+ done -+ _describe -t third-party-addons 'third party addon' addons && ret=0 -+ local -a user_commands -+ zstyle -a ":completion:${curcontext}:" user-commands user_commands || user_commands=() -+ _describe -t user-specific-commands 'user specific command' user_commands && ret=0 - return ret - } - -@@ -6023,7 +6042,14 @@ - (option-or-argument) - curcontext=${curcontext%:*:*}:git-$words[1]: - -- _call_function ret _git-$words[1] -+ if (( ${+functions[_git-$words[1]]} )); then -+ _git-$words[1] -+ elif zstyle -T ":completion:${curcontext}:" use-fallback; then -+ _path_files -+ ret=$? -+ else -+ _message 'Unknown sub-command' -+ fi - ;; - esac - else -@@ -6032,4 +6058,42 @@ - return ret - } - -+# Handle add-on completions. Say you got a third party add-on `foo'. What you -+# want to do is write your completion as `_git-foo' and this code will pick it -+# up. That should be a regular compsys function, which starts like this: -+# -+# #compdef git-foo -+# -+# In addition to what compinit does, this also reads the second line of the -+# completion. If that matches "#desc:*" the part behind "#desc:" will be used -+# as the addon's description. Like this: -+# -+# #desc:checks git's foobar value -+local addon input i desc -+typeset -gUa _git_third_party -+for addon in ${^fpath}/_git-*~*~(.N); do -+ if [[ -n ${(M)_git_third_party:#${${addon:t}#_git-}*} ]]; then -+ # This makes sure only the first _git-foo in $fpath gets read. -+ continue -+ fi -+ # Read the second line of the file. -+ i=1 -+ desc= -+ while read input; do -+ if (( i == 2 )); then -+ desc=$input -+ break -+ fi -+ (( i++ )) -+ done < $addon -+ # Setup `$desc' appropriately. -+ if [[ $desc != '#desc:'* ]]; then -+ desc= -+ else -+ desc=${desc#\#desc} -+ fi -+ # Add the addon's completion. -+ _git_third_party+=( ${${addon:t}#_git-}$desc ) -+done -+ - _git diff --git a/debian/patches/0002_aptitude_dash_F_completion.diff b/debian/patches/0002_aptitude_dash_F_completion.diff deleted file mode 100644 index b17c0e748..000000000 --- a/debian/patches/0002_aptitude_dash_F_completion.diff +++ /dev/null @@ -1,55 +0,0 @@ -This patch is included upstream. - -Index: pkg-zsh/Completion/Debian/Command/_aptitude -=================================================================== ---- pkg-zsh.orig/Completion/Debian/Command/_aptitude 2011-07-01 14:12:05.000000000 +0200 -+++ pkg-zsh/Completion/Debian/Command/_aptitude 2011-07-01 14:12:05.000000000 +0200 -@@ -13,6 +13,39 @@ - #}}} - } - -+# Helper function for -F / --display-format -+function _aptitude_format_strings() { -+ _values -s , 'format string' \ -+ '%%[Literal %]' \ -+ '%#number[Parameter replacement]' \ -+ '%a[Action flag]' \ -+ '%A[Action]' \ -+ '%B[Broken count]' \ -+ '%c[Current state flag]' \ -+ '%C[Current state]' \ -+ '%d[Description]' \ -+ '%H[Hostname]' \ -+ '%i[Pin priority]' \ -+ '%I[Installed size]' \ -+ '%m[Maintainer]' \ -+ '%M[Automatic flag]' \ -+ '%n[Program version]' \ -+ '%N[Program name]' \ -+ '%o[Download size]' \ -+ '%p[Package name]' \ -+ '%P[Priority]' \ -+ '%r[Reverse depends count]' \ -+ '%R[Abbreviated priority]' \ -+ '%s[Section]' \ -+ '%S[Trust status]' \ -+ '%t[Archive]' \ -+ '%T[Tagged]' \ -+ '%u[Disk usage change]' \ -+ '%v[Current version]' \ -+ '%V[Candidate version]' \ -+ '%Z[Size change]' -+} -+ - _arguments -C \ - '(- 1 *)'{-h,--help}'[display help information]' \ - '(- 1 *)--version[display version information]' \ -@@ -20,7 +53,7 @@ - '(-d --download-only)'{-d,--download-only}"[just download packages - don\'t install]" \ - '(-P --prompt)'{-P,--prompt}'[always display a prompt]' \ - '(-y --assume-yes)'{-y,--assume-yes}'[assume yes answer to questions]' \ -- '(-F --display-format)'{-F,--display-format}'[specify output format for search command]:format' \ -+ '(-F --display-format)'{-F,--display-format}'[specify output format for search command]:format:_aptitude_format_strings' \ - '(-O --sort)'{-O,--sort}'[specify sort order]:sort order:()' \ - '(-w --width)'{-w,--width}'[specify output width]:width' \ - '-f[aggressivley try to fix dependencies of broken packages]' \ diff --git a/debian/patches/0003_bts_completion_update.diff b/debian/patches/0003_bts_completion_update.diff deleted file mode 100644 index 98ac514dd..000000000 --- a/debian/patches/0003_bts_completion_update.diff +++ /dev/null @@ -1,33 +0,0 @@ -This patch is included upstream. - -Index: pkg-zsh/Completion/Debian/Command/_bts -=================================================================== ---- pkg-zsh.orig/Completion/Debian/Command/_bts 2011-10-14 19:44:22.000000000 +0200 -+++ pkg-zsh/Completion/Debian/Command/_bts 2011-10-14 19:44:42.000000000 +0200 -@@ -85,16 +85,18 @@ - _wanted operator expl 'operator' compadd - '+' '-' '=' - elif [[ CURRENT -eq 4 ]]; then - _wanted tag expl 'tag' \ -- compadd patch wontfix moreinfo unreproducible fixed security \ -- potato woody sid help pending upstream lfs sarge experimental \ -- sarge-ignore d-i confirmed ipv6 fixed-in-experimental \ -- fixed-upstream -+ compadd patch wontfix moreinfo unreproducible help pending \ -+ fixed security upstream confirmed fixed-upstream \ -+ fixed-in-experimental d-i ipv6 lfs l10n potato woody sarge \ -+ sarge-ignore etch etch-ignore lenny lenny-ignore squeeze \ -+ squeeze-ignore wheezy wheezy-ignore sid experimental - else - _wanted tag expl 'tag' \ -- compadd patch wontfix moreinfo unreproducible fixed security \ -- potato woody sid help pending upstream lfs sarge experimental \ -- sarge-ignore d-i confirmed ipv6 fixed-in-experimental \ -- fixed-upstream -+ compadd patch wontfix moreinfo unreproducible help pending \ -+ fixed security upstream confirmed fixed-upstream \ -+ fixed-in-experimental d-i ipv6 lfs l10n potato woody sarge \ -+ sarge-ignore etch etch-ignore lenny lenny-ignore squeeze \ -+ squeeze-ignore wheezy wheezy-ignore sid experimental - _wanted sep expl 'separator' compadd -S ' ' , . - fi - ;; diff --git a/debian/patches/series b/debian/patches/series index 13ab685d8..1404d2b83 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,2 @@ deb_0000_at_configure.diff deb_0001_at_config_h_in.diff -0000_apt_markauto.diff -0001_git_updates.diff -0002_aptitude_dash_F_completion.diff -0003_bts_completion_update.diff |