[Pkg-zsh-commits] [zsh] 01/01: Cherry pick apt and apt-mark completion updates from upstream (Closes: #691526)

[Axel Beckert]

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

abe pushed a commit to branch debian
in repository zsh.

commit 1af939ecb526329f32d598bf787cff71842f5792
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat May 31 16:15:49 2014 +0200

    Cherry pick apt and apt-mark completion updates from upstream (Closes: #691526)
    
    The following patches were cherry-picked into debian/patches, but with
    changelog diffs omitted. They didn't apply (for obvious reasons) and
    aren't relevant either (for obvious reasons, too).
    
      32533: add completion for "apt-mark" (60bedea3)
      32532: completion for "apt" command (d397599c)
---
 ...78beac392af1ca6ed7291630459-apt-mark-completion | 59 ++++++++++++++++++++++
 ...ea5aa39492e5914c876a3991b8543445-apt-completion | 59 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 3 files changed, 120 insertions(+)

diff --git a/debian/patches/cherry-pick-60bedea3e712178beac392af1ca6ed7291630459-apt-mark-completion b/debian/patches/cherry-pick-60bedea3e712178beac392af1ca6ed7291630459-apt-mark-completion
new file mode 100644
index 0000000..8bcbe11
--- /dev/null
+++ b/debian/patches/cherry-pick-60bedea3e712178beac392af1ca6ed7291630459-apt-mark-completion
@@ -0,0 +1,59 @@
+commit 60bedea3e712178beac392af1ca6ed7291630459
+Author: Sebastian Ramacher <sebastian at ramacher.at>
+Date:   Sun Apr 6 18:04:39 2014 +0200
+
+    32533: add completion for "apt-mark"
+
+diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt
+index 6f0bded..bf5343a 100644
+--- a/Completion/Debian/Command/_apt
++++ b/Completion/Debian/Command/_apt
+@@ -1,4 +1,4 @@
+-#compdef apt apt-get apt-cache apt-cdrom apt-config
++#compdef apt apt-get apt-cache apt-cdrom apt-config apt-mark
+ 
+ _apt () {
+   case "$service" in
+@@ -7,6 +7,7 @@ _apt () {
+     apt-cache) _apt-cache "$@";;
+     apt-cdrom) _apt-cdrom "$@";;
+     apt-config) _apt-config "$@";;
++    apt-mark) _apt-mark "$@";;
+     *) _message "unknown command $service";;
+   esac
+ }
+@@ -619,4 +620,34 @@ _apt_caching_policy () {
+      /var/lib/dpkg/available -nt "$1" ]]
+ }
+ 
++_apt-mark () {
++  _apt_arguments _apt-mark_sm \
++    -h,--help:bool \
++    -v,--version:bool \
++    -f,--file:configfile \
++    -c,--config-file:configfile \
++    -o,--option:arbitem \
++    -qq:bool \
++    -s:bool \
++    -- \
++    /$'auto\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
++    /$'manual\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
++    /$'hold\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
++    /$'unhold\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
++    /$'showauto\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
++    /$'showmanual\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
++    /$'showhold\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
++    /"[]"/	':argument-1::compadd "$expl_action[@]" auto manual hold unhold showauto showmanual showhold'
++
++  _apt-mark () {
++    local expl_action expl_packages
++    _description actions expl_action 'action'
++    _description packages expl_packages 'package'
++
++    _apt-mark_sm
++  }
++
++  _apt-mark "$@"
++}
++
+ _apt "$@"
diff --git a/debian/patches/cherry-pick-d397599cea5aa39492e5914c876a3991b8543445-apt-completion b/debian/patches/cherry-pick-d397599cea5aa39492e5914c876a3991b8543445-apt-completion
new file mode 100644
index 0000000..e5001b6
--- /dev/null
+++ b/debian/patches/cherry-pick-d397599cea5aa39492e5914c876a3991b8543445-apt-completion
@@ -0,0 +1,59 @@
+commit d397599cea5aa39492e5914c876a3991b8543445
+Author: Alessandro Ghedini <alessandro at ghedini.me>
+Date:   Sun Apr 6 18:04:38 2014 +0200
+
+    32532: completion for "apt" command
+
+diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt
+index b51b2fc..6f0bded 100644
+--- a/Completion/Debian/Command/_apt
++++ b/Completion/Debian/Command/_apt
+@@ -1,7 +1,8 @@
+-#compdef apt-get apt-cache apt-cdrom apt-config
++#compdef apt apt-get apt-cache apt-cdrom apt-config
+ 
+ _apt () {
+   case "$service" in
++    apt) _apt-cmd "$@";;
+     apt-get) _apt-get "$@";;
+     apt-cache) _apt-cache "$@";;
+     apt-cdrom) _apt-cdrom "$@";;
+@@ -389,6 +390,38 @@ _apt_consume_long () {
+   return 0
+ }
+ 
++_apt-cmd () {
++  _apt_arguments _apt-cmd_sm \
++    -h,--help:bool \
++    -v,--version:bool \
++    -c,--config-file:configfile \
++    -o,--option:arbitem \
++    -t,--target-release:release \
++    -- \
++    /$'list\0'/ \| \
++    /$'search\0'/ /$'[^\0]#\0'/ ':strings:pattern:' \| \
++    /$'show\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \
++    /$'update\0'/ \| \
++    \( \
++    /$'install\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \
++    /$'[^\0/]#/'/ /$'[^\0/]#\0'/ ':release name::_apt_releases' \) \| \
++    /$'remove\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
++    /$'upgrade\0'/ \| \
++    /$'full-upgrade\0'/ \| \
++    /$'edit-sources\0'/ \| \
++    /"[]"/	':argument-1::compadd "$expl_action[@]" list search show update install remove upgrade full-upgrade edit-sources'
++
++  _apt-cmd () {
++    local expl_action expl_packages
++    _description actions expl_action 'action'
++    _description packages expl_packages 'package'
++
++    _apt-cmd_sm
++  }
++
++  _apt-cmd "$@"
++}
++
+ _apt-get () {
+   _apt_arguments _apt-get_sm \
+     -h,--help:bool \
diff --git a/debian/patches/series b/debian/patches/series
index 8d7c832..9b678f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 replace-texi2html-with-makeinfo
+cherry-pick-d397599cea5aa39492e5914c876a3991b8543445-apt-completion
+cherry-pick-60bedea3e712178beac392af1ca6ed7291630459-apt-mark-completion

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git