diff options
| -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 1578ab005d..31ec4c9c2f 100644 --- 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(PROJECT_PATCH_VERSION 5) +set(PROJECT_PATCH_VERSION 6) 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 8fa5deb8dc..19c9723760 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=5 +VERSION_MICRO=6 VERSION_BUILD=$(VCS_REVISION) # Local build information. Recommended: Unique string for your diff --git a/configure.ac b/configure.ac index cac13d0a96..62fce43336 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], [5]) +m4_define([version_micro], [6]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], []) diff --git a/debian/changelog b/debian/changelog index 5af9354006..72f9f8d72d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.99.5) unstable; urgency=low +wireshark (1.99.6) unstable; urgency=low * Self-made package diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index 7b609e101b..cb4bbae5df 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.5 +wireshark-version:\[\]=1.99.6 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 8784b1abb2..c6a7b10848 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1728,7 +1728,7 @@ add_library(epan ${LINK_MODE_LIB} ${CMAKE_BINARY_DIR}/image/libwireshark.rc ) -set(FULL_SO_VERSION "0.0.5") +set(FULL_SO_VERSION "0.0.6") 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 b1e88a3ad5..91b7395165 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:5:0 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 0:6:0 @LDFLAGS_SHAREDLIB@ include Makefile.common diff --git a/make-version.pl b/make-version.pl index 9ff8ef57d3..da4317ef78 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" => 5, + "version_micro" => 6, "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 da7d1817b2..fc00413532 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.5") +set(FULL_SO_VERSION "0.0.6") set_target_properties(wiretap PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 5c2d868e1d..3fc9ccbf2f 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:5:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 0:6:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL |