1.99.4 → 1.99.5.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f046c4db64970106d0d3a2046e08914c6101e4a6..1578ab005d9d877cb407d3d780c833ef24e3bcbc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,7 @@ include(CMakeInstallDirs)
 set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 1)
 set(PROJECT_MINOR_VERSION 99)
 set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 1)
 set(PROJECT_MINOR_VERSION 99)

-set(PROJECT_PATCH_VERSION 4)
+set(PROJECT_PATCH_VERSION 5)

 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}")
 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 e82a862112a2b75e2f083b6e011f2fb04d12a198..8fa5deb8dcb059de9c6065fa14ecb1ebc2ce46f4 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
 # Updated by make-version.pl
 VERSION_MAJOR=1
 VERSION_MINOR=99

-VERSION_MICRO=4
+VERSION_MICRO=5

 VERSION_BUILD=$(VCS_REVISION)
 
 # Local build information. Recommended: Unique string for your
 VERSION_BUILD=$(VCS_REVISION)
 
 # Local build information. Recommended: Unique string for your

diff --git a/configure.ac b/configure.ac
index 06a3d890d4f9d1305e37e7ab737164f2f6917329..cac13d0a96f87f422da32450158780b7c09634f0 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_major], [1])
 m4_define([version_minor], [99])

-m4_define([version_micro], [4])
+m4_define([version_micro], [5])

 m4_define([version_micro_extra], version_micro)
 m4_append([version_micro_extra], [])
 
 m4_define([version_micro_extra], version_micro)
 m4_append([version_micro_extra], [])
 

diff --git a/debian/changelog b/debian/changelog
index 2209ebef93e3b4d4a83243c2cdd672c66f9df474..5af93540061e16abd1adda00705a9bd369a30211 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.99.4) unstable; urgency=low
+wireshark (1.99.5) unstable; urgency=low

 
   * Self-made package
 
 
   * Self-made package
 

diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index 95c930be8f25886066dfbf386e31438ccfc72e79..7b609e101b804fbf700a7bb984ce49e093f6f5dd 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.
 
 # Yes, these are fake macros.
 # We should probably replace some or all of them with attributes.

-wireshark-version:\[\]=1.99.4
+wireshark-version:\[\]=1.99.5

 wireshark-major-minor-version:\[\]=1.99
 
 wireshark-authors-url:\[\]=https://www.wireshark.org/about.html#authors
 wireshark-major-minor-version:\[\]=1.99
 
 wireshark-authors-url:\[\]=https://www.wireshark.org/about.html#authors

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index a6da8f9e4509f2ffd5f5029595e52f6529cadf28..8784b1abb2dda3005c175c0468f93ecd57838dd8 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1728,7 +1728,7 @@ add_library(epan ${LINK_MODE_LIB}
        ${CMAKE_BINARY_DIR}/image/libwireshark.rc
 )
 
        ${CMAKE_BINARY_DIR}/image/libwireshark.rc
 )
 

-set(FULL_SO_VERSION "0.0.4")
+set(FULL_SO_VERSION "0.0.5")

 
 set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
 set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 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 7ed74c8bafddc6be6e54a20b5470a557a9fd3ec4..b1e88a3ad5e558e6e883c52f2e2c7320bbc36324 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
 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:4:0 @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 0:5:0 @LDFLAGS_SHAREDLIB@

 
 include Makefile.common
 
 
 include Makefile.common
 

diff --git a/make-version.pl b/make-version.pl
index e32a1595d8112f957756e7c8f5711788feea4fa4..8652dc92c8ced2abf12301c4c8960813937ed0ba 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,
 my %version_pref = (
        "version_major" => 1,
        "version_minor" => 99,

-       "version_micro" => 4,
+       "version_micro" => 5,

        "version_build" => 0,
 
        "enable"        => 1,
        "version_build" => 0,
 
        "enable"        => 1,


@@ -91,12 +91,12 @@ my %version_pref = (
        "format"        => "git %Y%m%d%H%M%S",
 
        # Normal development builds
        "format"        => "git %Y%m%d%H%M%S",
 
        # Normal development builds

-       #"pkg_enable" => 1,
-       #"pkg_format" => "-%#",
+       "pkg_enable" => 1,
+       "pkg_format" => "-%#",

 
        # Development releases
 
        # Development releases

-       "pkg_enable" => 0,
-       "pkg_format" => "",
+       #"pkg_enable" => 0,
+       #"pkg_format" => "",

        );
 my $srcdir = ".";
 my $info_cmd = "";
        );
 my $srcdir = ".";
 my $info_cmd = "";

diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 599dc5f0c88cbe70b971751a52790ac84bafb139..da7d1817b2661234637d2c7d9eb6211a9c7315a0 100644 (file)
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -109,7 +109,7 @@ add_library(wiretap ${LINK_MODE_LIB}
        ${CMAKE_BINARY_DIR}/image/wiretap.rc
 )
 
        ${CMAKE_BINARY_DIR}/image/wiretap.rc
 )
 

-set(FULL_SO_VERSION "0.0.4")
+set(FULL_SO_VERSION "0.0.5")

 
 set_target_properties(wiretap PROPERTIES
        COMPILE_DEFINITIONS "WS_BUILD_DLL"
 
 set_target_properties(wiretap PROPERTIES
        COMPILE_DEFINITIONS "WS_BUILD_DLL"

diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 04900bf4934660a822942e61311123b1ed03851b..5c2d868e1d2316b57f65dd24a8b123c05e19cad1 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
 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:4:0 @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 0:5:0 @LDFLAGS_SHAREDLIB@

 
 AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL
 
 
 AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL