2.3.0 → 2.5.0.

Change-Id: I83ecbff82b23702f40ce1bae45be23e3336ff2c4
Reviewed-on: https://code.wireshark.org/review/21905
Reviewed-by: Gerald Combs <gerald@wireshark.org>

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 "")

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], [])

debian/changelog

@@ -1,4 +1,4 @@
-wireshark (2.3.0) unstable; urgency=low
+wireshark (2.5.0) unstable; urgency=low
 
   * Self-made package
 

docbook/attributes.asciidoc

@@ -1,6 +1,6 @@
 // Common attributes
 
-:wireshark-version: 2.3.0
+:wireshark-version: 2.5.0
 
 //
 // URLs

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._
 

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,