summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-09 14:09:58 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:37:58 +0000
commit3c1a017caaa9ab0594146023f3282d39401de128 (patch)
treefdc98ab1bc51451a22a0ee29afdb4e2b84cc1e96
parentMerging debian version 4.2.2-1.1. (diff)
downloadwireshark-3c1a017caaa9ab0594146023f3282d39401de128.tar.xz
wireshark-3c1a017caaa9ab0594146023f3282d39401de128.zip
Reverting t64 migration for backports.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/control29
-rw-r--r--debian/libwireshark17.install (renamed from debian/libwireshark17t64.install)0
-rw-r--r--debian/libwireshark17.lintian-overrides10
-rw-r--r--debian/libwireshark17.symbols (renamed from debian/libwireshark17t64.symbols)2
-rw-r--r--debian/libwireshark17t64.lintian-overrides11
-rw-r--r--debian/libwiretap14.docs (renamed from debian/libwiretap14t64.docs)0
-rw-r--r--debian/libwiretap14.install (renamed from debian/libwiretap14t64.install)0
-rw-r--r--debian/libwiretap14.symbols (renamed from debian/libwiretap14t64.symbols)2
-rw-r--r--debian/libwiretap14t64.lintian-overrides1
-rw-r--r--debian/libwsutil15.install (renamed from debian/libwsutil15t64.install)0
-rw-r--r--debian/libwsutil15.symbols (renamed from debian/libwsutil15t64.symbols)2
-rw-r--r--debian/libwsutil15t64.lintian-overrides1
12 files changed, 23 insertions, 35 deletions
diff --git a/debian/control b/debian/control
index 497db680..633b6637 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: dpkg-dev (>= 1.22.5), qt6-5compat-dev,
+Build-Depends: 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},
- libwireshark17t64 (>= ${binary:Version}),
- libwiretap14t64 (>= ${binary:Version}),
+ libwireshark17 (>= ${binary:Version}),
+ libwiretap14 (>= ${binary:Version}),
debconf,
libcap2-bin [linux-any]
Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version})
@@ -152,27 +152,21 @@ Description: network traffic analyzer - documentation
This package contains Wireshark User's guide, Wireshark Developer's Guide
and the Lua Reference.
-Package: libwireshark17t64
-Provides: ${t64:Provides}
-Replaces: libwireshark17
-Breaks: libwireshark17 (<< ${source:Version})
+Package: libwireshark17
Architecture: any
Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},
libwireshark-data (>= ${source:Version}),
- libwsutil15t64 (>= ${source:Version})
+ libwsutil15 (>= ${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: libwsutil15t64
-Provides: ${t64:Provides}
-Replaces: libwsutil15
-Breaks: libwsutil15 (<< ${source:Version})
+Package: libwsutil15
Architecture: any
Multi-Arch: same
Section: libs
@@ -187,7 +181,7 @@ Package: libwsutil-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends},
- libwsutil15t64 (= ${binary:Version})
+ libwsutil15 (= ${binary:Version})
Breaks: libwireshark-dev (<< 3.7.0~)
Replaces: libwireshark-dev (<< 3.7.0~)
Description: network packet dissection utilities library -- development files
@@ -220,7 +214,7 @@ Section: libdevel
Depends: ${misc:Depends},
libwsutil-dev,
libwiretap-dev,
- libwireshark17t64 (= ${binary:Version})
+ libwireshark17 (= ${binary:Version})
Description: network packet dissection library -- development files
The "libwireshark" library provides the network packet dissection services
developed by the Wireshark project.
@@ -228,10 +222,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: libwiretap14t64
-Provides: ${t64:Provides}
-Replaces: libwiretap14
-Breaks: libwiretap14 (<< ${source:Version})
+Package: libwiretap14
Architecture: any
Multi-Arch: same
Section: libs
@@ -268,7 +259,7 @@ Package: libwiretap-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends},
- libwiretap14t64 (= ${binary:Version})
+ libwiretap14 (= ${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/libwireshark17t64.install b/debian/libwireshark17.install
index b31df7d9..b31df7d9 100644
--- a/debian/libwireshark17t64.install
+++ b/debian/libwireshark17.install
diff --git a/debian/libwireshark17.lintian-overrides b/debian/libwireshark17.lintian-overrides
new file mode 100644
index 00000000..a65e2403
--- /dev/null
+++ b/debian/libwireshark17.lintian-overrides
@@ -0,0 +1,10 @@
+# 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/libwireshark17t64.symbols b/debian/libwireshark17.symbols
index f01b0df3..21237ef0 100644
--- a/debian/libwireshark17t64.symbols
+++ b/debian/libwireshark17.symbols
@@ -1,4 +1,4 @@
-libwireshark.so.17 libwireshark17t64 #MINVER#
+libwireshark.so.17 libwireshark17 #MINVER#
AdmissionRejectReason_vals@Base 1.9.1
BandRejectReason_vals@Base 1.9.1
CommandCode_vals_ext@Base 1.9.1
diff --git a/debian/libwireshark17t64.lintian-overrides b/debian/libwireshark17t64.lintian-overrides
deleted file mode 100644
index 57929b6f..00000000
--- a/debian/libwireshark17t64.lintian-overrides
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/libwiretap14t64.docs b/debian/libwiretap14.docs
index 0c482717..0c482717 100644
--- a/debian/libwiretap14t64.docs
+++ b/debian/libwiretap14.docs
diff --git a/debian/libwiretap14t64.install b/debian/libwiretap14.install
index f9d702aa..f9d702aa 100644
--- a/debian/libwiretap14t64.install
+++ b/debian/libwiretap14.install
diff --git a/debian/libwiretap14t64.symbols b/debian/libwiretap14.symbols
index a280d013..2c15f78e 100644
--- a/debian/libwiretap14t64.symbols
+++ b/debian/libwiretap14.symbols
@@ -1,4 +1,4 @@
-libwiretap.so.14 libwiretap14t64 #MINVER#
+libwiretap.so.14 libwiretap14 #MINVER#
file_eof@Base 1.9.1
file_error@Base 1.9.1
file_getc@Base 1.9.1
diff --git a/debian/libwiretap14t64.lintian-overrides b/debian/libwiretap14t64.lintian-overrides
deleted file mode 100644
index be2513a8..00000000
--- a/debian/libwiretap14t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libwiretap14t64: package-name-doesnt-match-sonames libwiretap14
diff --git a/debian/libwsutil15t64.install b/debian/libwsutil15.install
index e9f07612..e9f07612 100644
--- a/debian/libwsutil15t64.install
+++ b/debian/libwsutil15.install
diff --git a/debian/libwsutil15t64.symbols b/debian/libwsutil15.symbols
index be224ba7..4dd16484 100644
--- a/debian/libwsutil15t64.symbols
+++ b/debian/libwsutil15.symbols
@@ -1,4 +1,4 @@
-libwsutil.so.15 libwsutil15t64 #MINVER#
+libwsutil.so.15 libwsutil15 #MINVER#
Dot11DecryptWepDecrypt@Base 2.5.0
EBCDIC_to_ASCII1@Base 4.1.0
EBCDIC_to_ASCII@Base 4.1.0
diff --git a/debian/libwsutil15t64.lintian-overrides b/debian/libwsutil15t64.lintian-overrides
deleted file mode 100644
index b12a3910..00000000
--- a/debian/libwsutil15t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libwsutil15t64: package-name-doesnt-match-sonames libwsutil15