Initialize 2.1.

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

11 files changed, 20 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b4f89a712..79db608efe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,9 +178,9 @@ include(CMakeInstallDirs)
 
 # Updated by make-version.pl
 set(GIT_REVISION 0)
-set(PROJECT_MAJOR_VERSION 1)
-set(PROJECT_MINOR_VERSION 99)
-set(PROJECT_PATCH_VERSION 10)
+set(PROJECT_MAJOR_VERSION 2)
+set(PROJECT_MINOR_VERSION 1)
+set(PROJECT_PATCH_VERSION 0)
 set(PROJECT_BUILD_VERSION ${GIT_REVISION})
 set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
 set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
diff --git a/config.nmake b/config.nmake
index 0233a71db6..42f2cb5907 100644
--- a/config.nmake
+++ b/config.nmake
@@ -33,9 +33,9 @@ VCS_REVISION=0
 
 # The current Wireshark version. Recommended: Leave unchanged.
 # Updated by make-version.pl
-VERSION_MAJOR=1
-VERSION_MINOR=99
-VERSION_MICRO=10
+VERSION_MAJOR=2
+VERSION_MINOR=1
+VERSION_MICRO=0
 VERSION_BUILD=$(VCS_REVISION)
 
 # Local build information. Recommended: Unique string for your
diff --git a/configure.ac b/configure.ac
index 92dc1329d8..592448d862 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,9 +5,9 @@
 #
 # Define variables for the components of the Wireshark version number.
 #
-m4_define([version_major], [1])
-m4_define([version_minor], [99])
-m4_define([version_micro], [10])
+m4_define([version_major], [2])
+m4_define([version_minor], [1])
+m4_define([version_micro], [0])
 m4_define([version_micro_extra], version_micro)
 m4_append([version_micro_extra], [])
 
diff --git a/debian/changelog b/debian/changelog
index 78ad77a56d..7954fcc8b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.99.10) unstable; urgency=low
+wireshark (2.1.0) unstable; urgency=low
 
   * Self-made package
 
diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index c651bb91b4..aba52ec090 100644
--- a/docbook/asciidoc.conf
+++ b/docbook/asciidoc.conf
@@ -4,8 +4,8 @@
 
 # Yes, these are fake macros.
 # We should probably replace some or all of them with attributes.
-wireshark-version:\[\]=1.99.10
-wireshark-major-minor-version:\[\]=1.99
+wireshark-version:\[\]=2.1.0
+wireshark-major-minor-version:\[\]=2.1
 
 wireshark-authors-url:\[\]=https://www.wireshark.org/about.html#authors
 wireshark-bugs-site:\[\]=https://bugs.wireshark.org/
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 86281ad504..33536e9188 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -17,7 +17,7 @@ used for troubleshooting, analysis, development and education.
 //* ws-buglink:5000[]
 //* ws-buglink:6000[Wireshark bug]
 //* cve-idlink:2014-2486[]
-//* Wireshark insists on calling you on your land line which is keeping you from abandoning it for cellular. (ws-buglink:0000[])
+//* Wireshark accepted your prom invitation then cancelled at the last minute. (ws-buglink:0000[])
 
 === New and Updated Features
 
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 644a2f3c50..1d600f487b 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1751,7 +1751,7 @@ add_library(epan ${LINK_MODE_LIB}
 	${CMAKE_BINARY_DIR}/image/libwireshark.rc
 )
 
-set(FULL_SO_VERSION "0.0.10")
+set(FULL_SO_VERSION "0.0.0")
 
 set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
 set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 6375382646..735b14d158 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -42,7 +42,7 @@ ACLOCAL_AMFLAGS = `../aclocal-flags`
 noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
 lib_LTLIBRARIES = libwireshark.la
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwireshark_la_LDFLAGS = -version-info 0:10:0 @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
 
 include Makefile.common
 
diff --git a/make-version.pl b/make-version.pl
index a2f4e64f0a..ad32647298 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -80,9 +80,9 @@ my $print_vcs = 0;
 my $set_version = 0;
 my $set_release = 0;
 my %version_pref = (
-	"version_major" => 1,
-	"version_minor" => 99,
-	"version_micro" => 10,
+	"version_major" => 2,
+	"version_minor" => 1,
+	"version_micro" => 0,
 	"version_build" => 0,
 
 	"enable"        => 1,
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 22c42860f2..328012fd13 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -110,7 +110,7 @@ add_library(wiretap ${LINK_MODE_LIB}
 	${CMAKE_BINARY_DIR}/image/wiretap.rc
 )
 
-set(FULL_SO_VERSION "0.0.10")
+set(FULL_SO_VERSION "0.0.0")
 
 set_target_properties(wiretap PROPERTIES
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 8f5f2e68bd..859c8baa2d 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -28,7 +28,7 @@ include Makefile.common
 noinst_LTLIBRARIES = libwiretap_generated.la
 lib_LTLIBRARIES = libwiretap.la
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwiretap_la_LDFLAGS = -version-info 0:10:0 @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
 
 AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL