Merging debian version 13.16.

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

1 files changed, 43 insertions, 36 deletions

diff --git a/debian/control b/debian/control
index 15aaa50..d32ccc5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,21 @@ Priority: optional
 Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
 XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Debhelper Maintainers <debhelper@packages.debian.org>
-XSBC-Original-Uploaders: Niels Thykier <niels@thykier.net>,
+XSBC-Original-Uploaders:
+ Niels Thykier <niels@thykier.net>,
 Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: dpkg-dev (>= 1.18.0~),
-               libtest-pod-perl <pkg.debhelper.ci>,
-               man-db <pkg.debhelper.ci>,
-               perl:any,
-               po4a <!pkg.debhelper.nonls>,
+Build-Depends:
+ dpkg-dev (>= 1.18.0~),
+ libtest-pod-perl <pkg.debhelper.ci>,
+ man-db <pkg.debhelper.ci>,
+ perl:any,
+ po4a <!pkg.debhelper.nonls>,
 X-DH-Compat: 15
+X-Style: black
 Rules-Requires-Root: no
 Standards-Version: 4.6.1
-Testsuite: autopkgtest-pkg-perl
+Testsuite:
+ autopkgtest-pkg-perl
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/debhelper
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/debhelper
 XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/debhelper
@@ -22,47 +26,48 @@ XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/debhelper.git
 
 Package: debhelper
 Architecture: all
-Depends: autotools-dev,
+Depends:
+ autotools-dev,
 # Version 12 is where dh-autoreconf supports --sourcedirectory.
 # Version 16 fixes #887482, version 17 fixes #889567
 # Constraint can be relaxed if packages do not rely/require any of the
 # above fixes
-         dh-autoreconf (>= 17~),
+ dh-autoreconf (>= 17~),
 # Version constraint is to get a version of dh-strip-nondeterminism
 # without several bugs.  The constraint can be relaxed if an older
 # version is sufficient.
-         dh-strip-nondeterminism (>= 0.028~),
+ dh-strip-nondeterminism (>= 0.028~),
 # dbgsym support landed in 1.18.0, 1.18.2 fixes a related nasty bug.
-         dpkg (>= 1.18.0~),
-         dpkg-dev (>= 1.18.2~),
-         dwz (>= 0.12.20190711) <!pkg.debhelper.bootstrap>,
-         file (>= 3.23),
-         libdebhelper-perl (= ${source:Version}),
-         libdpkg-perl (>= 1.17.14),
-         man-db <!pkg.debhelper.bootstrap>,
-         po-debconf,
+ dpkg (>= 1.18.0~),
+ dpkg-dev (>= 1.18.2~),
+ dwz (>= 0.12.20190711) <!pkg.debhelper.bootstrap>,
+ file (>= 3.23),
+ libdebhelper-perl (= ${source:Version}),
+ libdpkg-perl (>= 1.17.14),
+ man-db <!pkg.debhelper.bootstrap>,
+ po-debconf,
 Breaks:
 # To ensure cmake understands -DCMAKE_INSTALL_RUNSTATEDIR=/run as used in compat 11
 # - Can be dropped (with the caveat that cmake packages may behave differently
 #   depending on the version of cmake).
-        cmake (<< 3.9~),
+ cmake (<< 3.9~),
 # The debhelper-documentation plugin uses features from 0.1.18+
-        dh-debputy (<< 0.1.18~),
+# The `dh_assistant` change in 13.16 is not great for `dh-debputy`'s LSP/Lint features before debputy/0.1.37
+# (The build part of `debputy` is unaffected)
+ dh-debputy (<< 0.1.36~),
 # meson build system uses --wrap-mode, which requires meson (>= 0.40.0)
-        meson (<< 0.40.0~),
-# Re-add if qt5-qmake is added to stretch-backports
-# The qmake cross wrapper was introduced in 5.9.2+dfsg-5, but got some important
-# fixes in the subsequent uploads. It is only needed for cross-building.
-#        qt5-qmake (<< 5.9.2+dfsg-8),
-Suggests: dh-make,
-Provides: dh-sequence-dwz,
-          dh-sequence-elf-tools,
-          dh-sequence-installinitramfs,
-          dh-sequence-installsysusers,
-          dh-sequence-single-binary,
-          dh-sequence-systemd,
-          dh-sequence-movetousr,
-          ${dh:CompatLevels},
+ meson (<< 0.40.0~),
+Suggests:
+ dh-make,
+Provides:
+ dh-sequence-dwz,
+ dh-sequence-elf-tools,
+ dh-sequence-installinitramfs,
+ dh-sequence-installsysusers,
+ dh-sequence-movetousr,
+ dh-sequence-single-binary,
+ dh-sequence-systemd,
+ ${dh:CompatLevels},
 Multi-Arch: foreign
 Description: helper programs for debian/rules
  A collection of programs that can be used in a debian/rules file to
@@ -75,8 +80,10 @@ Description: helper programs for debian/rules
 Package: libdebhelper-perl
 Section: perl
 Architecture: all
-Replaces: debhelper (<< 12.6~),
-Breaks: debhelper (<< 12.6~),
+Replaces:
+ debhelper (<< 12.6~),
+Breaks:
+ debhelper (<< 12.6~),
 Multi-Arch: foreign
 Description: debhelper perl modules
  A collection of programs that can be used in a debian/rules file to