From 4ca91db0eddc8e1d502efc3965464b13baa36005 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Fri, 2 Jun 2017 15:39:32 -0700
Subject: [PATCH] =?UTF-8?q?2.3.0=20=E2=86=92=202.5.0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I83ecbff82b23702f40ce1bae45be23e3336ff2c4
Reviewed-on: https://code.wireshark.org/review/21905
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 CMakeLists.txt                 | 2 +-
 configure.ac                   | 2 +-
 debian/changelog               | 2 +-
 docbook/attributes.asciidoc    | 2 +-
 docbook/release-notes.asciidoc | 2 +-
 make-version.pl                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5a8ce9f93..1916c1bfa1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ project(Wireshark C CXX)
 # Updated by make-version.pl
 set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 2)
-set(PROJECT_MINOR_VERSION 3)
+set(PROJECT_MINOR_VERSION 5)
 set(PROJECT_PATCH_VERSION 0)
 set(PROJECT_BUILD_VERSION ${GIT_REVISION})
 set(PROJECT_VERSION_EXTENSION "")
diff --git a/configure.ac b/configure.ac
index b966aabbb6..a5048daa4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 # Define variables for the components of the Wireshark version number.
 #
 m4_define([version_major], [2])
-m4_define([version_minor], [3])
+m4_define([version_minor], [5])
 m4_define([version_micro], [0])
 dnl Updated by make-version.pl
 m4_define([version_extra], [])
diff --git a/debian/changelog b/debian/changelog
index 5f839a5bfc..90c0a28d04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (2.3.0) unstable; urgency=low
+wireshark (2.5.0) unstable; urgency=low
 
   * Self-made package
 
diff --git a/docbook/attributes.asciidoc b/docbook/attributes.asciidoc
index bc5e776604..50cba1528b 100644
--- a/docbook/attributes.asciidoc
+++ b/docbook/attributes.asciidoc
@@ -1,6 +1,6 @@
 // Common attributes
 
-:wireshark-version: 2.3.0
+:wireshark-version: 2.5.0
 
 //
 // URLs
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 4978191ee0..bdabba541b 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -20,7 +20,7 @@ used for troubleshooting, analysis, development and education.
 //* ws-buglink:5000[]
 //* ws-buglink:6000[Wireshark bug]
 //* cve-idlink:2014-2486[]
-//* Wireshark keeps leaving voicemails advertising timeshare condominiums in Fresno. (ws-buglink:0000[])
+//* Wireshark convinced you to switch seats on the plane while neglecting to tell you that its seat was noticeably moist.
 
 //_Non-empty section placeholder._
 
diff --git a/make-version.pl b/make-version.pl
index 36cbf7e750..5172995c31 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -84,7 +84,7 @@ my $set_version = 0;
 my $set_release = 0;
 my %version_pref = (
 	"version_major" => 2,
-	"version_minor" => 3,
+	"version_minor" => 5,
 	"version_micro" => 0,
 	"version_build" => 0,