Reverting manual t64 revert to use included automatic t64 handling.

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

13 files changed, 47 insertions, 34 deletions

diff --git a/debian/control b/debian/control
index ba716268..dd4939cb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,9 @@
 Source: wireshark
-Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
-XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
-XSBC-Original-Maintainer: Balint Reczey <balint@balintreczey.hu>
-Bugs: mailto:maintainers@lists.progress-linux.org
+Maintainer: Balint Reczey <balint@balintreczey.hu>
 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,
@@ -60,18 +58,16 @@ Build-Conflicts: libsnmp4.2-dev,
                  libsnmp-dev
 Standards-Version: 4.6.0.1
 Rules-Requires-Root: no
-Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/wireshark
-Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/wireshark
-XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/wireshark
-XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/wireshark.git -b debian/master
+Vcs-Browser: https://salsa.debian.org/debian/wireshark
+Vcs-Git: https://salsa.debian.org/debian/wireshark.git -b debian/master
 Homepage: https://www.wireshark.org/
 
 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})
@@ -151,21 +147,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
@@ -180,7 +182,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
@@ -213,7 +215,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.
@@ -221,7 +223,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
@@ -258,7 +263,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/control.in b/debian/control.in
index e8f06ae5..4f5f99e8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,5 +1,8 @@
 Source: wireshark
-Maintainer: Balint Reczey <balint@balintreczey.hu>
+Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
+XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
+XSBC-Original-Maintainer: Balint Reczey <balint@balintreczey.hu>
+Bugs: mailto:maintainers@lists.progress-linux.org
 Section: net
 Priority: optional
 Build-Depends: @QT_BUILD_DEPS@,
@@ -53,8 +56,10 @@ Build-Conflicts: libsnmp4.2-dev,
                  libsnmp-dev
 Standards-Version: 4.6.0.1
 Rules-Requires-Root: no
-Vcs-Browser: https://salsa.debian.org/debian/wireshark
-Vcs-Git: https://salsa.debian.org/debian/wireshark.git -b debian/master
+Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/wireshark
+Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/wireshark
+XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/wireshark
+XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/wireshark.git -b debian/master
 Homepage: https://www.wireshark.org/
 
 Package: wireshark-common
diff --git a/debian/libwireshark17.lintian-overrides b/debian/libwireshark17.lintian-overrides
deleted file mode 100644
index a65e2403..00000000
--- 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 b31df7d9..b31df7d9 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 00000000..57929b6f
--- /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 12e61062..968d6a11 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 0c482717..0c482717 100644
--- a/debian/libwiretap14.docs
+++ b/debian/libwiretap14t64.docs
diff --git a/debian/libwiretap14.install b/debian/libwiretap14t64.install
index f9d702aa..f9d702aa 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 00000000..be2513a8
--- /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 2c15f78e..a280d013 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 e9f07612..e9f07612 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 00000000..b12a3910
--- /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 4dd16484..be224ba7 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