[Pkg-zsh-commits] [zsh] 03/04: Merge branch 'upstream' into debian

[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 a55d381f745d669c0ef9bdf0a4ce78a045ff3070
Merge: 478d6c1 cc69eef
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Aug 26 00:48:18 2014 +0200

    Merge branch 'upstream' into debian

 .distfiles                             |   6 +-
 ChangeLog                              | 116 ++++++++++
 Completion/.distfiles                  |   3 -
 Completion/AIX/.distfiles              |   1 -
 Completion/AIX/Command/.distfiles      |   2 -
 Completion/AIX/Type/.distfiles         |   2 -
 Completion/BSD/.distfiles              |   1 -
 Completion/BSD/Command/.distfiles      |  17 --
 Completion/Base/.distfiles             |   1 -
 Completion/Base/Completer/.distfiles   |  16 --
 Completion/Base/Core/.distfiles        |   4 -
 Completion/Base/Utility/.distfiles     |  23 --
 Completion/Base/Utility/_sequence      |  39 ++++
 Completion/Base/Widget/.distfiles      |   5 -
 Completion/Cygwin/Command/.distfiles   |   5 -
 Completion/Darwin/Command/.distfiles   |   8 -
 Completion/Darwin/Type/.distfiles      |   2 -
 Completion/Debian/.distfiles           |   1 -
 Completion/Debian/Command/.distfiles   |  50 ----
 Completion/Debian/Type/.distfiles      |   2 -
 Completion/Linux/Command/.distfiles    |  36 ---
 Completion/Linux/Command/_docker       | 410 +++++++++++++++++++++++++++++++++
 Completion/Linux/Type/.distfiles       |   4 -
 Completion/Mandriva/.distfiles         |   1 -
 Completion/Mandriva/Command/.distfiles |   3 -
 Completion/Redhat/.distfiles           |   1 -
 Completion/Redhat/Command/.distfiles   |   3 -
 Completion/Solaris/Command/.distfiles  |  26 ---
 Completion/Solaris/Type/.distfiles     |   4 -
 Completion/Unix/.distfiles             |   1 -
 Completion/Unix/Command/.distfiles     | 276 ----------------------
 Completion/Unix/Command/_chsh          |  40 ++++
 Completion/Unix/Command/_dsh           |  33 +++
 Completion/Unix/Command/_git           |   4 +-
 Completion/Unix/Command/_mosh          |  32 ++-
 Completion/Unix/Command/_mount         |  11 +-
 Completion/Unix/Command/_nm            |  80 +++++--
 Completion/Unix/Command/_nmap          |   2 +-
 Completion/Unix/Command/_pgrep         |   8 +-
 Completion/Unix/Command/_rsync         |   5 +-
 Completion/Unix/Command/_wget          |  19 +-
 Completion/Unix/Command/_zip           |   5 +-
 Completion/Unix/Type/.distfiles        |  54 -----
 Completion/Unix/Type/_pids             |  43 ++--
 Completion/Unix/Type/_users            |   2 +-
 Completion/X/.distfiles                |   1 -
 Completion/X/Command/.distfiles        |  34 ---
 Completion/X/Type/.distfiles           |   8 -
 Completion/X/Utility/.distfiles        |   2 -
 Completion/Zsh/.distfiles              |   1 -
 Completion/Zsh/Command/.distfiles      |  49 ----
 Completion/Zsh/Command/_kill           |   6 +-
 Completion/Zsh/Context/.distfiles      |  17 --
 Completion/Zsh/Function/.distfiles     |   3 -
 Completion/Zsh/Type/.distfiles         |  25 --
 Completion/openSUSE/Command/.distfiles |   6 -
 Config/.distfiles                      |   4 -
 Config/version.mk                      |   4 +-
 Doc/.distfiles                         |   8 +-
 Doc/Zsh/.distfiles                     |  68 ------
 Doc/Zsh/compsys.yo                     |  13 ++
 Doc/Zsh/tcpsys.yo                      |  13 +-
 Doc/help/.distfiles                    |   2 -
 Etc/.distfiles                         |  25 --
 Etc/.gitignore                         |   1 +
 Functions/.distfiles                   |   1 -
 Functions/Calendar/.distfiles          |  12 -
 Functions/Chpwd/.distfiles             |   7 -
 Functions/Compctl/.distfiles           |   2 -
 Functions/Example/.distfiles           |   4 -
 Functions/Exceptions/.distfiles        |   2 -
 Functions/MIME/.distfiles              |   5 -
 Functions/Misc/.distfiles              |  32 ---
 Functions/Newuser/.distfiles           |   2 -
 Functions/Prompts/.distfiles           |  20 +-
 Functions/TCP/.distfiles               |   5 -
 Functions/TCP/tcp_expect               |  35 ++-
 Functions/VCS_Info/.distfiles          |  19 --
 Functions/VCS_Info/Backends/.distfiles |  25 --
 Functions/Zftp/.distfiles              |   8 -
 Functions/Zle/.distfiles               |  48 ----
 Misc/.distfiles                        |   5 -
 NEWS                                   |   7 +
 Scripts/.distfiles                     |   2 -
 Src/.distfiles                         |  51 ----
 Src/Builtins/.distfiles                |   3 -
 Src/Modules/.distfiles                 |  59 -----
 Src/Zle/.distfiles                     |  12 -
 Src/glob.c                             |   4 +-
 Src/jobs.c                             |  15 +-
 Src/utils.c                            |  17 +-
 StartupFiles/.distfiles                |   2 -
 Test/.distfiles                        |  50 ----
 Test/A05execution.ztst                 |   2 +-
 Util/.distfiles                        |   6 -
 Util/mkdisttree.sh                     |  13 +-
 96 files changed, 875 insertions(+), 1297 deletions(-)

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