Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 87 insertions, 56 deletions

diff --git a/packaging/debian/control b/packaging/debian/control
index 1268132d..0c713b96 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,25 +1,62 @@
 Source: wireshark
 Section: net
 Priority: optional
-Maintainer: Balint Reczey <rbalint@ubuntu.com>
+Maintainer: Wireshark Self-made package <wireshark@example.com>
 Standards-Version: 3.9.8
-Build-Depends:
- qtbase5-dev, qtbase5-dev-tools, qttools5-dev, qttools5-dev-tools,
- qtmultimedia5-dev,
- libpcap0.8-dev, flex, libz-dev, debhelper (>= 12), po-debconf,
- python3, python3-ply, libc-ares-dev, xsltproc, dh-python,
- docbook-xsl (>= 1.64.1.0-0), docbook-xml, libxml2-utils, libpcre2-dev,
- libcap2-dev [linux-any] | libcap-dev (>= 2.17) [linux-any], lsb-release,
- quilt, libparse-yapp-perl,
-# libgnutls28-dev >= 3.2.14-1 is GPLv2+ compatible.
- libgnutls28-dev (>= 3.2.14-1~),
- libgcrypt-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev,
- libmaxminddb-dev, dpkg-dev (>= 1.16.1~), libsystemd-dev | libsystemd-journal-dev,
- libnl-genl-3-dev [linux-any], libnl-route-3-dev [linux-any], asciidoctor,
- cmake (>= 3.5) | cmake3, libsbc-dev, libnghttp2-dev, libnghttp3-dev,
- libssh-gcrypt-dev,
- liblz4-dev, libsnappy-dev, libzstd-dev, libspandsp-dev, libxml2-dev, libbrotli-dev,
- libspeexdsp-dev
+# Should be roughly in sync with https://salsa.debian.org/debian/wireshark/-/blob/debian/master/debian/control
+Build-Depends: asciidoctor,
+               cmake (>= 3.5),
+               debhelper (>= 12),
+               dh-python,
+               docbook-xml,
+               docbook-xsl,
+               flex,
+               libbcg729-dev,
+               libbrotli-dev,
+               libc-ares-dev,
+               libcap2-dev | libcap-dev,
+               libgcrypt-dev,
+               libglib2.0-dev,
+               libgnutls28-dev,
+               libkrb5-dev,
+               liblua5.4-dev | liblua5.3-dev,
+               liblz4-dev,
+               libmaxminddb-dev,
+               libminizip-dev,
+               libnghttp2-dev,
+               libnghttp3-dev,
+               libnl-genl-3-dev [linux-any],
+               libnl-route-3-dev [linux-any],
+               libopencore-amrnb-dev,
+               libopus-dev,
+               libparse-yapp-perl,
+               libpcap0.8-dev,
+               libsbc-dev,
+               libsmi2-dev,
+               libsnappy-dev,
+               libspandsp-dev,
+               libspeexdsp-dev,
+               libssh-gcrypt-dev,
+               libsystemd-dev,
+               libxkbcommon-dev,
+               libxml2-dev,
+               libxml2-utils,
+               libz-dev,
+               libzstd-dev,
+               lsb-release,
+               po-debconf,
+               python3-ply,
+               python3-pytest <!nocheck>,
+               python3-pytest-xdist <!nocheck>,
+               python3,
+               qt6-5compat-dev | libqt6core5compat6-dev,
+               qt6-base-dev-tools,
+               qt6-base-dev,
+               qt6-multimedia-dev,
+               qt6-tools-dev,
+               quilt,
+               xsltproc,
+               libfalcosecurity0-dev <pkg.wireshark.logray>
 Build-Conflicts: libsnmp4.2-dev, libsnmp-dev
 Vcs-Git: https://salsa.debian.org/debian/wireshark -b debian/master
 Vcs-Browser: https://salsa.debian.org/debian/wireshark.git
@@ -27,8 +64,8 @@ Homepage: https://www.wireshark.org/
 
 Package: wireshark-common
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark17 (>= ${binary:Version}),
- libwiretap14 (>= ${binary:Version}), debconf, libcap2-bin [linux-any]
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark18 (>= ${binary:Version}),
+ libwiretap15 (>= ${binary:Version}), debconf, libcap2-bin [linux-any]
 Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version})
 Breaks: wireshark (<< 2.0.0~),
         wireshark-gtk (<< 3.0.0),
@@ -45,27 +82,33 @@ Description: network traffic analyzer - common files
 
 Package: wireshark
 Architecture: any
