Set major SO versions for release in CMake and debian/

Also fix debian/*.symbol file contents

Change-Id: I8c14aa69a04cc30d5667110ed31fdcef3baaf4aa
Reviewed-on: https://code.wireshark.org/review/11973
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>

11 files changed, 33 insertions, 29 deletions

diff --git a/debian/control b/debian/control
index e853edfb54..614578c4d4 100644
--- a/debian/control
+++ b/debian/control
@@ -133,13 +133,13 @@ Description: network traffic analyzer - documentation
  This package contains Wireshark User's guide, Wireshark Developer's Guide
  and the Lua Reference.
 
-Package: libwireshark0
+Package: libwireshark6
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark-data (>= ${source:Version}),
- libwsutil0 (>= ${source:Version})
+ libwsutil6 (>= ${source:Version})
 Suggests: wireshark-doc (>= ${source:Version})
 Conflicts: wireshark-common (<< 1.4.0~rc2-1)
 Replaces: wireshark-common (<< 1.4.0~rc2-1)
@@ -147,7 +147,7 @@ Description: network packet dissection library -- shared library
  The libwireshark library provides the network packet dissection services
  developed by the Wireshark project.
 
-Package: libwsutil0
+Package: libwsutil6
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -156,18 +156,18 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: wireshark-common (<< 1.4.0~rc2-1), libwireshark1 (<< 1.4.2-2)
 Replaces: wireshark-common (<< 1.4.0~rc2-1), libwireshark1 (<< 1.4.2-2)
 Description: network packet dissection utilities library -- shared library
- The libwsutil library provides utility functions for libwireshark05.
+ The libwsutil library provides utility functions for libwireshark6.
 
 Package: libwsutil-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends} , libwsutil0 (= ${binary:Version})
+Depends: ${misc:Depends} , libwsutil6 (= ${binary:Version})
 Conflicts: wireshark-common (<< 1.4.0~rc2-1), libwireshark-dev (<< 1.4.2-2),
  wireshark-dev (<< 1.4.0~rc2-1)
 Replaces: wireshark-common (<< 1.4.0~rc2-1), libwireshark-dev (<< 1.4.2-2),
  wireshark-dev (<< 1.4.0~rc2-1)
-Description: network packet dissection utilities library -- shared library
- The libwsutil library provides utility functions for libwireshark0.
+Description: network packet dissection utilities library -- development files
+ The libwsutil library provides utility functions for libwireshark6.
  .
  This package contains the static library and the C header files that are
  needed for applications to use the libwsutil library.
@@ -189,7 +189,7 @@ Description: network packet dissection library -- data files
 
 Package: libwireshark-dev
 Section: libdevel
-Depends: ${misc:Depends}, libwsutil-dev, libwireshark0 (= ${binary:Version})
+Depends: ${misc:Depends}, libwsutil-dev, libwireshark6 (= ${binary:Version})
 Conflicts: wireshark-dev (<< 1.4.0~rc2-1)
 Replaces: wireshark-dev (<< 1.4.0~rc2-1)
 Architecture: any
@@ -200,7 +200,7 @@ Description: network packet dissection library -- development files
  This package contains the static library and the C header files that are
  needed for applications to use libwireshark services.
 
-Package: libwiretap0
+Package: libwiretap5
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -235,7 +235,7 @@ Description: network packet capture library -- shared library
 
 Package: libwiretap-dev
 Section: libdevel
-Depends: ${misc:Depends}, libwiretap0 (= ${binary:Version})
+Depends: ${misc:Depends}, libwiretap5 (= ${binary:Version})
 Conflicts: wireshark-dev (<< 1.4.0~rc2-1)
 Replaces: wireshark-dev (<< 1.4.0~rc2-1)
 Architecture: any
diff --git a/debian/libwireshark0.install b/debian/libwireshark6.install
index 087cd229da..087cd229da 100644
--- a/debian/libwireshark0.install
+++ b/debian/libwireshark6.install
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark6.symbols
index c2e2a51058..6d0e361a47 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark6.symbols
@@ -1,20 +1,20 @@
-docsis.so libwireshark0 #MINVER#
+docsis.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-ethercat.so libwireshark0 #MINVER#
+ethercat.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-gryphon.so libwireshark0 #MINVER#
+gryphon.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-irda.so libwireshark0 #MINVER#
+irda.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-libwireshark.so.0 libwireshark0 #MINVER#
+libwireshark.so.6 libwireshark6 #MINVER#
  AdmissionRejectReason_vals@Base 1.9.1
  AirPDcapDestroyContext@Base 1.9.1
  AirPDcapInitContext@Base 1.9.1
@@ -1279,6 +1279,8 @@ libwireshark.so.0 libwireshark0 #MINVER#
  stats_tree_sort_compare@Base 1.12.0~rc1
  stats_tree_tick_pivot@Base 1.9.1
  stats_tree_tick_range@Base 1.9.1
+ str_to_ip6@Base 2.0.0
+ str_to_ip@Base 2.0.0
  str_to_str@Base 1.9.1
  str_to_val@Base 1.9.1
  str_to_val_idx@Base 1.9.1
@@ -1659,38 +1661,38 @@ libwireshark.so.0 libwireshark0 #MINVER#
  xml_get_attrib@Base 1.9.1
  xml_get_cdata@Base 1.9.1
  xml_get_tag@Base 1.9.1
-m2m.so libwireshark0 #MINVER#
+m2m.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-mate.so libwireshark0 #MINVER#
+mate.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-opcua.so libwireshark0 #MINVER#
+opcua.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-profinet.so libwireshark0 #MINVER#
+profinet.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-stats_tree.so libwireshark0 #MINVER#
+stats_tree.so libwireshark6 #MINVER#
  plugin_register_tap_listener@Base 1.9.1
  version@Base 1.9.1
-unistim.so libwireshark0 #MINVER#
+unistim.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-wimax.so libwireshark0 #MINVER#
+wimax.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-wimaxasncp.so libwireshark0 #MINVER#
+wimaxasncp.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
-wimaxmacphy.so libwireshark0 #MINVER#
+wimaxmacphy.so libwireshark6 #MINVER#
  plugin_reg_handoff@Base 1.9.1
  plugin_register@Base 1.9.1
  version@Base 1.9.1
diff --git a/debian/libwiretap0.docs b/debian/libwiretap5.docs
index 0c48271709..0c48271709 100644
--- a/debian/libwiretap0.docs
+++ b/debian/libwiretap5.docs
diff --git a/debian/libwiretap0.install b/debian/libwiretap5.install
index 6ca032e50e..6ca032e50e 100644
--- a/debian/libwiretap0.install
+++ b/debian/libwiretap5.install
diff --git a/debian/libwiretap0.symbols b/debian/libwiretap5.symbols
index 2b7bbf796a..405bf5e5df 100644
--- a/debian/libwiretap0.symbols
+++ b/debian/libwiretap5.symbols
@@ -1,4 +1,4 @@
-libwiretap.so.0 libwiretap0 #MINVER#
+libwiretap.so.5 libwiretap5 #MINVER#
  file_eof@Base 1.9.1
  file_error@Base 1.9.1
  file_getc@Base 1.9.1
@@ -40,6 +40,8 @@ libwiretap.so.0 libwiretap0 #MINVER#
  wtap_dump_open_ng@Base 1.9.1
  wtap_dump_open_stdout@Base 2.0.0
  wtap_dump_open_stdout_ng@Base 2.0.0
+ wtap_dump_open_tempfile@Base 2.0.0
+ wtap_dump_open_tempfile_ng@Base 2.0.0
  wtap_dump_set_addrinfo_list@Base 1.9.1
  wtap_dump_supports_comment_types@Base 1.9.1
  wtap_encap_requires_phdr@Base 1.9.1
diff --git a/debian/libwsutil0.install b/debian/libwsutil6.install
index e9f0761286..e9f0761286 100644
--- a/debian/libwsutil0.install
+++ b/debian/libwsutil6.install
diff --git a/debian/libwsutil0.symbols b/debian/libwsutil6.symbols
index 74edb34f8d..239a7ce97a 100644
--- a/debian/libwsutil0.symbols
+++ b/debian/libwsutil6.symbols
@@ -1,4 +1,4 @@
-libwsutil.so.0 libwsutil0 #MINVER#
+libwsutil.so.6 libwsutil6 #MINVER#
  AirPDcapWepDecrypt@Base 1.10.0
  Eax_Decrypt@Base 1.12.0~rc1
  add_plugin_type@Base 1.12.0~rc1
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 0f1b83a221..3e1b56c26c 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1755,7 +1755,7 @@ set(FULL_SO_VERSION "6.0.1")
 
 set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
 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 6)
 
 if(ENABLE_APPLICATION_BUNDLE)
 	set_target_properties(epan PROPERTIES
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index adb81caee0..d3f136caa3 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -115,7 +115,7 @@ set(FULL_SO_VERSION "5.0.1")
 set_target_properties(wiretap PROPERTIES
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
-	VERSION ${FULL_SO_VERSION} SOVERSION 0
+	VERSION ${FULL_SO_VERSION} SOVERSION 5
 	FOLDER "DLLs"
 )
 IF(MSVC)
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 9474073510..5ed4442df3 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -221,7 +221,7 @@ set_target_properties(wsutil PROPERTIES
 	PREFIX "lib"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
-	VERSION ${FULL_SO_VERSION} SOVERSION 0
+	VERSION ${FULL_SO_VERSION} SOVERSION 6
 	FOLDER "Libs")
 
 if(ENABLE_APPLICATION_BUNDLE)