Merging debian version 13.16.

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

2 files changed, 77 insertions, 45 deletions

diff --git a/debian/changelog b/debian/changelog
index af10534..126d9c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+debhelper (13.16) unstable; urgency=medium
+
+  [ Niels Thykier ]
+  * dh_assistant: Clearly mark unsafe commands
+  * d/changelog: Fix typos in historical entries
+  * Migrate to `X-Style: black`
+  * dh_assistant.1: Improve documentation and command tagging
+  * Improve wording of several man pages.
+    Thanks to Christoph Brinkhaus <c.brinkhaus@t-online.de> (Closes: #1069176)
+  * Require a package prefix with `--name` in c15 (warning in c14)
+  * dh_assistant: Report data about disabled commands in some subcommands.
+    This breaks a small subset of the `dh-debputy` features and a related
+    `Breaks` has been added.
+
+  [ Peter Pentchev ]
+  * Fix a "comat" -> "compat" typo in _load_compat_info()
+
+  [ Luca Boccassi ]
+  * dh_installtmpfiles: implement remove on removal, purge on purge
+
+  [ Christoph Brinkhaus ]
+  * Update German translation of man pages (Closes: #1069176)
+
+ -- Niels Thykier <niels@thykier.net>  Mon, 17 Jun 2024 16:00:40 +0000
+
 debhelper (13.15.3-0.0~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
@@ -968,7 +993,7 @@ debhelper (13.1) unstable; urgency=low
   * dh_installman: Improve error messages and handling of broken
     section numbers.  Notably, the auto-detection no longer picks
     section numbers that look suspiciously like a version number
-    (or a date).  This can cause dh_installman to reject manpages
+    (or a date).  This can cause dh_installman to reject man pages
     if it can no longer guess a suitable section for the manpage
     Thanks to Paul Gevers for reporting the bug.
     (Closes: #958343)
@@ -3527,7 +3552,7 @@ debhelper (9.20160618) unstable; urgency=medium
     Thanks to Helmut Grohne for the report.
   * dh_installcatalogs: Apply patch from Helmut Grohne to
     explicitly trigger a new update-sgmlcatalog trigger,
-    since dpkg does not triger conffiles on package removal.
+    since dpkg does not trigger conffiles on package removal.
     (Closes: #825005)
   * dh_installcatalos: Apply patch from Helmut Grohne to
     remove autoscript for a transition that completed in
@@ -8111,7 +8136,7 @@ debhelper (4.0.8) unstable; urgency=low
 debhelper (4.0.7) unstable; urgency=low
 
   * dh_strip: If a file is an ELF shared binary, does not have a .so.* in its
-    name, stirp it as a ELF binary. It seems that GNUstep has files of this
+    name, strip it as a ELF binary. It seems that GNUstep has files of this
     sort. See bug #35733 (not sufficient to close all of it).
 
  -- Joey Hess <joeyh@debian.org>  Wed, 22 May 2002 20:40:09 -0400
@@ -8168,7 +8193,7 @@ debhelper (4.0.0) unstable; urgency=low
 
   * dh_movefiles has long been a sore point in debhelper. Inherited
     from debstd, its interface and implementation suck, and I have maintained
-    it while never really deigning to use it. Now there is a remplacment:
+    it while never really deigning to use it. Now there is a replacement:
     dh_install, which ...
     - copies files, doesn't move them. Closes: #75360, #82649
     - doesn't have that whole annoying debian/package.files vs. debian/files
@@ -9144,7 +9169,7 @@ debhelper (2.1.9) unstable; urgency=low
   * dh_installmodules: corrected the code added to maintainer scripts so it
     does not call depmod -a. update-modules (which it always called)_
     handles calling depmod if doing so is appropriate. Packages built with
-    proir versions probably have issues on systems with non-modular
+    prior versions probably have issues on systems with non-modular
     kernels, and should be rebuilt. Closes: #71841
 
  -- Joey Hess <joeyh@debian.org>  Sun, 17 Sep 2000 14:40:45 -0700
@@ -10745,7 +10770,7 @@ debhelper (1.1.20) unstable; urgency=low
 
 debhelper (1.1.19) unstable; urgency=low
 
-  * dh_installmanpages: look at basename of man pacges specified on command
+  * dh_installmanpages: look at basename of man pages specified on command
     line to skip, for backwards compatibility.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 10 Sep 1998 11:31:42 -0700
@@ -11695,8 +11720,8 @@ debhelper (0.8) unstable; urgency=low
 
 debhelper (0.7) unstable; urgency=low
 
-  * Sped up some things by removing unnecesary for loops.
-  * dh_installdocs: behavior modifcation: if there is a debian/TODO, it is
+  * Sped up some things by removing unnecessary for loops.
+  * dh_installdocs: behavior modification: if there is a debian/TODO, it is
     named like a debian/changelog file: if the package is a debian native
     package, it is installed as TODO. If the package is not a native package,
     it is installed as TODO.Debian.
@@ -11705,7 +11730,7 @@ debhelper (0.7) unstable; urgency=low
   * Added dh_undocumented program, which can set up undocumented.7 symlinks.
   * Moved dh_installdebfiles to come after dh_fixperms in the example rules
     files. (dh_installdebfiles makes sure it installs things with the proper
-    permissions, and this reorganization makes the file a bit more flexable
+    permissions, and this reorganization makes the file a bit more flexible
     in a few situations.)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 13 Oct 1997 20:08:05 -0400
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