-Depends: wireshark-qt (= ${binary:Version}), ${misc:Depends}
-Description: network traffic analyzer - meta-package
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         wireshark-common (= ${binary:Version}),
+         libqt6svg6
+Recommends: libqt6multimedia6
+Breaks: wireshark-qt,
+        wireshark-gtk (<< 3.0.0~)
+Replaces: wireshark-qt,
+          wireshark-gtk (<< 3.0.0~)
+Description: network traffic analyzer - graphical interface
  Wireshark is a network "sniffer" - a tool that captures and analyzes
  packets off the wire. Wireshark can decode too many protocols to list
  here.
- .
- This is a meta-package for Wireshark.
 
-Package: wireshark-qt
+# We override the binary version, so use the source version here.
+Package: logray
+Build-Profiles: <pkg.wireshark.logray>
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, wireshark-common (= ${binary:Version}),
- libqt5svg5
-Recommends: libqt5multimedia5-plugins
-Replaces: wireshark (<< 2.0.0~), wireshark-gtk (<< 3.0.0~)
-Breaks: wireshark (<< 2.0.0~), wireshark-gtk (<< 3.0.0~)
-Description: network traffic analyzer - Qt version
- Wireshark is a network "sniffer" - a tool that captures and analyzes
- packets off the wire. Wireshark can decode too many protocols to list
- here.
- .
- This package provides the Qt version of Wireshark.
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         wireshark-common (= ${source:Version}),
+         libfalcosecurity0t64,
+         libqt6svg6
+# Recommends: libqt6multimedia6
+Description: system call and log analyzer - graphical interface
+ Logray is a system call and log analyzer. It can capture and analyze
+ system calls on Linux and capture and analyze log data from other sources.
 
 Package: tshark
 Architecture: any
@@ -92,18 +135,6 @@ Description: network traffic analyzer - development tools
  This package provides idl2wrs and other files necessary for developing
  new packet dissectors.
 
-Package: wireshark-dbg
-Architecture: any
-Section: debug
-Depends: ${misc:Depends}, wireshark-common (= ${binary:Version}) | wireshark (= ${binary:Version}) | tshark (= ${binary:Version})
-Description: network traffic analyzer - debug symbols
- Wireshark is a network "sniffer" - a tool that captures and analyzes
- packets off the wire. Wireshark can decode too many protocols to list
- here.
- .
- This package contains stripped debugging symbols for all Wireshark
- programs and libraries.
-
 Package: wireshark-doc
 Architecture: all
 Multi-Arch: foreign
@@ -117,31 +148,31 @@ Description: network traffic analyzer - documentation
  This package contains Wireshark User's guide, Wireshark Developer's Guide
  and the Lua Reference.
 
-Package: libwireshark17
+Package: libwireshark18
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark-data (>= ${source:Version}),
- libwsutil15 (>= ${source:Version})
+ libwsutil16 (>= ${source:Version})
 Suggests: wireshark-doc (>= ${source:Version})
 Description: network packet dissection library -- shared library
  The libwireshark library provides the network packet dissection services
  developed by the Wireshark project.
 
-Package: libwsutil15
+Package: libwsutil16
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: network packet dissection utilities library -- shared library
- The libwsutil library provides utility functions for libwireshark17.
+ The libwsutil library provides utility functions for libwireshark18.
 
 Package: libwsutil-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends} , libwsutil15 (= ${binary:Version})
+Depends: ${misc:Depends} , libwsutil16 (= ${binary:Version})
 Breaks: libwireshark-dev (<< 3.7.0~)
 Replaces: libwireshark-dev (<< 3.7.0~)
 Description: network packet dissection utilities library -- development files
@@ -166,7 +197,7 @@ Description: network packet dissection library -- data files
 Package: libwireshark-dev
 Section: libdevel
 Depends: ${misc:Depends}, libwsutil-dev, libwiretap-dev,
- libwireshark17 (= ${binary:Version})
+ libwireshark18 (= ${binary:Version})
 Architecture: any
 Description: network packet dissection library -- development files
  The "libwireshark" library provides the network packet dissection services
@@ -175,7 +206,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: libwiretap14
+Package: libwiretap15
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -209,7 +240,7 @@ Description: network packet capture library -- shared library
 
 Package: libwiretap-dev
 Section: libdevel
-Depends: ${misc:Depends}, libwsutil-dev, libwiretap14 (= ${binary:Version})
+Depends: ${misc:Depends}, libwsutil-dev, libwiretap15 (= ${binary:Version})
 Architecture: any
 Description: network packet capture library -- development files
  Wiretap, part of the Wireshark project, is a library that allows one to