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

1.99.2 → 1.99.3. 

Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638
Reviewed-on: https://code.wireshark.org/review/6956
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-02-04 13:00:52 -08:00
parent b2db3bfd3b
commit 52b4059b11
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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})

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=2
VERSION_MICRO=3
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], [2])
m4_define([version_micro], [3])
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.2) unstable; urgency=low
wireshark (1.99.3) 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.2
wireshark-version:\[\]=1.99.3
wireshark-major-minor-version:\[\]=1.99
wireshark-authors-url:\[\]=https://www.wireshark.org/about.html#authors

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:0:0 @LDFLAGS_SHAREDLIB@
libwireshark_la_LDFLAGS = -version-info 0:3: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" => 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 = "";

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:0:0 @LDFLAGS_SHAREDLIB@
libwiretap_la_LDFLAGS = -version-info 0:3:0 @LDFLAGS_SHAREDLIB@
AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL