Merging debian version 4.2.2-1.1.

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

13 files changed, 42 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index 60c50ca..5cec180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wireshark (4.2.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063071
+
+ -- Steve Langasek <vorlon@debian.org>  Thu, 29 Feb 2024 02:04:43 +0000
+
 wireshark (4.2.2-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index 633b663..497db68 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Balint Reczey <balint@balintreczey.hu>
 Bugs: mailto:maintainers@lists.progress-linux.org
 Section: net
 Priority: optional
-Build-Depends: qt6-5compat-dev,
+Build-Depends: dpkg-dev (>= 1.22.5), qt6-5compat-dev,
                qt6-base-dev,
                qt6-base-dev-tools,
                qt6-multimedia-dev,
@@ -71,8 +71,8 @@ Package: wireshark-common
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libwireshark17 (>= ${binary:Version}),
-         libwiretap14 (>= ${binary:Version}),
+         libwireshark17t64 (>= ${binary:Version}),
+         libwiretap14t64 (>= ${binary:Version}),
          debconf,
          libcap2-bin [linux-any]
 Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version})
@@ -152,21 +152,27 @@ Description: network traffic analyzer - documentation
  This package contains Wireshark User's guide, Wireshark Developer's Guide
  and the Lua Reference.
 
-Package: libwireshark17
+Package: libwireshark17t64
+Provides: ${t64:Provides}
+Replaces: libwireshark17
+Breaks: libwireshark17 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libwireshark-data (>= ${source:Version}),
-         libwsutil15 (>= ${source:Version})
+         libwsutil15t64 (>= ${source:Version})
 Suggests: wireshark-doc (>= ${source:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: network packet dissection library -- shared library
  The libwireshark library provides the network packet dissection services
  developed by the Wireshark project.
 
-Package: libwsutil15
+Package: libwsutil15t64
+Provides: ${t64:Provides}
+Replaces: libwsutil15
+Breaks: libwsutil15 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -181,7 +187,7 @@ Package: libwsutil-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libwsutil15 (= ${binary:Version})
+         libwsutil15t64 (= ${binary:Version})
 Breaks: libwireshark-dev (<< 3.7.0~)
 Replaces: libwireshark-dev (<< 3.7.0~)
 Description: network packet dissection utilities library -- development files
@@ -214,7 +220,7 @@ Section: libdevel
 Depends: ${misc:Depends},
          libwsutil-dev,
          libwiretap-dev,
-         libwireshark17 (= ${binary:Version})
+         libwireshark17t64 (= ${binary:Version})
 Description: network packet dissection library -- development files
  The "libwireshark" library provides the network packet dissection services
  developed by the Wireshark project.
@@ -222,7 +228,10 @@ 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: libwiretap14t64
+Provides: ${t64:Provides}
+Replaces: libwiretap14
+Breaks: libwiretap14 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -259,7 +268,7 @@ Package: libwiretap-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libwiretap14 (= ${binary:Version})
+         libwiretap14t64 (= ${binary:Version})
 Description: network packet capture library -- development files
  Wiretap, part of the Wireshark project, is a library that allows one to
  read and write several packet capture file formats.
diff --git a/debian/libwireshark17.lintian-overrides b/debian/libwireshark17.lintian-overrides
deleted file mode 100644
index a65e240..0000000
--- a/debian/libwireshark17.lintian-overrides
+++ /dev/null
@@ -1,10 +0,0 @@
-# ieee-data is not a library, just data processed at build time
-libwireshark17: embedded-library
-
-# small plugins
-libwireshark17: library-not-linked-against-libc [usr/lib/*/wireshark/plugins/*/codecs/g7*.so]
-libwireshark17: library-not-linked-against-libc [usr/lib/*/wireshark/plugins/*/codecs/l16mono.so]
-
-# Typo directly on IANA enterprise-numbers (epan/enterprise-numbers)
-libwireshark17: spelling-error-in-binary Nam Name [usr/lib/*/libwireshark.so.*]
-libwireshark17: spelling-error-in-binary Dont Don't [usr/lib/*/libwireshark.so.*]
diff --git a/debian/libwireshark17.install b/debian/libwireshark17t64.install
index b31df7d..b31df7d 100644
--- a/debian/libwireshark17.install
+++ b/debian/libwireshark17t64.install
diff --git a/debian/libwireshark17t64.lintian-overrides b/debian/libwireshark17t64.lintian-overrides
new file mode 100644
index 0000000..57929b6
--- /dev/null
+++ b/debian/libwireshark17t64.lintian-overrides
@@ -0,0 +1,11 @@
+# ieee-data is not a library, just data processed at build time
+libwireshark17t64: embedded-library
+
+# small plugins
+libwireshark17t64: library-not-linked-against-libc [usr/lib/*/wireshark/plugins/*/codecs/g7*.so]
+libwireshark17t64: library-not-linked-against-libc [usr/lib/*/wireshark/plugins/*/codecs/l16mono.so]
+
+# Typo directly on IANA enterprise-numbers (epan/enterprise-numbers)
+libwireshark17t64: spelling-error-in-binary Nam Name [usr/lib/*/libwireshark.so.*]
+libwireshark17t64: spelling-error-in-binary Dont Don't [usr/lib/*/libwireshark.so.*]
+libwireshark17t64: package-name-doesnt-match-sonames libwireshark17
diff --git a/debian/libwireshark17.symbols b/debian/libwireshark17t64.symbols
index 21237ef..f01b0df 100644
--- a/debian/libwireshark17.symbols
+++ b/debian/libwireshark17t64.symbols
@@ -1,4 +1,4 @@
-libwireshark.so.17 libwireshark17 #MINVER#
+libwireshark.so.17 libwireshark17t64 #MINVER#
  AdmissionRejectReason_vals@Base 1.9.1
  BandRejectReason_vals@Base 1.9.1
  CommandCode_vals_ext@Base 1.9.1
diff --git a/debian/libwiretap14.docs b/debian/libwiretap14t64.docs
index 0c48271..0c48271 100644
--- a/debian/libwiretap14.docs
+++ b/debian/libwiretap14t64.docs
diff --git a/debian/libwiretap14.install b/debian/libwiretap14t64.install
index f9d702a..f9d702a 100644
--- a/debian/libwiretap14.install
+++ b/debian/libwiretap14t64.install
diff --git a/debian/libwiretap14t64.lintian-overrides b/debian/libwiretap14t64.lintian-overrides
new file mode 100644
index 0000000..be2513a
--- /dev/null
+++ b/debian/libwiretap14t64.lintian-overrides
@@ -0,0 +1 @@
+libwiretap14t64: package-name-doesnt-match-sonames libwiretap14
diff --git a/debian/libwiretap14.symbols b/debian/libwiretap14t64.symbols
index 2c15f78..a280d01 100644
--- a/debian/libwiretap14.symbols
+++ b/debian/libwiretap14t64.symbols
@@ -1,4 +1,4 @@
-libwiretap.so.14 libwiretap14 #MINVER#
+libwiretap.so.14 libwiretap14t64 #MINVER#
  file_eof@Base 1.9.1
  file_error@Base 1.9.1
  file_getc@Base 1.9.1
diff --git a/debian/libwsutil15.install b/debian/libwsutil15t64.install
index e9f0761..e9f0761 100644
--- a/debian/libwsutil15.install
+++ b/debian/libwsutil15t64.install
diff --git a/debian/libwsutil15t64.lintian-overrides b/debian/libwsutil15t64.lintian-overrides
new file mode 100644
index 0000000..b12a391
--- /dev/null
+++ b/debian/libwsutil15t64.lintian-overrides
@@ -0,0 +1 @@
+libwsutil15t64: package-name-doesnt-match-sonames libwsutil15
diff --git a/debian/libwsutil15.symbols b/debian/libwsutil15t64.symbols
index 4dd1648..be224ba 100644
--- a/debian/libwsutil15.symbols
+++ b/debian/libwsutil15t64.symbols
@@ -1,4 +1,4 @@
-libwsutil.so.15 libwsutil15 #MINVER#
+libwsutil.so.15 libwsutil15t64 #MINVER#
  Dot11DecryptWepDecrypt@Base 2.5.0
  EBCDIC_to_ASCII1@Base 4.1.0
  EBCDIC_to_ASCII@Base 4.1.0