summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-02-04 13:00:52 -0800
committerGerald Combs <gerald@wireshark.org>2015-02-04 21:03:24 +0000
commit52b4059b1159924b3ee2b6b771c519a14bee56dd (patch)
treebaf0d9fb4d3d70c72e643e9800d0aa0269843180
parentb2db3bfd3bf684da5c1deb37c4a42f32a43238ad (diff)
downloadwireshark-52b4059b1159924b3ee2b6b771c519a14bee56dd.tar.gz
1.99.2 → 1.99.3.
Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638 Reviewed-on: https://code.wireshark.org/review/6956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--CMakeLists.txt2
-rw-r--r--config.nmake2
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog2
-rw-r--r--docbook/asciidoc.conf2
-rw-r--r--epan/Makefile.am2
-rwxr-xr-xmake-version.pl10
-rw-r--r--wiretap/Makefile.am2
8 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f926218e15..e014d27785 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 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})
diff --git a/config.nmake b/config.nmake
index 74bbdf3320..c7676c7182 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=2
+VERSION_MICRO=3
VERSION_BUILD=$(VCS_REVISION)
# Local build information. Recommended: Unique string for your
diff --git a/configure.ac b/configure.ac
index c0f0faf3f0..47dc117c36 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], [2])
+m4_define([version_micro], [3])
m4_define([version_micro_extra], version_micro)
m4_append([version_micro_extra], [])
diff --git a/debian/changelog b/debian/changelog
index f9f42cb83b..c5947af728 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.99.2) unstable; urgency=low
+wireshark (1.99.3) unstable; urgency=low
* Self-made package
diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index 1771a04677..0dda72f8f5 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.2
+wireshark-version:\[\]=1.99.3
wireshark-major-minor-version:\[\]=1.99
wireshark-authors-url:\[\]=https://www.wireshark.org/about.html#authors
diff --git a/epan/Makefile.am b/epan/Makefile.am
index d87d5ca5d1..cbbfac3ef4 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:0:0 @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 0:3:0 @LDFLAGS_SHAREDLIB@
include Makefile.common
diff --git a/make-version.pl b/make-version.pl
index c5295ea809..61eee31039 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" => 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 = "";
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 859c8baa2d..b9144cd7ba 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:0:0 @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 0:3:0 @LDFLAGS_SHAREDLIB@
AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL