1.99.7 → 1.99.8v1.99.8rc0

Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17
Reviewed-on: https://code.wireshark.org/review/8979
Reviewed-by: Gerald Combs <gerald@wireshark.org>

11 files changed, 19 insertions, 14 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 728b92f1c0..2dec9a570e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,7 @@ include(CMakeInstallDirs)
 set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 1)
 set(PROJECT_MINOR_VERSION 99)
-set(PROJECT_PATCH_VERSION 7)
+set(PROJECT_PATCH_VERSION 8)
 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 c52c201ba1..d2b5d78938 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=7
+VERSION_MICRO=8
 VERSION_BUILD=$(VCS_REVISION)
 
 # Local build information. Recommended: Unique string for your
diff --git a/configure.ac b/configure.ac
index 8b9778b8bd..71deda76f1 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], [7])
+m4_define([version_micro], [8])
 m4_define([version_micro_extra], version_micro)
 m4_append([version_micro_extra], [])
 
diff --git a/debian/changelog b/debian/changelog
index dc46e1964b..51d59dfd21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.99.7) unstable; urgency=low
+wireshark (1.99.8) unstable; urgency=low
 
   * Self-made package
 
diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index a3412bd165..989a23960a 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.7
+wireshark-version:\[\]=1.99.8
 wireshark-major-minor-version:\[\]=1.99
 
 wireshark-authors-url:\[\]=https://www.wireshark.org/about.html#authors
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index ec668135cf..ecf65ca57c 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -24,6 +24,11 @@ used for troubleshooting, analysis, development and education.
 The following features are new (or have been significantly updated)
 since version 1.99.6:
 
+// Quick! Do something! Check in some code!
+
+The following features are new (or have been significantly updated)
+since version 1.99.6:
+
 * Qt port:
 
 ** The Bluetooth Devices dialog has been added.
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 9de53140fe..c972107b08 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1737,7 +1737,7 @@ add_library(epan ${LINK_MODE_LIB}
 	${CMAKE_BINARY_DIR}/image/libwireshark.rc
 )
 
-set(FULL_SO_VERSION "0.0.7")
+set(FULL_SO_VERSION "0.0.8")
 
 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 f758182524..f9d2da030c 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:7:0 @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 0:8:0 @LDFLAGS_SHAREDLIB@
 
 include Makefile.common
 
diff --git a/make-version.pl b/make-version.pl
index d9d27c69ab..96d2f37ef1 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" => 7,
+	"version_micro" => 8,
 	"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 c6306c7615..0c595c2083 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -110,7 +110,7 @@ add_library(wiretap ${LINK_MODE_LIB}
 	${CMAKE_BINARY_DIR}/image/wiretap.rc
 )
 
-set(FULL_SO_VERSION "0.0.7")
+set(FULL_SO_VERSION "0.0.8")
 
 set_target_properties(wiretap PROPERTIES
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 7493f622ac..4e124b578e 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:7:0 @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 0:8:0 @LDFLAGS_SHAREDLIB@
 
 AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL