Merge branch 'master' into 2.x

2 files changed, 76 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index db83c4b8..3c01e9f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,78 @@
+bash-completion (2.0)
+
+  [ Anthony Ramine ]
+  * Properly declare 'symlinks' dependencies
+
+  [ David Paleino ]
+  * apt-get: add 'changelog' to completed commands
+
+  [ Guillaume Rousse ]
+  * Add xz compression extension for kernel modules
+
+  [ Igor Murzov ]
+  * sudo: Handle options (Alioth: #311414).
+  * sudoedit: New completion.
+  * _command_offset: Properly quote arguments of eval (Alioth:
+    #313499).
+  * mount.linux: Add some new mount options intoduced in Linux 3.0-3.2
+  * _modules: Ignore error messages.
+  * modprobe, modinfo, insmod: Move modprobe and modinfo completions
+    to their own files.
+  * sbopkg: Use _parse_help.
+  * sbopkg, slackpkg, slapt-{get,src}: Use shorter form of the check
+    if file exists.
+  * _filedir: Properly quote paths to avoid unexpected expansion.
+  * su: Add linux-specific completion
+  * insmod, modprobe: Don't hardcode path to modinfo (Alioth: #313569)
+  * man: --path option is supported on Darwin (Alioth: #313584)
+  * man: Move variable declaration to the right place.
+  * feh: Update option argument completions.
+  * fbi, feh: Complete more supported file formats.
+  * fbgs: Add new options introduced in fbida-2.09.
+  * cppcheck: Complete new --relative-paths option arguments
+  * _expand: Suppress unwanted bash error messages (Alioth: #313497)
+
+  [ Itaï BEN YAACOV ]
+  * scp: Recognise symlinks to directories as directories (Debian:
+    #666055).
+
+  [ Jonathan Nieder ]
+  * ri: Rename ri_get_methods helper to add leading underscore
+
+  [ Ville Skyttä ]
+  * rmmod: Add option completions.
+  * testsuite/generate: Generate less linefeeds.
+  * insmod: Install for insmod.static too.
+  * mplayer: Add -monitoraspect arg completion.
+  * mplayer: Add generic handling of options that take arguments.
+  * testsuite: Fix spurious modinfo and modprobe test failures on
+    systems that have /lib and /lib64 dirs.
+  * pigz: Add -p/--processes arg completion.
+  * testsuite: Add basic su test case.
+  * su: Fix long option handling.
+  * su: Add --session-command arg completion.
+  * su: Complete -s/--shell with shells instead of all files.
+  * lyx: Remove simple completion, upstream has more complete one
+    (Debian: #662203)
+  * testsuite/generate: Tweak linefeeds.
+  * make: Add generic variable completion.
+  * man: Recognize 3gl as man page filename extension -- at least Mesa
+    uses it.
+  * _realcommand: Try greadlink before readlink (Alioth: #313659).
+  * Comment spelling fix.
+  * qiv: Add *.svg.
+  * xmllint: Add *.svgz.
+  * autotools: Use MKDIR_P instead of mkdir_p (Alioth: #313671).
+  * lbzip2: Add -n argument completion.
+  * *_tilde*: Escape tilde in [[ $1 == \~* ]] tests (RedHat: #817902).
+  * New completions:
+    - acpi, hwclock, pwd, ssh-add, vmstat
+
+  [ Sung Pae ]
+  * Workaround bash bug that fails to complete <, >
+
+ -- David Paleino <d.paleino@gmail.com>  Sun, 17 Jun 2012 20:01:36 +0200
+
 bash-completion (1.99)
 
   * Hopefully the last 2.0 preview.
diff --git a/configure.ac b/configure.ac
index 23a7e80b..3dd17c66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([bash-completion], [1.99])
+AC_INIT([bash-completion], [2.0])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip -Wall -Werror])
 AC_PROG_LN_S
 AC_PROG_MKDIR_P