osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

1.99.4 → 1.99.5. 

Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26
Reviewed-on: https://code.wireshark.org/review/7759
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-03-19 12:12:34 -07:00
parent e60b826a01
commit cc7e565711
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -96,7 +96,7 @@ include(CMakeInstallDirs)
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}")

2
config.nmake
View File

@ -35,7 +35,7 @@ VCS_REVISION=0
# 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

2
configure.ac
View File

@ -7,7 +7,7 @@
#
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], [])

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
wireshark (1.99.4) unstable; urgency=low
wireshark (1.99.5) unstable; urgency=low
* Self-made package

2
docbook/asciidoc.conf
View File

@ -4,7 +4,7 @@
# 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

2
epan/CMakeLists.txt
View File

@ -1728,7 +1728,7 @@ add_library(epan ${LINK_MODE_LIB}
${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}")

2
epan/Makefile.am
View 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:4:0 @LDFLAGS_SHAREDLIB@
libwireshark_la_LDFLAGS = -version-info 0:5:0 @LDFLAGS_SHAREDLIB@
include Makefile.common

10
make-version.pl
View File

@ -81,7 +81,7 @@ my $set_release = 0;
my %version_pref = (
"version_major" => 1,
"version_minor" => 99,
"version_micro" => 4,
"version_micro" => 5,
"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 = "";

2
wiretap/CMakeLists.txt
View File

@ -109,7 +109,7 @@ add_library(wiretap ${LINK_MODE_LIB}
${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"

2
wiretap/Makefile.am
View 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:4:0 @LDFLAGS_SHAREDLIB@
libwiretap_la_LDFLAGS = -version-info 0:5:0 @LDFLAGS_SHAREDLIB@
AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL