From 3dbc84414ef3bd04c11a18f5f9ae0b8e3c1b2909 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 21 Jul 2016 15:53:54 -0700
Subject: =?UTF-8?q?2.1.2=20=E2=86=92=202.3.0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 968c326032..488e451e72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,10 +177,10 @@ include(CMakeInstallDirs)
 # Updated by make-version.pl
 set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 2)
-set(PROJECT_MINOR_VERSION 1)
-set(PROJECT_PATCH_VERSION 2)
+set(PROJECT_MINOR_VERSION 3)
+set(PROJECT_PATCH_VERSION 0)
 set(PROJECT_BUILD_VERSION ${GIT_REVISION})
-set(PROJECT_VERSION_EXTENSION "-git")
+set(PROJECT_VERSION_EXTENSION "")
 
 if(DEFINED ENV{WIRESHARK_VERSION_EXTRA})
 	set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
diff --git a/configure.ac b/configure.ac
index cdd0f33573..4a8fa9079f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,10 @@
 # Define variables for the components of the Wireshark version number.
 #
 m4_define([version_major], [2])
-m4_define([version_minor], [1])
-m4_define([version_micro], [2])
+m4_define([version_minor], [3])
+m4_define([version_micro], [0])
 dnl Updated by make-version.pl
-m4_define([version_extra], [-git])
+m4_define([version_extra], [])
 m4_define([version_micro_extra], m4_join([], version_micro, version_extra))
 
 AC_INIT(Wireshark, [version_major.version_minor.version_micro_extra], http://bugs.wireshark.org/, , http://www.wireshark.org/)
diff --git a/debian/changelog b/debian/changelog
index 5168bc5ee1..0338e52313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (2.1.2) unstable; urgency=low
+wireshark (2.3.0) unstable; urgency=low
 
   * Self-made package
 
diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index ec9a5cf290..667873935a 100644
--- a/docbook/asciidoc.conf
+++ b/docbook/asciidoc.conf
@@ -2,7 +2,7 @@
 
 [attributes]
 
-wireshark-version=2.1.2
+wireshark-version=2.3.0
 
 [replacements]
 
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 897b7e15c9..07b73f2839 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -1,7 +1,8 @@
 = Wireshark {wireshark-version} Release Notes
 // AsciiDoc quick reference: http://powerman.name/doc/asciidoc
 
-This is a semi-experimental release intended to test new features for Wireshark 2.2.
+This is a semi-experimental release intended to test new features for
+Wireshark 2.4.
 
 == What is Wireshark?
 
@@ -17,7 +18,7 @@ used for troubleshooting, analysis, development and education.
 //* ws-buglink:5000[]
 //* ws-buglink:6000[Wireshark bug]
 //* cve-idlink:2014-2486[]
-//* Wireshark accepted your prom invitation then cancelled at the last minute. (ws-buglink:0000[])
+//* Wireshark keeps leaving voicemails advertising timeshare condominiums in Fresno. (ws-buglink:0000[])
 
 //_Non-empty section placeholder._
 
diff --git a/make-version.pl b/make-version.pl
index a8e6084bea..ee49de53f6 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -84,8 +84,8 @@ my $set_version = 0;
 my $set_release = 0;
 my %version_pref = (
 	"version_major" => 2,
-	"version_minor" => 1,
-	"version_micro" => 2,
+	"version_minor" => 3,
+	"version_micro" => 0,
 	"version_build" => 0,
 
 	"enable"        => 1,
-- 
cgit v1.2.1