2.1.2 → 2.3.0.
authorGerald Combs <gerald@wireshark.org>
Thu, 21 Jul 2016 22:53:54 +0000 (15:53 -0700)
committerGerald Combs <gerald@wireshark.org>
Thu, 21 Jul 2016 22:55:48 +0000 (22:55 +0000)
Change-Id: I133af2d3d05ae77c1030cf35812bb1f969f6a68b
Reviewed-on: https://code.wireshark.org/review/16575
Reviewed-by: Gerald Combs <gerald@wireshark.org>
CMakeLists.txt
configure.ac
debian/changelog
docbook/asciidoc.conf
docbook/release-notes.asciidoc
make-version.pl

index 968c326032ee76e3d6bd0aae7afbec6b7fc6bd74..488e451e72fb039dd0df0e41c69021882abae3ce 100644 (file)
@@ -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}")
index cdd0f3357374bed94fb7636ab82c6022913b2708..4a8fa9079f6613b9b9e7d830b5a51fd52156a422 100644 (file)
@@ -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/)
index 5168bc5ee1bc817ea19db0c57f11d0ac6e2af9e8..0338e523135bcf741618ea6e9831e2c1a5a6f8c4 100644 (file)
@@ -1,4 +1,4 @@
-wireshark (2.1.2) unstable; urgency=low
+wireshark (2.3.0) unstable; urgency=low
 
   * Self-made package
 
index ec9a5cf2908d85f7cd424f357c56d8832b8c3c77..667873935a0289c277ee91644a2b619095466512 100644 (file)
@@ -2,7 +2,7 @@
 
 [attributes]
 
-wireshark-version=2.1.2
+wireshark-version=2.3.0
 
 [replacements]
 
index 897b7e15c9949e69e0057ec475acbcb34ce66289..07b73f2839f004b4b9aa62ea034f32a8b70ca2f0 100644 (file)
@@ -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._
 
index a8e6084bea13259224f0e7559711602e7d8416c2..ee49de53f6a0a8e37f43046c3f26c1093fd7736b 100755 (executable)
@@ -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,