1.99.2 → 1.99.3.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f926218e15e65537592bbd5f9d4b12c064b47ca3..e014d27785dd55999c924eaf419a823cc66191ad 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,7 @@ include(CMakeInstallDirs)
 
 set(PROJECT_MAJOR_VERSION 1)
 set(PROJECT_MINOR_VERSION 99)
-set(PROJECT_PATCH_VERSION 2)
+set(PROJECT_PATCH_VERSION 3)
 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 74bbdf332028e6020adab7f147d51a82c2d42552..c7676c7182914b9086840b3c6fc61875a3ed0313 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -35,7 +35,7 @@ VCS_REVISION=0
 # Updated by make-version.pl
 VERSION_MAJOR=1
 VERSION_MINOR=99
-VERSION_MICRO=2
+VERSION_MICRO=3
 VERSION_BUILD=$(VCS_REVISION)
 
 # Local build information. Recommended: Unique string for your

diff --git a/configure.ac b/configure.ac
index c0f0faf3f045df3335499db59b5bf97a57eb7b12..47dc117c36864e06a305beb4955788a938d11981 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 #
 m4_define([version_major], [1])
 m4_define([version_minor], [99])
-m4_define([version_micro], [2])
+m4_define([version_micro], [3])
 m4_define([version_micro_extra], version_micro)
 m4_append([version_micro_extra], [])
 

diff --git a/debian/changelog b/debian/changelog
index f9f42cb83b5f69eb9c9306d6a259d4f834d7b99d..c5947af7285798ca42dd2df9b476b9933402d05f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.99.2) unstable; urgency=low
+wireshark (1.99.3) unstable; urgency=low
 
   * Self-made package
 

diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index 1771a04677a54bdf5f88f7157c94fb32e85beebe..0dda72f8f580825358dbd60e79f0a0642fa8de6b 100644 (file)
--- a/docbook/asciidoc.conf
+++ b/docbook/asciidoc.conf
@@ -4,7 +4,7 @@
 
 # Yes, these are fake macros.
 # We should probably replace some or all of them with attributes.
-wireshark-version:\[\]=1.99.2
+wireshark-version:\[\]=1.99.3
 wireshark-major-minor-version:\[\]=1.99
 
 wireshark-authors-url:\[\]=https://www.wireshark.org/about.html#authors

diff --git a/epan/Makefile.am b/epan/Makefile.am
index d87d5ca5d1f3dfcdcb0ec34bff26e69b174874dc..cbbfac3ef461f5aa69fe3a644e51aa3d5b8616b0 100644 (file)
--- 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:0:0 @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 0:3:0 @LDFLAGS_SHAREDLIB@
 
 include Makefile.common
 

diff --git a/make-version.pl b/make-version.pl
index c5295ea809e17552bcf7d036c1f0f1dce0525cd8..61eee31039dddfd716bdae72c9b8e6a3dba21a91 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -81,7 +81,7 @@ my $set_release = 0;
 my %version_pref = (
        "version_major" => 1,
        "version_minor" => 99,
-       "version_micro" => 2,
+       "version_micro" => 3,
        "version_build" => 0,
 
        "enable"        => 1,
@@ -91,12 +91,12 @@ my %version_pref = (
        "format"        => "git %Y%m%d%H%M%S",
 
        # Normal development builds
-       #"pkg_enable" => 1,
-       #"pkg_format" => "-%#",
+       "pkg_enable" => 1,
+       "pkg_format" => "-%#",
 
        # Development releases
-       "pkg_enable" => 0,
-       "pkg_format" => "",
+       #"pkg_enable" => 0,
+       #"pkg_format" => "",
        );
 my $srcdir = ".";
 my $info_cmd = "";

diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 859c8baa2d6d0858e85f0b6e476045e561792f68..b9144cd7babe5830d2c7f0d9c8e7fef308acbf33 100644 (file)
--- 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:0:0 @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 0:3:0 @LDFLAGS_SHAREDLIB@
 
 AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL