Initialize master-2.4.

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

21 files changed, 38 insertions, 31 deletions

diff --git a/.gitreview b/.gitreview
index 6e80490ddb..d276b9eb9b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@ host=code.wireshark.org
 port=29418
 project=wireshark.git
 defaultremote=origin
-defaultbranch=master
+defaultbranch=master-2.4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5a8ce9f93..f67a1ff6bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ project(Wireshark C CXX)
 # Updated by make-version.pl
 set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 2)
-set(PROJECT_MINOR_VERSION 3)
+set(PROJECT_MINOR_VERSION 4)
 set(PROJECT_PATCH_VERSION 0)
 set(PROJECT_BUILD_VERSION ${GIT_REVISION})
 set(PROJECT_VERSION_EXTENSION "")
@@ -191,8 +191,8 @@ include(CMakeInstallDirs)
 # Banner shown at top right of Qt welcome screen.
 if(DEFINED ENV{WIRESHARK_VERSION_FLAVOR})
 	set(VERSION_FLAVOR "$ENV{WIRESHARK_VERSION_FLAVOR}")
-else()
-	set(VERSION_FLAVOR "Development Build")
+#else()
+#	set(VERSION_FLAVOR "Development Build")
 endif()
 
 # These are required in .rc files and manifests
diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index 5963ddaa4c..76f09b0efa 100644
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -21,7 +21,7 @@ option(BUILD_randpktdump   "Build randpktdump" ON)
 option(BUILD_udpdump       "Build udpdump" ON)
 option(BUILD_sharkd        "Build sharkd" ON)
 
-option(DISABLE_WERROR    "Do not treat warnings as errors" OFF)
+option(DISABLE_WERROR    "Do not treat warnings as errors" ON)
 option(EXTCAP_ANDROIDDUMP_LIBPCAP    "Build androiddump using libpcap" OFF)
 option(ENABLE_EXTRA_COMPILER_WARNINGS "Do additional compiler warnings (disables -Werror)" OFF)
 option(ENABLE_CODE_ANALYSIS "Enable the compiler's static analyzer if possible" OFF)
diff --git a/configure.ac b/configure.ac
index b966aabbb6..096977f89a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 # Define variables for the components of the Wireshark version number.
 #
 m4_define([version_major], [2])
-m4_define([version_minor], [3])
+m4_define([version_minor], [4])
 m4_define([version_micro], [0])
 dnl Updated by make-version.pl
 m4_define([version_extra], [])
@@ -57,8 +57,8 @@ AC_DEFINE(VERSION_MAJOR, version_major, [Wireshark's major version])
 AC_DEFINE(VERSION_MINOR, version_minor, [Wireshark's minor version])
 AC_DEFINE(VERSION_MICRO, version_micro, [Wireshark's micro version])
 
-AC_DEFINE_UNQUOTED(VERSION_FLAVOR,
-	["${WIRESHARK_VERSION_FLAVOR:-"Development Build"}"], [Wireshark's package flavor])
+dnl AC_DEFINE_UNQUOTED(VERSION_FLAVOR,
+dnl 	["${WIRESHARK_VERSION_FLAVOR:-"Development Build"}"], [Wireshark's package flavor])
 
 LT_PREREQ([2.2.2])
 LT_INIT([disable-static dlopen])
@@ -967,11 +967,11 @@ AC_WIRESHARK_GCC_FORTIFY_SOURCE_CHECK
 # This barrier is set for a very large part of the code. However, it is
 # typically not set for "generated" code  (flex, ans2wrs, idl2wrs, ...)
 #
-warnings_as_errors_default="yes"
+warnings_as_errors_default="no"
 AC_MSG_CHECKING(whether we should treat compiler warnings as errors)
 AC_ARG_ENABLE(warnings-as-errors,
   AC_HELP_STRING( [--enable-warnings-as-errors],
-		  [treat warnings as errors (only for GCC or clang) @<:@default=yes, unless extra compiler warnings are enabled@:>@]),
+		  [treat warnings as errors (only for GCC or clang) @<:@default=no@:>@]),
 [
   if test "x$ac_supports_gcc_flags" = "xyes" -a "x$enableval" = "xyes"; then
     with_warnings_as_errors="yes"
diff --git a/debian/changelog b/debian/changelog
index 5f839a5bfc..29bda0a5e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (2.3.0) unstable; urgency=low
+wireshark (2.4.0) unstable; urgency=low
 
   * Self-made package
 
diff --git a/docbook/attributes.asciidoc b/docbook/attributes.asciidoc
index bc5e776604..857071cafe 100644
--- a/docbook/attributes.asciidoc
+++ b/docbook/attributes.asciidoc
@@ -1,6 +1,6 @@
 // Common attributes
 
-:wireshark-version: 2.3.0
+:wireshark-version: 2.4.0
 
 //
 // URLs
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 4978191ee0..1b6c2b9e90 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -3,8 +3,7 @@ include::attributes.asciidoc[]
 = Wireshark {wireshark-version} Release Notes
 // AsciiDoc quick reference: http://powerman.name/doc/asciidoc
 
-This is a semi-experimental release intended to test new features for
-Wireshark 2.4.
+This is the first release candidate for Wireshark 2.4.0.
 
 == What is Wireshark?
 
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 1d3c7ac150..c19be49359 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -243,12 +243,12 @@ add_library(epan ${LINK_MODE_LIB}
 
 add_dependencies(epan version)
 
-set(FULL_SO_VERSION "0.0.0")
+set(FULL_SO_VERSION "10.0.0")
 
 set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
 set_target_properties(epan PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}")
 set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(epan PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0)
+set_target_properties(epan PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 10)
 
 if(ENABLE_APPLICATION_BUNDLE)
 	set_target_properties(epan PROPERTIES
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 2ec26f24a1..91b82a0fef 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -306,7 +306,7 @@ libwireshark_la_SOURCES = \
 libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_BIGSHAREDLIB@ @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 10:0:0 @LDFLAGS_BIGSHAREDLIB@ @LDFLAGS_SHAREDLIB@
 
 #
 # Add the object files for missing routines, if any.
diff --git a/make-version.pl b/make-version.pl
index 36cbf7e750..f9bbd8e9ca 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -84,7 +84,7 @@ my $set_version = 0;
 my $set_release = 0;
 my %version_pref = (
 	"version_major" => 2,
-	"version_minor" => 3,
+	"version_minor" => 4,
 	"version_micro" => 0,
 	"version_build" => 0,
 
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1
index fec9c1bd47..db51b10de1 100644
--- a/tools/win-setup.ps1
+++ b/tools/win-setup.ps1
@@ -69,12 +69,12 @@ their compressed archives.
 A date stamp (current-tag.txt)
 
 .EXAMPLE
-C:\PS> .\tools\win-setup.ps1 -Destination C:\wireshark-master-64-libs -Platform win64
+C:\PS> .\tools\win-setup.ps1 -Destination C:\wireshark-win64-libs-2.4 -Platform win64
 #>
 
 Param(
     [Parameter(Mandatory=$true, Position=0)]
-    [ValidateScript({$_ -like "*\wireshark-*-libs"})]
+    [ValidateScript({$_ -like "*\wireshark-*-libs-2.4"})]
     [String]
     $Destination,
 
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index 57635a8daa..d0d3c6fafc 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -443,7 +443,7 @@ pixbuf_csource_data = \
 	wsiconcap_64_pb_data				\
 	$(imagedir)/wsiconcap64.png			\
 	wssplash_pb_data				\
-	$(imagedir)/wssplash_dev.png
+	$(imagedir)/wssplash.png
 
 pixbuf-csource:
 	$(PERL) $(top_srcdir)/tools/make-pixbuf-csource.pl $@ $(pixbuf_csource_data)
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index 020452c1ca..22ca841c56 100644
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@@ -89,7 +89,7 @@ about_wireshark(GtkWidget *parent _U_, GtkWidget *main_vb)
 
   /*icon = xpm_to_widget_from_parent(parent, wssplash_xpm);*/
 #ifdef HAVE_GDK_GRESOURCE
-  icon = pixbuf_to_widget("/org/wireshark/image/wssplash_dev.png");
+  icon = pixbuf_to_widget("/org/wireshark/image/wssplash.png");
 #else
   icon = pixbuf_to_widget(wssplash_pb_data);
 #endif
diff --git a/ui/gtk/main.gresources.xml b/ui/gtk/main.gresources.xml
index 54a4c6d8d9..f1c2d1f692 100644
--- a/ui/gtk/main.gresources.xml
+++ b/ui/gtk/main.gresources.xml
@@ -14,7 +14,6 @@
         <file>image/wsiconcap64.png</file>
 
         <file>image/wssplash.png</file>
-        <file>image/wssplash_dev.png</file>
 
         <file>image/layout_1.png</file>
         <file>image/layout_2.png</file>
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index a37593fe4b..34ff3bdef0 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -373,7 +373,7 @@ welcome_header_new(void)
     gtk_box_pack_start(GTK_BOX(item_vb), item_hb, FALSE, FALSE, 10);
 
 #ifdef HAVE_GDK_GRESOURCE
-    icon = pixbuf_to_widget("/org/wireshark/image/wssplash_dev.png");
+    icon = pixbuf_to_widget("/org/wireshark/image/wssplash.png");
 #else
     icon = pixbuf_to_widget(wssplash_pb_data);
 #endif
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index ecbd0660d5..31dc581e86 100644
--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@@ -185,7 +185,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
 
 /* Check if it is a dev release... (VERSION_MINOR is odd in dev release) */
 #if VERSION_MINOR & 1
-        ui->label_logo->setPixmap(QPixmap(":/about/wssplash_dev.png"));
+        ui->label_logo->setPixmap(QPixmap(":/about/wssplash.png"));
 #endif
 
     /* Authors */
diff --git a/version.conf b/version.conf
new file mode 100644
index 0000000000..9480b2f829
--- /dev/null
+++ b/version.conf
@@ -0,0 +1,9 @@
+# Interim releases: Enable packaging, add a "rc" to the version.
+#enable: 1
+#pkg_format: rc0-%#
+#pkg_enable: 1
+
+# Final release: Disable package version stamps.
+enable: 1
+pkg_format:
+pkg_enable: 0
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 5ff2f1ef39..01792cd8af 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -114,14 +114,14 @@ add_library(wiretap ${LINK_MODE_LIB}
 
 add_dependencies(wiretap version)
 
-set(FULL_SO_VERSION "0.0.0")
+set(FULL_SO_VERSION "7.0.0")
 
 set_target_properties(wiretap PROPERTIES
 	PREFIX "lib"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
-	VERSION ${FULL_SO_VERSION} SOVERSION 0
+	VERSION ${FULL_SO_VERSION} SOVERSION 7
 	FOLDER "DLLs"
 )
 
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 5e20f351e5..ef2bd4848c 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -189,7 +189,7 @@ libwiretap_la_SOURCES = \
 	ws_version_info.c
 
 # 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 7:0:0 @LDFLAGS_SHAREDLIB@
 
 libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS)
 
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index ab9bb7ba82..474992105c 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -206,14 +206,14 @@ add_library(wsutil ${LINK_MODE_LIB}
 	${CMAKE_BINARY_DIR}/image/libwsutil.rc
 )
 
-set(FULL_SO_VERSION "0.0.0")
+set(FULL_SO_VERSION "8.0.0")
 
 set_target_properties(wsutil PROPERTIES
 	PREFIX "lib"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
-	VERSION ${FULL_SO_VERSION} SOVERSION 0
+	VERSION ${FULL_SO_VERSION} SOVERSION 8
 	FOLDER "DLLs")
 
 if(ENABLE_APPLICATION_BUNDLE)
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index a92982d61a..4df5d423e2 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -166,7 +166,7 @@ libwsutil_sse42_la_SOURCES = \
 libwsutil_sse42_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_SSE42)
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwsutil_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
+libwsutil_la_LDFLAGS = -version-info 8:0:0 @LDFLAGS_SHAREDLIB@
 
 libwsutil_la_LIBADD = \
 	$(LTLIBOBJS)			\