diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 41 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/control.in | 2 | ||||
| -rw-r--r-- | debian/control.t64.in | 2 | ||||
| -rwxr-xr-x | debian/rules | 5 |
5 files changed, 49 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index bccb198..13470b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,44 @@ +wireshark (4.2.6-1~progress7.99u1) graograman-backports; urgency=medium + + * Uploading to graograman-backports, remaining changes: + - Updating maintainer field. + - Updating uploaders field. + - Updating bugs field. + - Updating vcs fields. + - Reverting t64 migration for backports. + - Building without dpkg-parsechangelog. + - Regenerating debian files. + * Merging upstream version 4.2.6. + * Merging debian version 4.2.6-1. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Mon, 05 Aug 2024 11:17:30 +0200 + +wireshark (4.2.6-1) unstable; urgency=medium + + * Build depend on libssh-dev instead of libssh-gcrypt-dev on latest + distribution releases. This is made possible by OpenSSL switching + its license to Apache 2.0. + (Closes: #1074268) + * New upstream version: + - security fixes: + - The SPRT dissector could crash + + -- Balint Reczey <balint@balintreczey.hu> Thu, 11 Jul 2024 23:26:26 +0200 + +wireshark (4.2.5-2~progress7.99u1) graograman-backports; urgency=medium + + * Uploading to graograman-updates, remaining changes: + - Updating maintainer field. + - Updating uploaders field. + - Updating bugs field. + - Updating vcs fields. + - Reverting t64 migration for backports. + - Building without dpkg-parsechangelog. + - Regenerating debian files. + * Merging debian version 4.2.5-2. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Tue, 11 Jun 2024 18:44:17 +0200 + wireshark (4.2.5-2) sid; urgency=medium * debian/rules: Keep the t64 transition when targeting sid or oracular diff --git a/debian/control b/debian/control index ba71626..bfd7ec4 100644 --- a/debian/control +++ b/debian/control @@ -45,7 +45,7 @@ Build-Depends: qt6-5compat-dev, libsbc-dev, libnghttp2-dev, libnghttp3-dev, - libssh-gcrypt-dev, + libssh-dev, liblz4-dev, libsnappy-dev, libzstd-dev, diff --git a/debian/control.in b/debian/control.in index 4f5f99e..987a6e2 100644 --- a/debian/control.in +++ b/debian/control.in @@ -41,7 +41,7 @@ Build-Depends: @QT_BUILD_DEPS@, libsbc-dev, libnghttp2-dev, libnghttp3-dev, - libssh-gcrypt-dev, + @LIBSSH_DEV@, liblz4-dev, libsnappy-dev, libzstd-dev, diff --git a/debian/control.t64.in b/debian/control.t64.in index 991c47b..811f467 100644 --- a/debian/control.t64.in +++ b/debian/control.t64.in @@ -39,7 +39,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), libsbc-dev, libnghttp2-dev, libnghttp3-dev, - libssh-gcrypt-dev, + @LIBSSH_DEV@, liblz4-dev, libsnappy-dev, libzstd-dev, diff --git a/debian/rules b/debian/rules index 85002f8..9000fb5 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,11 @@ QT5_RECOMMENDS = libqt5multimedia5-plugins CONTROL_IN_SED_CMD = CONTROL_IN_SED_CMD := $(CONTROL_IN_SED_CMD)s/@QT_BUILD_DEPS@/$(QT6_BUILD_DEPS)/;s/@QT_DEPS@/$(QT6_DEPS)/;s/@QT_RECOMMENDS@/$(QT6_RECOMMENDS)/;s/, qt/,\\n qt/g; +ifneq ($(filter noble oracular unstable sid testing trixie UNRELEASED,$(DEB_DISTRIBUTION)),) +CONTROL_IN_SED_CMD := $(CONTROL_IN_SED_CMD)s/@LIBSSH_DEV@/libssh-dev/; +else +CONTROL_IN_SED_CMD := $(CONTROL_IN_SED_CMD)s/@LIBSSH_DEV@/libssh-gcrypt-dev/; +endif # This has to be exported to make some magic below work. export DH_OPTIONS |