Initialize 2.1.
authorGerald Combs <gerald@wireshark.org>
Mon, 5 Oct 2015 20:09:52 +0000 (13:09 -0700)
committerGerald Combs <gerald@wireshark.org>
Mon, 5 Oct 2015 20:11:12 +0000 (20:11 +0000)
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5
Reviewed-on: https://code.wireshark.org/review/10810
Reviewed-by: Gerald Combs <gerald@wireshark.org>
CMakeLists.txt
config.nmake
configure.ac
debian/changelog
docbook/asciidoc.conf
docbook/release-notes.asciidoc
epan/CMakeLists.txt
epan/Makefile.am
make-version.pl
wiretap/CMakeLists.txt
wiretap/Makefile.am

index 7b4f89a7125395774e9735293766f0f109408bfe..79db608efe3906857c22e3bea180d2d1f0a3cab2 100644 (file)
@@ -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}")
index 0233a71db6dd8b79b4abac0cfade2d4034b4bb40..42f2cb5907023a9a89ee5233dae2b92dfcb7e7b7 100644 (file)
@@ -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
index 92dc1329d8e4067a179f5332a236f57bbf2572ca..592448d862a0af30319ef84c01525a3f267bcb81 100644 (file)
@@ -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], [])
 
index 78ad77a56d9d4af87520aaaec9ac7a42ae3e97d6..7954fcc8b7731e67bb317e8ff5952652b4b87664 100644 (file)
@@ -1,4 +1,4 @@
-wireshark (1.99.10) unstable; urgency=low
+wireshark (2.1.0) unstable; urgency=low
 
   * Self-made package
 
index c651bb91b4b54bc95725659bc722beb56ab12f7c..aba52ec090b2c72ed9b18c11663ba88674c8c9e3 100644 (file)
@@ -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/
index 86281ad504123c47ef733ab7a933eadc21213e77..33536e9188315adaa5eea64e4aa8e69d6b05a39a 100644 (file)
@@ -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
 
index 644a2f3c50d290fef65c4cc30cc22db924de2e90..1d600f487be9ced52f4d0dbea64f19db2a4ef5de 100644 (file)
@@ -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}")
index 6375382646c990b9d48cf6066b66c14e21b08cbc..735b14d158f5f66ec72e76ff3ff113e261949f85 100644 (file)
@@ -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
 
index a2f4e64f0abe1c175b2d81bff00cb38184f05c81..ad32647298677f4241348e866a2bbee4d2e8cfa9 100755 (executable)
@@ -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,
index 22c42860f2d4828ab7acd58aba86c4a5e593bb25..328012fd13a40543f0b1b45ad81fa77471e8faa3 100644 (file)
@@ -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"
index 8f5f2e68bdaaebd52b535f75168191f6c310d5ae..859c8baa2d6d0858e85f0b6e476045e561792f68 100644 (file)
@@ -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