From 233421469b12d3b60e7595822cc9166016abe384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 4 Feb 2017 18:09:08 +0200
Subject: [PATCH] Release 2.5

---
 CHANGES         | 58 ++++++++++++++++++++++++++++++++++++++++++++++++-
 bash_completion |  2 +-
 configure.ac    |  2 +-
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index f0f5eb042f7..bfa35af3ad4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,60 @@
+bash-completion (2.5)
+
+  [ BartDeWaal ]
+  * Support for python gui source files (#91)
+
+  [ Ben Webber ]
+  * mr: New completion
+
+  [ Christian Kujau ]
+  * ssh-keygen: support ed25519 keys (#79)
+
+  [ Dara Adib ]
+  * Add sidedoor to _ssh() completion (#106)
+
+  [ George Kola ]
+  * .ipa is just a zip file and we should let unzip handle it (#71)
+
+  [ Miroslav Šustek ]
+  * ant: parse targets in imported buildfiles (#84)
+
+  [ Reuben Thomas ]
+  * Add more tests for ccache
+  * ccache: fix completing compiler's flags
+
+  [ Ville Skyttä ]
+  * test suite: Add java/javac non-completion fixture
+  * javac: Complete -cp like -classpath
+  * travis: Skip bluez and nis for now due to post-install script
+    issues
+  * test/config/*: Delete trailing whitespace
+  * (test suite): Avoid loading user's ~/.bash_completion, fixes #87
+  * ip: Recognize a as alias for address and l for link
+  * ip: Recognize address in addition to addr
+  * mr: Disable "clean" test case, command N/A before mr 1.20141023
+  * ssh-keygen: Parse switches with _parse_usage, not _parse_help
+  * mplayer: Associate with *.mjpg, *.mjpeg (Debian: #837779)
+  * dd: Sync completions with coreutils 8.24
+  * travis: Add mr
+  * perl: Remove full path to cat in PERLDOC_PAGER call
+  * deja-dup: New completion
+  * CONTRIBUTING: Reorder sections
+  * *: Move indentation settings to .editorconfig
+  * make: Declare _make_target_extract_script like other functions
+  * Travis: zopfli is AWOL?
+  * *: Whitespace fixes
+
+  [ Zearin ]
+  * Minor edits to README.md (mostly formatting) (#110)
+
+  [ l3nticular ]
+  * Fix bug in 'make' completion when using BSD sed (#108)
+
+  [ osu ]
+  * Add support for Include in ssh config (#70) (#80)
+
+ -- Ville Skyttä <ville.skytta@iki.fi>  Sat, 04 Feb 2017 18:07:27 +0200
+
 bash-completion (2.4)
 
   [ Arash Esbati ]
@@ -1793,4 +1850,3 @@ bash-completion (20060301-0ubuntu1) hardy; urgency=low
     Ubuntu: #139666.
 
  -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Feb 2008 16:46:34 +0100
-
diff --git a/bash_completion b/bash_completion
index ce0d1998b79..9ee70e243d1 100644
--- a/bash_completion
+++ b/bash_completion
@@ -23,7 +23,7 @@
 #
 #   https://github.com/scop/bash-completion
 #
-#   RELEASE: 2.4
+#   RELEASE: 2.5
 
 if [[ $- == *v* ]]; then
     BASH_COMPLETION_ORIGINAL_V_VALUE="-v"
diff --git a/configure.ac b/configure.ac
index b73bec719d1..541ff0f004c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([bash-completion], [2.4])
+AC_INIT([bash-completion], [2.5])
 AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip -Wall -Werror])
 AC_PROG_LN_S
 AC_PROG_MKDIR_P