diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-03-05 12:15:53 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-03-05 20:15:36 +0000 |
commit | 89270fbe0fd70fda8d27dc3195c00a92a48d675d (patch) | |
tree | 89b7fdfaeabd53dc64e765a58b0921e9626beb0e | |
parent | 4f2c82741f91a7ba78e88c4a719a0dded5c4bcfd (diff) | |
download | wireshark-89270fbe0fd70fda8d27dc3195c00a92a48d675d.tar.gz |
1.99.3 → 1.99.4.
Change-Id: I96953b6ca34140972a783c3066614399981ca1e2
Reviewed-on: https://code.wireshark.org/review/7549
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | config.nmake | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | docbook/asciidoc.conf | 2 | ||||
-rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
-rw-r--r-- | epan/Makefile.am | 2 | ||||
-rwxr-xr-x | make-version.pl | 10 | ||||
-rw-r--r-- | wiretap/CMakeLists.txt | 2 | ||||
-rw-r--r-- | wiretap/Makefile.am | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f0eaa790d..7b57da5b56 100644 --- 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 3) +set(PROJECT_PATCH_VERSION 4) 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 33d897f55d..3dcae8fd59 100644 --- 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=3 +VERSION_MICRO=4 VERSION_BUILD=$(VCS_REVISION) # Local build information. Recommended: Unique string for your diff --git a/configure.ac b/configure.ac index ab37da80a4..06a3d890d4 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # m4_define([version_major], [1]) m4_define([version_minor], [99]) -m4_define([version_micro], [3]) +m4_define([version_micro], [4]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], []) diff --git a/debian/changelog b/debian/changelog index c5947af728..2209ebef93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.99.3) unstable; urgency=low +wireshark (1.99.4) unstable; urgency=low * Self-made package diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index 0dda72f8f5..117c54aa9d 100644 --- 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.3 +wireshark-version:\[\]=1.99.4 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 b502fd13fb..9ed41189d9 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1724,7 +1724,7 @@ add_library(epan ${LINK_MODE_LIB} ${CMAKE_BINARY_DIR}/image/libwireshark.rc ) -set(FULL_SO_VERSION "0.0.3") +set(FULL_SO_VERSION "0.0.4") 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 ac19b3f7a1..df2e3200b4 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:3:0 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 0:4:0 @LDFLAGS_SHAREDLIB@ include Makefile.common diff --git a/make-version.pl b/make-version.pl index 5dfa72291f..53d3094364 100755 --- 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" => 3, + "version_micro" => 4, "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/CMakeLists.txt b/wiretap/CMakeLists.txt index b1578d0605..599dc5f0c8 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -109,7 +109,7 @@ add_library(wiretap ${LINK_MODE_LIB} ${CMAKE_BINARY_DIR}/image/wiretap.rc ) -set(FULL_SO_VERSION "0.0.3") +set(FULL_SO_VERSION "0.0.4") set_target_properties(wiretap PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index b9144cd7ba..04900bf493 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:3:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 0:4:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL |