The Debian packaging of debmake is maintained in git, using the merging
workflow described in dgit-maint-merge(7).  There isn't a patch queue that can
be represented as a quilt series.

Please see https://salsa.debian.org/debian/debmake-doc (master branch)

--- debmake-doc-1.21.orig/examples/debhello-0.0/debian/control
+++ debmake-doc-1.21/examples/debhello-0.0/debian/control
@@ -2,7 +2,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +11,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-1/step200.slog
@@ -58,6 +58,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-1/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-1/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-1/step500.slog
@@ -48,7 +48,7 @@ make[1]: Entering directory '/path/to/de
 cc -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declarati...
 make[1]: Leaving directory '/path/to/debhello-0.0'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-oT4QxIH5
+        rm -fr -- /tmp/dh-xdg-rundir-c2MZnhlh
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/d5/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/d5/debdd1d04661bdd431560f...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/c4/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/c4/cec6427d45de48efc7f263...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-1/step999.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-1/step999.slog
@@ -1,2 +1,2 @@
-4.5.0
+4.5.1
 
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-2/step120.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-2/step120.slog
@@ -4,8 +4,8 @@
  $ diff -Nru debhello-0.0.orig debhello-0.0 >000-prefix-usr.patch
  $ cat 000-prefix-usr.patch
 diff -Nru debhello-0.0.orig/Makefile debhello-0.0/Makefile
---- debhello-0.0.orig/Makefile  2024-11-12 13:08:48.526901187 +0000
-+++ debhello-0.0/Makefile       2024-11-12 13:08:48.634902912 +0000
+--- debhello-0.0.orig/Makefile  2024-11-29 07:57:10.299591959 +0000
++++ debhello-0.0/Makefile       2024-11-29 07:57:10.391593434 +0000
 @@ -1,4 +1,4 @@
 -prefix = /usr/local
 +prefix = /usr
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-2/step200.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-2/step200.slog
@@ -58,6 +58,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-2/step203.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-2/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-2/step302.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-2/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-2/step500.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-2/step500.slog
@@ -51,7 +51,7 @@ make[1]: Entering directory '/path/to/de
 cc -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declarati...
 make[1]: Leaving directory '/path/to/debhello-0.0'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-An13knds
+        rm -fr -- /tmp/dh-xdg-rundir-YC9pgQV9
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
@@ -120,10 +120,10 @@ make[1]: Leaving directory '/path/to/deb
         cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
    dh_builddeb
-        dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
-dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_0.0-1_amd...
+        dpkg-deb --root-owner-group --build debian/debhello ..
 dpkg-deb: building package 'debhello' in '../debhello_0.0-1_amd64.deb'.
+dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_0.0-1_amd...
  dpkg-genbuildinfo -O../debhello_0.0-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_0.0-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-2/step700.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-2/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/d5/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/d5/debdd1d04661bdd431560f...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/c4/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/c4/cec6427d45de48efc7f263...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-3/step200.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-3/step200.slog
@@ -58,6 +58,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-3/step203.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-3/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-3/step302.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-3/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-3/step500.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-3/step500.slog
@@ -51,7 +51,7 @@ make[1]: Entering directory '/path/to/de
 cc -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declarati...
 make[1]: Leaving directory '/path/to/debhello-0.0'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-kSDMFFVG
+        rm -fr -- /tmp/dh-xdg-rundir-cG3cHnfz
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
@@ -120,10 +120,10 @@ make[1]: Leaving directory '/path/to/deb
         cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
    dh_builddeb
-        dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
-dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_0.0-1_amd...
+        dpkg-deb --root-owner-group --build debian/debhello ..
 dpkg-deb: building package 'debhello' in '../debhello_0.0-1_amd64.deb'.
+dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_0.0-1_amd...
  dpkg-genbuildinfo -O../debhello_0.0-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_0.0-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-3/step700.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-3/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/d5/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/d5/debdd1d04661bdd431560f...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/c4/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/c4/cec6427d45de48efc7f263...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-4/step200.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-4/step200.slog
@@ -58,6 +58,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-4/step203.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-4/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-4/step302.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-4/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-4/step500.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-4/step500.slog
@@ -53,7 +53,7 @@ make[1]: Entering directory '/path/to/de
 cc -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declarati...
 make[1]: Leaving directory '/path/to/debhello-0.0'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-voxbYjxu
+        rm -fr -- /tmp/dh-xdg-rundir-9FAQ0cv6
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
@@ -122,8 +122,8 @@ make[1]: Leaving directory '/path/to/deb
         cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
    dh_builddeb
-        dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
+        dpkg-deb --root-owner-group --build debian/debhello ..
 dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_0.0-1_amd...
 dpkg-deb: building package 'debhello' in '../debhello_0.0-1_amd64.deb'.
  dpkg-genbuildinfo -O../debhello_0.0-1_amd64.buildinfo
--- debmake-doc-1.21.orig/examples/debhello-0.0_build-4/step700.slog
+++ debmake-doc-1.21/examples/debhello-0.0_build-4/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/d5/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/d5/debdd1d04661bdd431560f...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/c4/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/c4/cec6427d45de48efc7f263...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-0.1/debian/control
+++ debmake-doc-1.21/examples/debhello-0.1/debian/control
@@ -2,7 +2,8 @@ Source: debhello
 Section: utils
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -12,7 +13,9 @@ Vcs-Browser: https://salsa.debian.org/de
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-0.1_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-0.1_build-1/step200.slog
@@ -3,7 +3,7 @@
 I: set parameters
 I: sanity check of parameters
 W: -p "debhello" != auto set value ""
-W: -u "0.1" != auto set value "0~2411121309"
+W: -u "0.1" != auto set value "0~2411290757"
 W: -r "1" != auto set value ""
 I: pkg="debhello", ver="0.1", rev="1"
 I: make the upstream tarball with "tar --exclude=debian"
@@ -129,6 +129,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/source/options.ex
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra3source.n...
 I: creating => debian/source/patch-header.ex
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-0.1_build-1/step200.slog-sanity
+++ debmake-doc-1.21/examples/debhello-0.1_build-1/step200.slog-sanity
@@ -1,6 +1,6 @@
 I: sanity check of parameters
 W: -p "debhello" != auto set value ""
-W: -u "0.1" != auto set value "0~2411121309"
+W: -u "0.1" != auto set value "0~2411290757"
 W: -r "1" != auto set value ""
 I: pkg="debhello", ver="0.1", rev="1"
 I: make the upstream tarball with "tar --exclude=debian"
--- debmake-doc-1.21.orig/examples/debhello-0.2/debian/control
+++ debmake-doc-1.21/examples/debhello-0.2/debian/control
@@ -2,7 +2,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +11,8 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-0.2_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-0.2_build-1/step200.slog
@@ -62,6 +62,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-0.2_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-0.2_build-1/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,8 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-0.2_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-0.2_build-1/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,8 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-0.3/debian/control
+++ debmake-doc-1.21/examples/debhello-0.3/debian/control
@@ -2,7 +2,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +11,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-0.3_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-0.3_build-1/step200.slog
@@ -58,6 +58,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-0.3_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-0.3_build-1/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-0.3_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-0.3_build-1/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-0.3_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-0.3_build-1/step500.slog
@@ -52,7 +52,7 @@ src/hello.c:7:12: warning: unused variab
       |            ^~~
 make[1]: Leaving directory '/path/to/debhello-0.3'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-x9fJosCN
+        rm -fr -- /tmp/dh-xdg-rundir-3e1fYBWz
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
@@ -121,10 +121,10 @@ make[1]: Leaving directory '/path/to/deb
         cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
    dh_builddeb
-        dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
         dpkg-deb --root-owner-group --build debian/debhello ..
-dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_0.3-1_amd...
+        dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
 dpkg-deb: building package 'debhello' in '../debhello_0.3-1_amd64.deb'.
+dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_0.3-1_amd...
  dpkg-genbuildinfo -O../debhello_0.3-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_0.3-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-0.3_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-0.3_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/22/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/22/b9d5188bcdfdcdb2a8f26a...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/ac/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/ac/c94e3d32a3e7464957b73e...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-1.0/debian/control
+++ debmake-doc-1.21/examples/debhello-1.0/debian/control
@@ -2,7 +2,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +11,8 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.0_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-1.0_build-1/step200.slog
@@ -62,6 +62,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-1.0_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-1.0_build-1/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,8 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-1.0_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-1.0_build-1/step500.slog
@@ -43,7 +43,7 @@ make[1]: Entering directory '/path/to/de
 : # do nothing
 make[1]: Leaving directory '/path/to/debhello-1.0'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-zhbnxCtf
+        rm -fr -- /tmp/dh-xdg-rundir-PCgw5UTl
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
@@ -332,7 +332,7 @@ N:
 N:
 W: debhello: superfluous-clutter-in-homepage <insert the upstream URL, if rel...
 N:
-W: debhello source: timewarp-standards-version (2021-06-27 < 2022-12-17)
+W: debhello source: timewarp-standards-version (2021-06-27 < 2024-04-07)
 N:
 N:   The source package refers to a Standards-Version that was released after...
 N:   the date of the most recent debian/changelog entry. Perhaps you forgot t...
--- debmake-doc-1.21.orig/examples/debhello-1.1/debian/control
+++ debmake-doc-1.21/examples/debhello-1.1/debian/control
@@ -2,7 +2,10 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), pybuild-plugin-pyproject, python3-all
+Build-Depends:
+ debhelper-compat (= 13),
+ pybuild-plugin-pyproject,
+ python3-all,
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/debian/debmake-doc
@@ -11,7 +14,9 @@ Homepage: https://salsa.debian.org/debia
 
 Package: debhello
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
--- debmake-doc-1.21.orig/examples/debhello-1.1_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-1.1_build-1/step200.slog
@@ -66,6 +66,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-1.1_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-1.1_build-1/step203.slog
@@ -3,12 +3,13 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13),
-               dh-python,
-               pybuild-plugin-pyproject,
-               python3-all,
-               python3-setuptools
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-python,
+ pybuild-plugin-pyproject,
+ python3-all,
+ python3-setuptools,
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -17,7 +18,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-1.1_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-1.1_build-1/step302.slog
@@ -5,7 +5,10 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), pybuild-plugin-pyproject, python3-all...
+Build-Depends:
+ debhelper-compat (= 13),
+ pybuild-plugin-pyproject,
+ python3-all,
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/debian/debmake-doc
@@ -14,7 +17,9 @@ Homepage: https://salsa.debian.org/debia
 
 Package: debhello
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
--- debmake-doc-1.21.orig/examples/debhello-1.1_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-1.1_build-1/step500.slog
@@ -10,7 +10,7 @@ dpkg-buildpackage: info: host architectu
  debian/rules clean
 dh clean --with python3 --buildsystem=pybuild
    dh_auto_clean -O--buildsystem=pybuild
-        pybuild --clean -i python{version} -p 3.12
+        pybuild --clean -i python{version} -p "3.13 3.12"
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--clean', '-i', 'python{version...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
@@ -20,6 +20,8 @@ D: pybuild debhelper:174: source=debhell
 D: pybuild pybuild:151: detected build system: pyproject (certainty: 99%)
 D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
 D: pybuild plugin_pyproject:94: removing '/path/to/debhello-1.1/.pybuild/cpyt...
+D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
+D: pybuild plugin_pyproject:94: removing '/path/to/debhello-1.1/.pybuild/cpyt...
         rm -rf .pybuild/
         find . -name \*.pyc -exec rm {} \;
    dh_autoreconf_clean -O--buildsystem=pybuild
@@ -46,7 +48,7 @@ dh binary --with python3 --buildsystem=p
    dh_update_autotools_config -O--buildsystem=pybuild
    dh_autoreconf -O--buildsystem=pybuild
    dh_auto_configure -O--buildsystem=pybuild
-        pybuild --configure -i python{version} -p 3.12
+        pybuild --configure -i python{version} -p "3.13 3.12"
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--configure', '-i', 'python{ver...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
@@ -55,7 +57,7 @@ D: pybuild tools:231: invoking: /usr/bin
 D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
 D: pybuild pybuild:151: detected build system: pyproject (certainty: 99%)
    dh_auto_build -O--buildsystem=pybuild
-        pybuild --build -i python{version} -p 3.12
+        pybuild --build -i python{version} -p "3.13 3.12"
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--build', '-i', 'python{version...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
@@ -63,9 +65,9 @@ D: pybuild __init__:37: cannot initializ
 D: pybuild tools:231: invoking: /usr/bin/dpkg-architecture
 D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
 D: pybuild pybuild:151: detected build system: pyproject (certainty: 99%)
-I: pybuild plugin_pyproject:129: Building wheel for python3.12 with "build" m...
-I: pybuild base:311: python3.12 -m build --skip-dependency-check --no-isolati...
-D: pybuild tools:231: invoking: python3.12 -m build --skip-dependency-check -...
+I: pybuild plugin_pyproject:129: Building wheel for python3.13 with "build" m...
+I: pybuild base:311: python3.13 -m build --skip-dependency-check --no-isolati...
+D: pybuild tools:231: invoking: python3.13 -m build --skip-dependency-check -...
 * Building wheel...
 /usr/lib/python3/dist-packages/setuptools/config/expand.py:126: SetuptoolsWar...
   for path in _filter_existing_files(_filepaths)
@@ -97,7 +99,50 @@ running install_egg_info
 Copying src/debhello.egg-info to build/bdist.linux-x86_64/wheel/./debhello-1....
 running install_scripts
 creating build/bdist.linux-x86_64/wheel/debhello-1.1.0.dist-info/WHEEL
-creating '/path/to/debhello-1.1/.pybuild/cpython3_3.12_debhello/.tmp-cm6j3_6l...
+creating '/path/to/debhello-1.1/.pybuild/cpython3_3.13_debhello/.tmp-7ty37mi7...
+adding 'debhello/__init__.py'
+adding 'debhello/main.py'
+adding 'debhello-1.1.0.dist-info/LICENSE'
+adding 'debhello-1.1.0.dist-info/METADATA'
+adding 'debhello-1.1.0.dist-info/WHEEL'
+adding 'debhello-1.1.0.dist-info/entry_points.txt'
+adding 'debhello-1.1.0.dist-info/top_level.txt'
+adding 'debhello-1.1.0.dist-info/RECORD'
+removing build/bdist.linux-x86_64/wheel
+Successfully built debhello-1.1.0-py3-none-any.whl
+I: pybuild plugin_pyproject:144: Unpacking wheel built for python3.13 with "i...
+I: pybuild plugin_pyproject:129: Building wheel for python3.12 with "build" m...
+I: pybuild base:311: python3.12 -m build --skip-dependency-check --no-isolati...
+D: pybuild tools:231: invoking: python3.12 -m build --skip-dependency-check -...
+* Building wheel...
+/usr/lib/python3/dist-packages/setuptools/config/expand.py:126: SetuptoolsWar...
+  for path in _filter_existing_files(_filepaths)
+running bdist_wheel
+running build
+running build_py
+copying src/debhello/__init__.py -> build/lib/debhello
+copying src/debhello/main.py -> build/lib/debhello
+running egg_info
+writing src/debhello.egg-info/PKG-INFO
+writing dependency_links to src/debhello.egg-info/dependency_links.txt
+writing entry points to src/debhello.egg-info/entry_points.txt
+writing top-level names to src/debhello.egg-info/top_level.txt
+reading manifest file 'src/debhello.egg-info/SOURCES.txt'
+reading manifest template 'MANIFEST.in'
+adding license file 'LICENSE'
+writing manifest file 'src/debhello.egg-info/SOURCES.txt'
+installing to build/bdist.linux-x86_64/wheel
+running install
+running install_lib
+creating build/bdist.linux-x86_64/wheel
+creating build/bdist.linux-x86_64/wheel/debhello
+copying build/lib/debhello/__init__.py -> build/bdist.linux-x86_64/wheel/./de...
+copying build/lib/debhello/main.py -> build/bdist.linux-x86_64/wheel/./debhel...
+running install_egg_info
+Copying src/debhello.egg-info to build/bdist.linux-x86_64/wheel/./debhello-1....
+running install_scripts
+creating build/bdist.linux-x86_64/wheel/debhello-1.1.0.dist-info/WHEEL
+creating '/path/to/debhello-1.1/.pybuild/cpython3_3.12_debhello/.tmp-u6p4y8w9...
 adding 'debhello/__init__.py'
 adding 'debhello/main.py'
 adding 'debhello-1.1.0.dist-info/LICENSE'
@@ -110,7 +155,7 @@ removing build/bdist.linux-x86_64/wheel
 Successfully built debhello-1.1.0-py3-none-any.whl
 I: pybuild plugin_pyproject:144: Unpacking wheel built for python3.12 with "i...
    dh_auto_test -O--buildsystem=pybuild
-        pybuild --test -i python{version} -p 3.12
+        pybuild --test -i python{version} -p "3.13 3.12"
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--test', '-i', 'python{version}...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
@@ -119,6 +164,14 @@ D: pybuild tools:231: invoking: /usr/bin
 D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
 D: pybuild pybuild:151: detected build system: pyproject (certainty: 99%)
 D: pybuild base:64: Copying /path/to/debhello-1.1/pyproject.toml to /path/to/...
+I: pybuild base:311: cd /path/to/debhello-1.1/.pybuild/cpython3_3.13_debhello...
+D: pybuild tools:231: invoking: cd /path/to/debhello-1.1/.pybuild/cpython3_3....
+
+----------------------------------------------------------------------
+Ran 0 tests in 0.000s
+
+NO TESTS RAN
+D: pybuild base:64: Copying /path/to/debhello-1.1/pyproject.toml to /path/to/...
 I: pybuild base:311: cd /path/to/debhello-1.1/.pybuild/cpython3_3.12_debhello...
 D: pybuild tools:231: invoking: cd /path/to/debhello-1.1/.pybuild/cpython3_3....
 
@@ -126,7 +179,7 @@ D: pybuild tools:231: invoking: cd /path
 Ran 0 tests in 0.000s
 
 NO TESTS RAN
-        rm -fr -- /tmp/dh-xdg-rundir-73c1YkHx
+        rm -fr -- /tmp/dh-xdg-rundir-zfFiE0XO
    create-stamp debian/debhelper-build-stamp
    dh_testroot -O--buildsystem=pybuild
    dh_prep -O--buildsystem=pybuild
@@ -134,7 +187,7 @@ NO TESTS RAN
         rm -fr -- debian/.debhelper/generated/debhello/ debian/debhello/ debi...
    dh_auto_install --destdir=debian/debhello/ -O--buildsystem=pybuild
         install -m0755 -d /path/to/debhello-1.1/debian/debhello
-        pybuild --install -i python{version} -p 3.12 --dest-dir /path/to/debh...
+        pybuild --install -i python{version} -p "3.13 3.12" --dest-dir /path/...
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--install', '-i', 'python{versi...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
@@ -142,6 +195,9 @@ D: pybuild __init__:37: cannot initializ
 D: pybuild tools:231: invoking: /usr/bin/dpkg-architecture
 D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
 D: pybuild pybuild:151: detected build system: pyproject (certainty: 99%)
+I: pybuild plugin_pyproject:178: Copying package built for python3.13 to dest...
+D: pybuild plugin_pyproject:193: Copying scripts directory contents from /pat...
+D: pybuild plugin_pyproject:204: Copying module contents from /path/to/debhel...
 I: pybuild plugin_pyproject:178: Copying package built for python3.12 to dest...
 D: pybuild plugin_pyproject:193: Copying scripts directory contents from /pat...
 D: pybuild plugin_pyproject:204: Copying module contents from /path/to/debhel...
@@ -167,10 +223,11 @@ D: pybuild plugin_pyproject:204: Copying
 D: dh_python3 dh_python3:180: version: 6.20241024
 D: dh_python3 dh_python3:181: argv: ['/usr/bin/dh_python3', '-O--buildsystem=...
 D: dh_python3 dh_python3:182: options: Namespace(guess_deps=True, skip_privat...
-D: dh_python3 dh_python3:183: supported Python versions: 3.12 (default=3.12)
+D: dh_python3 dh_python3:183: supported Python versions: 3.12,3.13 (default=3...
 D: dh_python3 debhelper:174: source=debhello, binary packages=['debhello']
 D: dh_python3 dh_python3:205: processing package debhello...
 D: dh_python3 fs:50: moving files from debian/debhello/usr/lib/python3.12/dis...
+D: dh_python3 fs:50: moving files from debian/debhello/usr/lib/python3.13/dis...
 D: dh_python3 fs:179: Writing INSTALLER in debian/debhello/usr/lib/python3/di...
 D: dh_python3 fs:190: Deleting RECORD in debian/debhello/usr/lib/python3/dist...
 D: dh_python3 fs:338: package debhello details = {'requires.txt': set(), 'egg...
--- debmake-doc-1.21.orig/examples/debhello-1.1_build-1/step500.slog-binary
+++ debmake-doc-1.21/examples/debhello-1.1_build-1/step500.slog-binary
@@ -3,7 +3,7 @@ dh binary --with python3 --buildsystem=p
    dh_update_autotools_config -O--buildsystem=pybuild
    dh_autoreconf -O--buildsystem=pybuild
    dh_auto_configure -O--buildsystem=pybuild
-        pybuild --configure -i python{version} -p 3.12
+        pybuild --configure -i python{version} -p "3.13 3.12"
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--configure', '-i', 'python{ver...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
--- debmake-doc-1.21.orig/examples/debhello-1.2/debian/control
+++ debmake-doc-1.21/examples/debhello-1.2/debian/control
@@ -2,7 +2,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +11,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: zenity, ${misc:Depends}
+Depends:
+ zenity,
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.2_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-1.2_build-1/step200.slog
@@ -62,6 +62,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-1.2_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-1.2_build-1/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,8 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-1.2_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-1.2_build-1/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: zenity, ${misc:Depends}
+Depends:
+ zenity,
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.2_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-1.2_build-1/step500.slog
@@ -43,7 +43,7 @@ make[1]: Entering directory '/path/to/de
 : # do nothing
 make[1]: Leaving directory '/path/to/debhello-1.2'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-z03R_cro
+        rm -fr -- /tmp/dh-xdg-rundir-kqo2nykI
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
--- debmake-doc-1.21.orig/examples/debhello-1.3/debian/control
+++ debmake-doc-1.21/examples/debhello-1.3/debian/control
@@ -2,7 +2,10 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), pybuild-plugin-pyproject, python3-all
+Build-Depends:
+ debhelper-compat (= 13),
+ pybuild-plugin-pyproject,
+ python3-all,
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +13,11 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: gir1.2-gtk-3.0, python3-gi, ${misc:Depends}, ${python3:Depends}
+Depends:
+ gir1.2-gtk-3.0,
+ python3-gi,
+ ${misc:Depends},
+ ${python3:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.3_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-1.3_build-1/step200.slog
@@ -66,6 +66,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-1.3_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-1.3_build-1/step203.slog
@@ -3,12 +3,13 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13),
-               dh-python,
-               pybuild-plugin-pyproject,
-               python3-all,
-               python3-setuptools
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-python,
+ pybuild-plugin-pyproject,
+ python3-all,
+ python3-setuptools,
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -17,7 +18,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-1.3_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-1.3_build-1/step302.slog
@@ -5,7 +5,10 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), pybuild-plugin-pyproject, python3-all...
+Build-Depends:
+ debhelper-compat (= 13),
+ pybuild-plugin-pyproject,
+ python3-all,
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +16,11 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: gir1.2-gtk-3.0, python3-gi, ${misc:Depends}, ${python3:Depends}
+Depends:
+ gir1.2-gtk-3.0,
+ python3-gi,
+ ${misc:Depends},
+ ${python3:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.3_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-1.3_build-1/step500.slog
@@ -10,7 +10,7 @@ dpkg-buildpackage: info: host architectu
  debian/rules clean
 dh clean --with python3 --buildsystem=pybuild
    dh_auto_clean -O--buildsystem=pybuild
-        pybuild --clean -i python{version} -p 3.12
+        pybuild --clean -i python{version} -p "3.13 3.12"
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--clean', '-i', 'python{version...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
@@ -20,6 +20,8 @@ D: pybuild debhelper:174: source=debhell
 D: pybuild pybuild:151: detected build system: pyproject (certainty: 99%)
 D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
 D: pybuild plugin_pyproject:94: removing '/path/to/debhello-1.3/.pybuild/cpyt...
+D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
+D: pybuild plugin_pyproject:94: removing '/path/to/debhello-1.3/.pybuild/cpyt...
         rm -rf .pybuild/
         find . -name \*.pyc -exec rm {} \;
    dh_autoreconf_clean -O--buildsystem=pybuild
@@ -46,7 +48,7 @@ dh binary --with python3 --buildsystem=p
    dh_update_autotools_config -O--buildsystem=pybuild
    dh_autoreconf -O--buildsystem=pybuild
    dh_auto_configure -O--buildsystem=pybuild
-        pybuild --configure -i python{version} -p 3.12
+        pybuild --configure -i python{version} -p "3.13 3.12"
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--configure', '-i', 'python{ver...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
@@ -55,7 +57,7 @@ D: pybuild tools:231: invoking: /usr/bin
 D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
 D: pybuild pybuild:151: detected build system: pyproject (certainty: 99%)
    dh_auto_build -O--buildsystem=pybuild
-        pybuild --build -i python{version} -p 3.12
+        pybuild --build -i python{version} -p "3.13 3.12"
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--build', '-i', 'python{version...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
@@ -63,9 +65,9 @@ D: pybuild __init__:37: cannot initializ
 D: pybuild tools:231: invoking: /usr/bin/dpkg-architecture
 D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
 D: pybuild pybuild:151: detected build system: pyproject (certainty: 99%)
-I: pybuild plugin_pyproject:129: Building wheel for python3.12 with "build" m...
-I: pybuild base:311: python3.12 -m build --skip-dependency-check --no-isolati...
-D: pybuild tools:231: invoking: python3.12 -m build --skip-dependency-check -...
+I: pybuild plugin_pyproject:129: Building wheel for python3.13 with "build" m...
+I: pybuild base:311: python3.13 -m build --skip-dependency-check --no-isolati...
+D: pybuild tools:231: invoking: python3.13 -m build --skip-dependency-check -...
 * Building wheel...
 /usr/lib/python3/dist-packages/setuptools/config/expand.py:126: SetuptoolsWar...
   for path in _filter_existing_files(_filepaths)
@@ -97,7 +99,50 @@ running install_egg_info
 Copying src/debhello.egg-info to build/bdist.linux-x86_64/wheel/./debhello-1....
 running install_scripts
 creating build/bdist.linux-x86_64/wheel/debhello-1.3.0.dist-info/WHEEL
-creating '/path/to/debhello-1.3/.pybuild/cpython3_3.12_debhello/.tmp-28_sxahs...
+creating '/path/to/debhello-1.3/.pybuild/cpython3_3.13_debhello/.tmp-jr1seovd...
+adding 'debhello/__init__.py'
+adding 'debhello/main.py'
+adding 'debhello-1.3.0.dist-info/LICENSE'
+adding 'debhello-1.3.0.dist-info/METADATA'
+adding 'debhello-1.3.0.dist-info/WHEEL'
+adding 'debhello-1.3.0.dist-info/entry_points.txt'
+adding 'debhello-1.3.0.dist-info/top_level.txt'
+adding 'debhello-1.3.0.dist-info/RECORD'
+removing build/bdist.linux-x86_64/wheel
+Successfully built debhello-1.3.0-py3-none-any.whl
+I: pybuild plugin_pyproject:144: Unpacking wheel built for python3.13 with "i...
+I: pybuild plugin_pyproject:129: Building wheel for python3.12 with "build" m...
+I: pybuild base:311: python3.12 -m build --skip-dependency-check --no-isolati...
+D: pybuild tools:231: invoking: python3.12 -m build --skip-dependency-check -...
+* Building wheel...
+/usr/lib/python3/dist-packages/setuptools/config/expand.py:126: SetuptoolsWar...
+  for path in _filter_existing_files(_filepaths)
+running bdist_wheel
+running build
+running build_py
+copying src/debhello/__init__.py -> build/lib/debhello
+copying src/debhello/main.py -> build/lib/debhello
+running egg_info
+writing src/debhello.egg-info/PKG-INFO
+writing dependency_links to src/debhello.egg-info/dependency_links.txt
+writing entry points to src/debhello.egg-info/entry_points.txt
+writing top-level names to src/debhello.egg-info/top_level.txt
+reading manifest file 'src/debhello.egg-info/SOURCES.txt'
+reading manifest template 'MANIFEST.in'
+adding license file 'LICENSE'
+writing manifest file 'src/debhello.egg-info/SOURCES.txt'
+installing to build/bdist.linux-x86_64/wheel
+running install
+running install_lib
+creating build/bdist.linux-x86_64/wheel
+creating build/bdist.linux-x86_64/wheel/debhello
+copying build/lib/debhello/__init__.py -> build/bdist.linux-x86_64/wheel/./de...
+copying build/lib/debhello/main.py -> build/bdist.linux-x86_64/wheel/./debhel...
+running install_egg_info
+Copying src/debhello.egg-info to build/bdist.linux-x86_64/wheel/./debhello-1....
+running install_scripts
+creating build/bdist.linux-x86_64/wheel/debhello-1.3.0.dist-info/WHEEL
+creating '/path/to/debhello-1.3/.pybuild/cpython3_3.12_debhello/.tmp-p15bg0ea...
 adding 'debhello/__init__.py'
 adding 'debhello/main.py'
 adding 'debhello-1.3.0.dist-info/LICENSE'
@@ -110,7 +155,7 @@ removing build/bdist.linux-x86_64/wheel
 Successfully built debhello-1.3.0-py3-none-any.whl
 I: pybuild plugin_pyproject:144: Unpacking wheel built for python3.12 with "i...
    dh_auto_test -O--buildsystem=pybuild
-        pybuild --test -i python{version} -p 3.12
+        pybuild --test -i python{version} -p "3.13 3.12"
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--test', '-i', 'python{version}...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
@@ -119,6 +164,14 @@ D: pybuild tools:231: invoking: /usr/bin
 D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
 D: pybuild pybuild:151: detected build system: pyproject (certainty: 99%)
 D: pybuild base:64: Copying /path/to/debhello-1.3/pyproject.toml to /path/to/...
+I: pybuild base:311: cd /path/to/debhello-1.3/.pybuild/cpython3_3.13_debhello...
+D: pybuild tools:231: invoking: cd /path/to/debhello-1.3/.pybuild/cpython3_3....
+
+----------------------------------------------------------------------
+Ran 0 tests in 0.000s
+
+NO TESTS RAN
+D: pybuild base:64: Copying /path/to/debhello-1.3/pyproject.toml to /path/to/...
 I: pybuild base:311: cd /path/to/debhello-1.3/.pybuild/cpython3_3.12_debhello...
 D: pybuild tools:231: invoking: cd /path/to/debhello-1.3/.pybuild/cpython3_3....
 
@@ -126,7 +179,7 @@ D: pybuild tools:231: invoking: cd /path
 Ran 0 tests in 0.000s
 
 NO TESTS RAN
-        rm -fr -- /tmp/dh-xdg-rundir-jT6kx5cz
+        rm -fr -- /tmp/dh-xdg-rundir-JJv6BdSj
    create-stamp debian/debhelper-build-stamp
    dh_testroot -O--buildsystem=pybuild
    dh_prep -O--buildsystem=pybuild
@@ -134,7 +187,7 @@ NO TESTS RAN
         rm -fr -- debian/.debhelper/generated/debhello/ debian/debhello/ debi...
    dh_auto_install --destdir=debian/debhello/ -O--buildsystem=pybuild
         install -m0755 -d /path/to/debhello-1.3/debian/debhello
-        pybuild --install -i python{version} -p 3.12 --dest-dir /path/to/debh...
+        pybuild --install -i python{version} -p "3.13 3.12" --dest-dir /path/...
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--install', '-i', 'python{versi...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
@@ -142,6 +195,9 @@ D: pybuild __init__:37: cannot initializ
 D: pybuild tools:231: invoking: /usr/bin/dpkg-architecture
 D: pybuild debhelper:174: source=debhello, binary packages=['debhello']
 D: pybuild pybuild:151: detected build system: pyproject (certainty: 99%)
+I: pybuild plugin_pyproject:178: Copying package built for python3.13 to dest...
+D: pybuild plugin_pyproject:193: Copying scripts directory contents from /pat...
+D: pybuild plugin_pyproject:204: Copying module contents from /path/to/debhel...
 I: pybuild plugin_pyproject:178: Copying package built for python3.12 to dest...
 D: pybuild plugin_pyproject:193: Copying scripts directory contents from /pat...
 D: pybuild plugin_pyproject:204: Copying module contents from /path/to/debhel...
@@ -167,10 +223,11 @@ D: pybuild plugin_pyproject:204: Copying
 D: dh_python3 dh_python3:180: version: 6.20241024
 D: dh_python3 dh_python3:181: argv: ['/usr/bin/dh_python3', '-O--buildsystem=...
 D: dh_python3 dh_python3:182: options: Namespace(guess_deps=True, skip_privat...
-D: dh_python3 dh_python3:183: supported Python versions: 3.12 (default=3.12)
+D: dh_python3 dh_python3:183: supported Python versions: 3.12,3.13 (default=3...
 D: dh_python3 debhelper:174: source=debhello, binary packages=['debhello']
 D: dh_python3 dh_python3:205: processing package debhello...
 D: dh_python3 fs:50: moving files from debian/debhello/usr/lib/python3.12/dis...
+D: dh_python3 fs:50: moving files from debian/debhello/usr/lib/python3.13/dis...
 D: dh_python3 fs:179: Writing INSTALLER in debian/debhello/usr/lib/python3/di...
 D: dh_python3 fs:190: Deleting RECORD in debian/debhello/usr/lib/python3/dist...
 D: dh_python3 fs:338: package debhello details = {'requires.txt': set(), 'egg...
--- debmake-doc-1.21.orig/examples/debhello-1.3_build-1/step500.slog-binary
+++ debmake-doc-1.21/examples/debhello-1.3_build-1/step500.slog-binary
@@ -3,7 +3,7 @@ dh binary --with python3 --buildsystem=p
    dh_update_autotools_config -O--buildsystem=pybuild
    dh_autoreconf -O--buildsystem=pybuild
    dh_auto_configure -O--buildsystem=pybuild
-        pybuild --configure -i python{version} -p 3.12
+        pybuild --configure -i python{version} -p "3.13 3.12"
 D: pybuild pybuild:602: version: 6.20241024
 D: pybuild pybuild:603: ['/usr/bin/pybuild', '--configure', '-i', 'python{ver...
 D: pybuild pybuild:39: cfg: Namespace(verbose=True, quiet=False, really_quiet...
--- debmake-doc-1.21.orig/examples/debhello-1.4/debian/control
+++ debmake-doc-1.21/examples/debhello-1.4/debian/control
@@ -2,7 +2,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +11,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.4_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-1.4_build-1/step200.slog
@@ -63,6 +63,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-1.4_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-1.4_build-1/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-1.4_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-1.4_build-1/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.4_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-1.4_build-1/step500.slog
@@ -43,7 +43,7 @@ make[1]: Entering directory '/path/to/de
 cc -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declarati...
 make[1]: Leaving directory '/path/to/debhello-1.4'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-hplxlC_T
+        rm -fr -- /tmp/dh-xdg-rundir-K8P6OM1o
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
--- debmake-doc-1.21.orig/examples/debhello-1.4_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-1.4_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/01/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/01/c92780db096000d12d3a26...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/af/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/af/05dbab2e8d6a1c85b35471...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-1.5/debian/control
+++ debmake-doc-1.21/examples/debhello-1.5/debian/control
@@ -2,7 +2,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +11,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.5_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-1.5_build-1/step200.slog
@@ -64,6 +64,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-1.5_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-1.5_build-1/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-1.5_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-1.5_build-1/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.5_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-1.5_build-1/step500.slog
@@ -61,7 +61,7 @@ cc  \
         -lm
 make[1]: Leaving directory '/path/to/debhello-1.5'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-edmKD6LV
+        rm -fr -- /tmp/dh-xdg-rundir-vXRJTo9b
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
@@ -145,8 +145,8 @@ make[1]: Leaving directory '/path/to/deb
    dh_builddeb
         dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
-dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_1.5-1_amd...
 dpkg-deb: building package 'debhello' in '../debhello_1.5-1_amd64.deb'.
+dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_1.5-1_amd...
  dpkg-genbuildinfo -O../debhello_1.5-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_1.5-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-1.5_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-1.5_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/4d/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/4d/50b0a88699e0a9e7c3d180...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/b6/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/b6/d56f46d8850d4a4030834e...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-1.6/debian/control
+++ debmake-doc-1.21/examples/debhello-1.6/debian/control
@@ -2,7 +2,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +12,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.6_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-1.6_build-1/step200.slog
@@ -65,6 +65,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-1.6_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-1.6_build-1/step203.slog
@@ -3,8 +3,10 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +15,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-1.6_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-1.6_build-1/step302.slog
@@ -5,7 +5,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +15,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.6_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-1.6_build-1/step500.slog
@@ -129,7 +129,7 @@ make[2]: Leaving directory '/path/to/deb
 make[2]: Entering directory '/path/to/debhello-1.6'
 make[2]: Leaving directory '/path/to/debhello-1.6'
 make[1]: Leaving directory '/path/to/debhello-1.6'
-        rm -fr -- /tmp/dh-xdg-rundir-Prtp9VKt
+        rm -fr -- /tmp/dh-xdg-rundir-6GEgUekn
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
@@ -225,8 +225,8 @@ make[1]: Leaving directory '/path/to/deb
    dh_builddeb
         dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
-dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_1.6-1_amd...
 dpkg-deb: building package 'debhello' in '../debhello_1.6-1_amd64.deb'.
+dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_1.6-1_amd...
  dpkg-genbuildinfo -O../debhello_1.6-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_1.6-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-1.6_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-1.6_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/91/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/91/ce0f851c82d06aad1d59ca...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/38/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/38/502dec4aab894bc7cc72b9...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-1.7/debian/control
+++ debmake-doc-1.21/examples/debhello-1.7/debian/control
@@ -2,7 +2,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +12,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.7_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-1.7_build-1/step200.slog
@@ -64,6 +64,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-1.7_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-1.7_build-1/step203.slog
@@ -3,8 +3,10 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +15,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-1.7_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-1.7_build-1/step302.slog
@@ -5,7 +5,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +15,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-1.7_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-1.7_build-1/step500.slog
@@ -36,11 +36,12 @@ make[1]: Entering directory '/path/to/de
 dh_auto_configure -- -DWITH-MATH=1
         cd obj-x86_64-linux-gnu && DEB_PYTHON_INSTALL_LAYOUT=deb PKG_CONFIG=/...
 CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
-  Compatibility with CMake < 3.5 will be removed from a future version of
+  Compatibility with CMake < 3.10 will be removed from a future version of
   CMake.
 
-  Update the VERSION argument <min> value or use a ...<max> suffix to tell
-  CMake that the project does not need compatibility with older versions.
+  Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated...
+  to work with policies introduced by <max> or earlier.
 
 
 -- The C compiler identification is GNU 14.2.0
@@ -55,7 +56,7 @@ CMake Deprecation Warning at CMakeLists.
 -- Check for working CXX compiler: /usr/bin/c++ - skipped
 -- Detecting CXX compile features
 -- Detecting CXX compile features - done
--- Configuring done (0.8s)
+-- Configuring done (0.7s)
 -- Generating done (0.0s)
 CMake Warning:
   Manually-specified variables were not used by the project:
@@ -97,7 +98,7 @@ make[2]: Leaving directory '/path/to/deb
 /usr/bin/cmake -E cmake_progress_start /path/to/debhello-1.7/obj-x86_64-linux...
 make[1]: Leaving directory '/path/to/debhello-1.7/obj-x86_64-linux-gnu'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-ew5O1HBa
+        rm -fr -- /tmp/dh-xdg-rundir-MRYObVoA
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
@@ -179,8 +180,8 @@ make[1]: Leaving directory '/path/to/deb
         cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
    dh_builddeb
-        dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
+        dpkg-deb --root-owner-group --build debian/debhello ..
 dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_1.7-1_amd...
 dpkg-deb: building package 'debhello' in '../debhello_1.7-1_amd64.deb'.
  dpkg-genbuildinfo -O../debhello_1.7-1_amd64.buildinfo
--- debmake-doc-1.21.orig/examples/debhello-1.7_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-1.7_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/e9/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/e9/bb5a751f0bc080d54c4257...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/81/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/81/21cd86cb65812b33d9b2a8...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-2.0/debian/control
+++ debmake-doc-1.21/examples/debhello-2.0/debian/control
@@ -2,7 +2,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,9 +12,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the compiled binary executable.
  .
@@ -23,8 +26,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the shared library.
 
@@ -32,6 +38,8 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This package contains the development files.
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-1/step200.slog
@@ -85,6 +85,29 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/libsharedlib1.symbols
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1dev_pack...
 I: creating => debian/libsharedlib-dev.install
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+--- Modified files ---
+debian/control
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-1/step203.slog
@@ -3,8 +3,10 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: bin
  This package contains the compiled binary executable.
  .
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: lib
  This package contains the shared library.
 
@@ -35,7 +41,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: auto-generated package by debmake: dev
  This package contains the development files.
 
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-1/step302.slog
@@ -5,7 +5,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the compiled binary executable.
  .
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the shared library.
 
@@ -35,7 +41,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This package contains the development files.
 
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-1/step500.slog
@@ -265,7 +265,7 @@ make[2]: Leaving directory '/path/to/deb
 make[2]: Entering directory '/path/to/debhello-2.0'
 make[2]: Leaving directory '/path/to/debhello-2.0'
 make[1]: Leaving directory '/path/to/debhello-2.0'
-        rm -fr -- /tmp/dh-xdg-rundir-opTwv0T6
+        rm -fr -- /tmp/dh-xdg-rundir-a4LT907b
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars debian/libsharedlib1.substvars deb...
@@ -335,10 +335,10 @@ dh_installdocs: warning: Could not parse
         install -m0755 -d debian/libsharedlib-dev/usr/share/doc/libsharedlib-...
         install -p -m0644 debian/copyright debian/libsharedlib-dev/usr/share/...
    dh_installchangelogs
-        install -m0755 -d debian/debhello/usr/share/doc/debhello
-        install -p -m0644 debian/.debhelper/generated/debhello/dh_installchan...
         install -m0755 -d debian/libsharedlib-dev/usr/share/doc/libsharedlib-...
         install -p -m0644 debian/.debhelper/generated/libsharedlib-dev/dh_ins...
+        install -m0755 -d debian/debhello/usr/share/doc/debhello
+        install -p -m0644 debian/.debhelper/generated/debhello/dh_installchan...
         install -m0755 -d debian/libsharedlib1/usr/share/doc/libsharedlib1
         install -p -m0644 debian/.debhelper/generated/libsharedlib1/dh_instal...
    dh_installexamples
@@ -358,31 +358,31 @@ dh_installdocs: warning: Could not parse
         cd debian/debhello
         cd debian/libsharedlib1
         cd debian/libsharedlib-dev
-        chmod a-x usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
-        gzip -9nf usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
         chmod a-x usr/share/doc/libsharedlib1/changelog.Debian
+        chmod a-x usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
         chmod a-x usr/share/doc/libsharedlib-dev/changelog.Debian
+        gzip -9nf usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
         gzip -9nf usr/share/doc/libsharedlib1/changelog.Debian
-        cd '/path/to/debhello-2.0'
         gzip -9nf usr/share/doc/libsharedlib-dev/changelog.Debian
         cd '/path/to/debhello-2.0'
         cd '/path/to/debhello-2.0'
+        cd '/path/to/debhello-2.0'
    dh_fixperms
-        find debian/debhello ! -type l -a -true -a -true -print0 2>/dev/null ...
         find debian/libsharedlib1 ! -type l -a -true -a -true -print0 2>/dev/...
+        find debian/debhello ! -type l -a -true -a -true -print0 2>/dev/null ...
         find debian/libsharedlib-dev ! -type l -a -true -a -true -print0 2>/d...
-        find debian/debhello/usr/share/doc -type f -a -true -a ! -regex 'debi...
         find debian/libsharedlib1/usr/share/doc -type f -a -true -a ! -regex ...
         find debian/libsharedlib-dev/usr/share/doc -type f -a -true -a ! -reg...
-        find debian/libsharedlib1/usr/share/doc -type d -a -true -a -true -pr...
+        find debian/debhello/usr/share/doc -type f -a -true -a ! -regex 'debi...
         find debian/libsharedlib-dev/usr/share/doc -type d -a -true -a -true ...
         find debian/debhello/usr/share/doc -type d -a -true -a -true -print0 ...
-        find debian/libsharedlib1 -type f \( -name '*.so.*' -o -name '*.so' -...
+        find debian/libsharedlib1/usr/share/doc -type d -a -true -a -true -pr...
         find debian/libsharedlib-dev/usr/include -type f -a -true -a -true -p...
         find debian/debhello/usr/share/man -type f -a -true -a -true -print0 ...
-        find debian/libsharedlib1/usr/lib -type f -name '*.ali' -a -true -a -...
+        find debian/libsharedlib1 -type f \( -name '*.so.*' -o -name '*.so' -...
         find debian/libsharedlib-dev -type f \( -name '*.so.*' -o -name '*.so...
         find debian/debhello -type f \( -name '*.so.*' -o -name '*.so' -o -na...
+        find debian/libsharedlib1/usr/lib -type f -name '*.ali' -a -true -a -...
         find debian/libsharedlib-dev/usr/lib -type f -name '*.ali' -a -true -...
         find debian/debhello/usr/bin -type f -a -true -a -true -print0 2>/dev...
    debian/rules override_dh_missing
@@ -390,8 +390,8 @@ make[1]: Entering directory '/path/to/de
 dh_missing -X.la
 make[1]: Leaving directory '/path/to/debhello-2.0'
    dh_dwz -a
-        dwz -- debian/debhello/usr/bin/hello
         dwz -- debian/libsharedlib1/usr/lib/x86_64-linux-gnu/libsharedlib.so....
+        dwz -- debian/debhello/usr/bin/hello
    dh_strip -a
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/usr/lib/debu...
         objcopy --only-keep-debug --compress-debug-sections debian/debhello/u...
@@ -429,15 +429,15 @@ make[1]: Leaving directory '/path/to/deb
         install -p -m0644 debian/.debhelper/generated/libsharedlib1/triggers ...
         install -m0755 -d debian/libsharedlib-dev/DEBIAN
    dh_gencontrol
+        install -m0755 -d debian/libsharedlib-dev/DEBIAN
+        echo misc:Depends= >> debian/libsharedlib-dev.substvars
+        echo misc:Pre-Depends= >> debian/libsharedlib-dev.substvars
+        dpkg-gencontrol -plibsharedlib-dev -ldebian/changelog -Tdebian/libsha...
         install -m0755 -d debian/libsharedlib1/DEBIAN
         echo misc:Depends= >> debian/libsharedlib1.substvars
         echo misc:Pre-Depends= >> debian/libsharedlib1.substvars
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
         dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
-        install -m0755 -d debian/libsharedlib-dev/DEBIAN
-        echo misc:Depends= >> debian/libsharedlib-dev.substvars
-        echo misc:Pre-Depends= >> debian/libsharedlib-dev.substvars
-        dpkg-gencontrol -plibsharedlib-dev -ldebian/changelog -Tdebian/libsha...
         install -m0755 -d debian/debhello/DEBIAN
         echo misc:Depends= >> debian/debhello.substvars
         echo misc:Pre-Depends= >> debian/debhello.substvars
@@ -453,30 +453,30 @@ make[1]: Leaving directory '/path/to/deb
    dh_md5sums
         install -m0755 -d debian/libsharedlib1/DEBIAN
         install -m0755 -d debian/debhello/DEBIAN
-        install -m0755 -d debian/libsharedlib-dev/DEBIAN
-        cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
         cd debian/libsharedlib1 >/dev/null && xargs -r0 md5sum | perl -pe 'if...
         cd debian/debhello >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^...
+        install -m0755 -d debian/libsharedlib-dev/DEBIAN
+        cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
         chmod 0644 -- debian/libsharedlib1/DEBIAN/md5sums
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
+        cd debian/.debhelper/libsharedlib1/dbgsym-root >/dev/null && xargs -r...
         chmod 0644 -- debian/debhello/DEBIAN/md5sums
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
-        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
-        cd debian/.debhelper/libsharedlib1/dbgsym-root >/dev/null && xargs -r...
         cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
-        chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
+        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
         chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/md5s...
+        chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
    dh_builddeb
         dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
-        dpkg-deb --root-owner-group --build debian/libsharedlib1 ..
         dpkg-deb --root-owner-group --build debian/.debhelper/libsharedlib1/d...
+        dpkg-deb --root-owner-group --build debian/libsharedlib1 ..
         dpkg-deb --root-owner-group --build debian/libsharedlib-dev ..
-dpkg-deb: building package 'debhello' in '../debhello_2.0-1_amd64.deb'.
 dpkg-deb: building package 'libsharedlib1-dbgsym' in '../libsharedlib1-dbgsym...
-dpkg-deb: building package 'libsharedlib-dev' in '../libsharedlib-dev_2.0-1_a...
-dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_2.0-1_amd...
+dpkg-deb: building package 'debhello' in '../debhello_2.0-1_amd64.deb'.
 dpkg-deb: building package 'libsharedlib1' in '../libsharedlib1_2.0-1_amd64.d...
+dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_2.0-1_amd...
+dpkg-deb: building package 'libsharedlib-dev' in '../libsharedlib-dev_2.0-1_a...
  dpkg-genbuildinfo -O../debhello_2.0-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_2.0-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/60/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/60/9a4c1cf27cc3fbe2cea2c0...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/91/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/91/61e561e510cfd3720fdee8...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-2/step151.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-2/step151.slog
@@ -1,14 +1,14 @@
  $ ls -l po
 total 60
--rw-rw-r-- 1 osamu osamu   494 Nov 12 13:10 ChangeLog
--rw-rw-r-- 1 osamu osamu 17577 Nov 12 13:10 Makefile.in.in
--rw-rw-r-- 1 osamu osamu  3376 Nov 12 13:10 Makevars.template
--rw-rw-r-- 1 osamu osamu    59 Nov 12 13:10 POTFILES.in
--rw-rw-r-- 1 osamu osamu  2203 Nov 12 13:10 Rules-quot
--rw-rw-r-- 1 osamu osamu   217 Nov 12 13:10 boldquot.sed
--rw-rw-r-- 1 osamu osamu  1337 Nov 12 13:10 en@boldquot.header
--rw-rw-r-- 1 osamu osamu  1203 Nov 12 13:10 en@quot.header
--rw-rw-r-- 1 osamu osamu   672 Nov 12 13:10 insert-header.sin
--rw-rw-r-- 1 osamu osamu   153 Nov 12 13:10 quot.sed
--rw-rw-r-- 1 osamu osamu   432 Nov 12 13:10 remove-potcdate.sin
+-rw-rw-r-- 1 osamu osamu   494 Nov 29 07:59 ChangeLog
+-rw-rw-r-- 1 osamu osamu 17577 Nov 29 07:59 Makefile.in.in
+-rw-rw-r-- 1 osamu osamu  3376 Nov 29 07:59 Makevars.template
+-rw-rw-r-- 1 osamu osamu    59 Nov 29 07:59 POTFILES.in
+-rw-rw-r-- 1 osamu osamu  2203 Nov 29 07:59 Rules-quot
+-rw-rw-r-- 1 osamu osamu   217 Nov 29 07:59 boldquot.sed
+-rw-rw-r-- 1 osamu osamu  1337 Nov 29 07:59 en@boldquot.header
+-rw-rw-r-- 1 osamu osamu  1203 Nov 29 07:59 en@quot.header
+-rw-rw-r-- 1 osamu osamu   672 Nov 29 07:59 insert-header.sin
+-rw-rw-r-- 1 osamu osamu   153 Nov 29 07:59 quot.sed
+-rw-rw-r-- 1 osamu osamu   432 Nov 29 07:59 remove-potcdate.sin
 
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-2/step153.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-2/step153.slog
@@ -1,7 +1,7 @@
  ... hack, hack, hack, ...
  $ diff -u po/Makevars.template po/Makevars
---- po/Makevars.template        2024-11-12 13:10:53.652893546 +0000
-+++ po/Makevars 2024-11-12 13:10:53.740894943 +0000
+--- po/Makevars.template        2024-11-29 07:59:15.133577084 +0000
++++ po/Makevars 2024-11-29 07:59:15.209578283 +0000
 @@ -18,14 +18,14 @@
  # or entity, or to disclaim their copyright.  The empty string stands for
  # the public domain; in this case the translators are expected to disclaim
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-2/step160.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-2/step160.slog
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-12 13:10+0000\n"
+"POT-Creation-Date: 2024-11-29 07:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-2/step200.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-2/step200.slog
@@ -90,6 +90,29 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/libsharedlib1.symbols
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1dev_pack...
 I: creating => debian/libsharedlib-dev.install
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+--- Modified files ---
+debian/control
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-2/step203.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-2/step203.slog
@@ -3,8 +3,10 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: bin
  This package contains the compiled binary executable.
  .
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: lib
  This package contains the shared library.
 
@@ -35,7 +41,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: auto-generated package by debmake: dev
  This package contains the development files.
 
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-2/step302.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-2/step302.slog
@@ -5,7 +5,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the compiled binary executable.
  .
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the shared library.
 
@@ -35,7 +41,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This package contains the development files.
 
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-2/step500.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-2/step500.slog
@@ -336,7 +336,7 @@ make[2]: Leaving directory '/path/to/deb
 make[2]: Entering directory '/path/to/debhello-2.0'
 make[2]: Leaving directory '/path/to/debhello-2.0'
 make[1]: Leaving directory '/path/to/debhello-2.0'
-        rm -fr -- /tmp/dh-xdg-rundir-WzoU1KhR
+        rm -fr -- /tmp/dh-xdg-rundir-wFg8WK8W
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars debian/libsharedlib1.substvars deb...
@@ -422,15 +422,15 @@ dh_installdocs: warning: Could not parse
         install -m0755 -d debian/libsharedlib-dev/usr/share/doc/libsharedlib-...
         install -p -m0644 debian/copyright debian/libsharedlib-dev/usr/share/...
    dh_installchangelogs
-        install -m0755 -d debian/libsharedlib1/usr/share/doc/libsharedlib1
-        install -p -m0644 debian/.debhelper/generated/libsharedlib1/dh_instal...
-        install -p -m0644 ./ChangeLog debian/libsharedlib1/usr/share/doc/libs...
         install -m0755 -d debian/libsharedlib-dev/usr/share/doc/libsharedlib-...
         install -p -m0644 debian/.debhelper/generated/libsharedlib-dev/dh_ins...
         install -p -m0644 ./ChangeLog debian/libsharedlib-dev/usr/share/doc/l...
         install -m0755 -d debian/debhello/usr/share/doc/debhello
         install -p -m0644 debian/.debhelper/generated/debhello/dh_installchan...
         install -p -m0644 ./ChangeLog debian/debhello/usr/share/doc/debhello/...
+        install -m0755 -d debian/libsharedlib1/usr/share/doc/libsharedlib1
+        install -p -m0644 debian/.debhelper/generated/libsharedlib1/dh_instal...
+        install -p -m0644 ./ChangeLog debian/libsharedlib1/usr/share/doc/libs...
    dh_installexamples
    dh_installman
         man-recode --to-code UTF-8 --suffix .dh-new debian/debhello/usr/share...
@@ -448,35 +448,35 @@ dh_installdocs: warning: Could not parse
         Normalizing debian/debhello/usr/share/locale/fr/LC_MESSAGES/debhello....
         Normalized debian/debhello/usr/share/locale/fr/LC_MESSAGES/debhello.m...
    dh_compress
-        cd debian/debhello
         cd debian/libsharedlib1
+        cd debian/debhello
         cd debian/libsharedlib-dev
         chmod a-x usr/share/doc/debhello/changelog usr/share/doc/debhello/cha...
-        chmod a-x usr/share/doc/libsharedlib-dev/changelog usr/share/doc/libs...
         chmod a-x usr/share/doc/libsharedlib1/changelog usr/share/doc/libshar...
         gzip -9nf usr/share/doc/debhello/changelog usr/share/doc/debhello/cha...
+        chmod a-x usr/share/doc/libsharedlib-dev/changelog usr/share/doc/libs...
+        gzip -9nf usr/share/doc/libsharedlib1/changelog usr/share/doc/libshar...
         gzip -9nf usr/share/doc/libsharedlib-dev/changelog usr/share/doc/libs...
         cd '/path/to/debhello-2.0'
-        gzip -9nf usr/share/doc/libsharedlib1/changelog usr/share/doc/libshar...
         cd '/path/to/debhello-2.0'
         cd '/path/to/debhello-2.0'
    dh_fixperms
         find debian/debhello ! -type l -a -true -a -true -print0 2>/dev/null ...
         find debian/libsharedlib1 ! -type l -a -true -a -true -print0 2>/dev/...
         find debian/libsharedlib-dev ! -type l -a -true -a -true -print0 2>/d...
-        find debian/libsharedlib1/usr/share/doc -type f -a -true -a ! -regex ...
         find debian/libsharedlib-dev/usr/share/doc -type f -a -true -a ! -reg...
+        find debian/libsharedlib1/usr/share/doc -type f -a -true -a ! -regex ...
         find debian/debhello/usr/share/doc -type f -a -true -a ! -regex 'debi...
-        find debian/libsharedlib1/usr/share/doc -type d -a -true -a -true -pr...
         find debian/libsharedlib-dev/usr/share/doc -type d -a -true -a -true ...
+        find debian/libsharedlib1/usr/share/doc -type d -a -true -a -true -pr...
         find debian/debhello/usr/share/doc -type d -a -true -a -true -print0 ...
-        find debian/libsharedlib1 -type f \( -name '*.so.*' -o -name '*.so' -...
         find debian/libsharedlib-dev/usr/include -type f -a -true -a -true -p...
+        find debian/libsharedlib1 -type f \( -name '*.so.*' -o -name '*.so' -...
         find debian/debhello/usr/share/man -type f -a -true -a -true -print0 ...
         find debian/libsharedlib-dev -type f \( -name '*.so.*' -o -name '*.so...
+        find debian/libsharedlib-dev/usr/lib -type f -name '*.ali' -a -true -...
         find debian/libsharedlib1/usr/lib -type f -name '*.ali' -a -true -a -...
         find debian/debhello -type f \( -name '*.so.*' -o -name '*.so' -o -na...
-        find debian/libsharedlib-dev/usr/lib -type f -name '*.ali' -a -true -...
         find debian/debhello/usr/bin -type f -a -true -a -true -print0 2>/dev...
    debian/rules override_dh_missing
 make[1]: Entering directory '/path/to/debhello-2.0'
@@ -494,14 +494,14 @@ make[1]: Leaving directory '/path/to/deb
         strip --remove-section=.comment --remove-section=.note --strip-unneed...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/usr/lib/debug/.b...
         strip --remove-section=.comment --remove-section=.note debian/debhell...
-        objcopy --add-gnu-debuglink debian/.debhelper/libsharedlib1/dbgsym-ro...
         objcopy --add-gnu-debuglink debian/.debhelper/debhello/dbgsym-root/us...
-        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/usr/sha...
-        ln -s libsharedlib1 debian/.debhelper/libsharedlib1/dbgsym-root/usr/s...
-        install -m0755 -d debian/.debhelper/libsharedlib1
+        objcopy --add-gnu-debuglink debian/.debhelper/libsharedlib1/dbgsym-ro...
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/usr/share/do...
         ln -s debhello debian/.debhelper/debhello/dbgsym-root/usr/share/doc/d...
         install -m0755 -d debian/.debhelper/debhello
+        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/usr/sha...
+        ln -s libsharedlib1 debian/.debhelper/libsharedlib1/dbgsym-root/usr/s...
+        install -m0755 -d debian/.debhelper/libsharedlib1
    dh_makeshlibs -a
         rm -f debian/debhello/DEBIAN/shlibs
         rm -f debian/libsharedlib1/DEBIAN/shlibs
@@ -527,49 +527,49 @@ make[1]: Leaving directory '/path/to/deb
         echo misc:Pre-Depends= >> debian/debhello.substvars
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
         dpkg-gencontrol -pdebhello -ldebian/changelog -Tdebian/debhello.subst...
+        install -m0755 -d debian/libsharedlib-dev/DEBIAN
+        echo misc:Depends= >> debian/libsharedlib-dev.substvars
+        echo misc:Pre-Depends= >> debian/libsharedlib-dev.substvars
+        dpkg-gencontrol -plibsharedlib-dev -ldebian/changelog -Tdebian/libsha...
         install -m0755 -d debian/libsharedlib1/DEBIAN
         echo misc:Depends= >> debian/libsharedlib1.substvars
         echo misc:Pre-Depends= >> debian/libsharedlib1.substvars
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
         dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
-        install -m0755 -d debian/libsharedlib-dev/DEBIAN
-        echo misc:Depends= >> debian/libsharedlib-dev.substvars
-        echo misc:Pre-Depends= >> debian/libsharedlib-dev.substvars
-        dpkg-gencontrol -plibsharedlib-dev -ldebian/changelog -Tdebian/libsha...
+        chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/cont...
+        dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/control
         dpkg-gencontrol -pdebhello -ldebian/changelog -Tdebian/debhello.subst...
         chmod 0644 -- debian/libsharedlib-dev/DEBIAN/control
-        chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/cont...
-        dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
         chmod 0644 -- debian/debhello/DEBIAN/control
         chmod 0644 -- debian/libsharedlib1/DEBIAN/control
    dh_md5sums
         install -m0755 -d debian/libsharedlib1/DEBIAN
-        cd debian/libsharedlib1 >/dev/null && xargs -r0 md5sum | perl -pe 'if...
-        install -m0755 -d debian/libsharedlib-dev/DEBIAN
         install -m0755 -d debian/debhello/DEBIAN
-        chmod 0644 -- debian/libsharedlib1/DEBIAN/md5sums
-        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
         cd debian/debhello >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^...
-        cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
-        cd debian/.debhelper/libsharedlib1/dbgsym-root >/dev/null && xargs -r...
-        chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/md5s...
+        cd debian/libsharedlib1 >/dev/null && xargs -r0 md5sum | perl -pe 'if...
+        install -m0755 -d debian/libsharedlib-dev/DEBIAN
         chmod 0644 -- debian/debhello/DEBIAN/md5sums
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
-        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
         cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
+        cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
+        chmod 0644 -- debian/libsharedlib1/DEBIAN/md5sums
+        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
+        cd debian/.debhelper/libsharedlib1/dbgsym-root >/dev/null && xargs -r...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
+        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
+        chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/md5s...
    dh_builddeb
+        dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
-        dpkg-deb --root-owner-group --build debian/libsharedlib1 ..
         dpkg-deb --root-owner-group --build debian/.debhelper/libsharedlib1/d...
-        dpkg-deb --root-owner-group --build debian/debhello ..
+        dpkg-deb --root-owner-group --build debian/libsharedlib1 ..
         dpkg-deb --root-owner-group --build debian/libsharedlib-dev ..
-dpkg-deb: building package 'libsharedlib1' in '../libsharedlib1_2.0-1_amd64.d...
-dpkg-deb: building package 'debhello' in '../debhello_2.0-1_amd64.deb'.
 dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_2.0-1_amd...
-dpkg-deb: building package 'libsharedlib1-dbgsym' in '../libsharedlib1-dbgsym...
+dpkg-deb: building package 'debhello' in '../debhello_2.0-1_amd64.deb'.
 dpkg-deb: building package 'libsharedlib-dev' in '../libsharedlib-dev_2.0-1_a...
+dpkg-deb: building package 'libsharedlib1-dbgsym' in '../libsharedlib1-dbgsym...
+dpkg-deb: building package 'libsharedlib1' in '../libsharedlib1_2.0-1_amd64.d...
  dpkg-genbuildinfo -O../debhello_2.0-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_2.0-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-2.0_build-2/step700.slog
+++ debmake-doc-1.21/examples/debhello-2.0_build-2/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/fd/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/fd/b809dcb34d8c62ca3d2619...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/2f/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/2f/b14cec84264cd50ecc8af6...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-2.1/debian/control
+++ debmake-doc-1.21/examples/debhello-2.1/debian/control
@@ -2,7 +2,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,9 +12,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the compiled binary executable.
  .
@@ -23,8 +26,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the shared library.
 
@@ -32,6 +38,8 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This package contains the development files.
--- debmake-doc-1.21.orig/examples/debhello-2.1_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-2.1_build-1/step200.slog
@@ -84,6 +84,29 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/libsharedlib1.symbols
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1dev_pack...
 I: creating => debian/libsharedlib-dev.install
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+--- Modified files ---
+debian/control
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-2.1_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-2.1_build-1/step203.slog
@@ -3,8 +3,10 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: bin
  This package contains the compiled binary executable.
  .
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: lib
  This package contains the shared library.
 
@@ -35,7 +41,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: auto-generated package by debmake: dev
  This package contains the development files.
 
--- debmake-doc-1.21.orig/examples/debhello-2.1_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-2.1_build-1/step302.slog
@@ -5,7 +5,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the compiled binary executable.
  .
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the shared library.
 
@@ -35,7 +41,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This package contains the development files.
 
--- debmake-doc-1.21.orig/examples/debhello-2.1_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-2.1_build-1/step500.slog
@@ -40,11 +40,12 @@ dh_auto_configure -- \
       -DCMAKE_LIBRARY_ARCHITECTURE="x86_64-linux-gnu"
         cd obj-x86_64-linux-gnu && DEB_PYTHON_INSTALL_LAYOUT=deb PKG_CONFIG=/...
 CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
-  Compatibility with CMake < 3.5 will be removed from a future version of
+  Compatibility with CMake < 3.10 will be removed from a future version of
   CMake.
 
-  Update the VERSION argument <min> value or use a ...<max> suffix to tell
-  CMake that the project does not need compatibility with older versions.
+  Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated...
+  to work with policies introduced by <max> or earlier.
 
 
 -- The C compiler identification is GNU 14.2.0
@@ -59,7 +60,7 @@ CMake Deprecation Warning at CMakeLists.
 -- Check for working CXX compiler: /usr/bin/c++ - skipped
 -- Detecting CXX compile features
 -- Detecting CXX compile features - done
--- Configuring done (0.7s)
+-- Configuring done (0.6s)
 -- Generating done (0.0s)
 CMake Warning:
   Manually-specified variables were not used by the project:
@@ -114,7 +115,7 @@ make[2]: Leaving directory '/path/to/deb
 /usr/bin/cmake -E cmake_progress_start /path/to/debhello-2.1/obj-x86_64-linux...
 make[1]: Leaving directory '/path/to/debhello-2.1/obj-x86_64-linux-gnu'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-Sdb3TbGa
+        rm -fr -- /tmp/dh-xdg-rundir-MVr69Ad4
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars debian/libsharedlib1.substvars deb...
@@ -181,21 +182,21 @@ dh_installdocs: warning: Could not parse
         ln -s libsharedlib.so.1 debian/libsharedlib-dev/usr/lib/x86_64-linux-...
    dh_strip_nondeterminism
    dh_compress
-        cd debian/debhello
         cd debian/libsharedlib1
+        cd debian/debhello
         cd debian/libsharedlib-dev
-        chmod a-x usr/share/doc/libsharedlib-dev/changelog.Debian
-        chmod a-x usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
         chmod a-x usr/share/doc/libsharedlib1/changelog.Debian
-        gzip -9nf usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
-        gzip -9nf usr/share/doc/libsharedlib-dev/changelog.Debian
+        chmod a-x usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
         gzip -9nf usr/share/doc/libsharedlib1/changelog.Debian
         cd '/path/to/debhello-2.1'
+        gzip -9nf usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
         cd '/path/to/debhello-2.1'
+        chmod a-x usr/share/doc/libsharedlib-dev/changelog.Debian
+        gzip -9nf usr/share/doc/libsharedlib-dev/changelog.Debian
         cd '/path/to/debhello-2.1'
    dh_fixperms
-        find debian/debhello ! -type l -a -true -a -true -print0 2>/dev/null ...
         find debian/libsharedlib1 ! -type l -a -true -a -true -print0 2>/dev/...
+        find debian/debhello ! -type l -a -true -a -true -print0 2>/dev/null ...
         find debian/libsharedlib-dev ! -type l -a -true -a -true -print0 2>/d...
         find debian/libsharedlib1/usr/share/doc -type f -a -true -a ! -regex ...
         find debian/debhello/usr/share/doc -type f -a -true -a ! -regex 'debi...
@@ -208,13 +209,13 @@ dh_installdocs: warning: Could not parse
         find debian/libsharedlib-dev/usr/include -type f -a -true -a -true -p...
         find debian/debhello -type f \( -name '*.so.*' -o -name '*.so' -o -na...
         find debian/libsharedlib1/usr/lib -type f -name '*.ali' -a -true -a -...
-        find debian/libsharedlib-dev -type f \( -name '*.so.*' -o -name '*.so...
         find debian/debhello/usr/bin -type f -a -true -a -true -print0 2>/dev...
+        find debian/libsharedlib-dev -type f \( -name '*.so.*' -o -name '*.so...
         find debian/libsharedlib-dev/usr/lib -type f -name '*.ali' -a -true -...
    dh_missing
    dh_dwz -a
-        dwz -- debian/libsharedlib1/usr/lib/x86_64-linux-gnu/libsharedlib.so....
         dwz -- debian/debhello/usr/bin/hello
+        dwz -- debian/libsharedlib1/usr/lib/x86_64-linux-gnu/libsharedlib.so....
    dh_strip -a
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/usr/lib...
         objcopy --only-keep-debug --compress-debug-sections debian/libsharedl...
@@ -242,64 +243,64 @@ dh_installdocs: warning: Could not parse
         mv debian/.debhelper/generated/libsharedlib1/triggers.new debian/.deb...
         rm -f debian/libsharedlib-dev/DEBIAN/shlibs
    dh_shlibdeps -a
-        install -m0755 -d debian/libsharedlib1/DEBIAN
-        dpkg-shlibdeps -Tdebian/libsharedlib1.substvars debian/libsharedlib1/...
         install -m0755 -d debian/debhello/DEBIAN
         dpkg-shlibdeps -Tdebian/debhello.substvars debian/debhello/usr/bin/he...
+        install -m0755 -d debian/libsharedlib1/DEBIAN
+        dpkg-shlibdeps -Tdebian/libsharedlib1.substvars debian/libsharedlib1/...
    dh_installdeb
         install -m0755 -d debian/debhello/DEBIAN
         install -m0755 -d debian/libsharedlib1/DEBIAN
         install -p -m0644 debian/.debhelper/generated/libsharedlib1/triggers ...
         install -m0755 -d debian/libsharedlib-dev/DEBIAN
    dh_gencontrol
-        install -m0755 -d debian/libsharedlib1/DEBIAN
-        echo misc:Depends= >> debian/libsharedlib1.substvars
-        echo misc:Pre-Depends= >> debian/libsharedlib1.substvars
-        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
-        dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
-        install -m0755 -d debian/libsharedlib-dev/DEBIAN
-        echo misc:Depends= >> debian/libsharedlib-dev.substvars
-        echo misc:Pre-Depends= >> debian/libsharedlib-dev.substvars
-        dpkg-gencontrol -plibsharedlib-dev -ldebian/changelog -Tdebian/libsha...
         install -m0755 -d debian/debhello/DEBIAN
         echo misc:Depends= >> debian/debhello.substvars
         echo misc:Pre-Depends= >> debian/debhello.substvars
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
         dpkg-gencontrol -pdebhello -ldebian/changelog -Tdebian/debhello.subst...
-        chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/cont...
+        install -m0755 -d debian/libsharedlib-dev/DEBIAN
+        echo misc:Depends= >> debian/libsharedlib-dev.substvars
+        echo misc:Pre-Depends= >> debian/libsharedlib-dev.substvars
+        dpkg-gencontrol -plibsharedlib-dev -ldebian/changelog -Tdebian/libsha...
+        install -m0755 -d debian/libsharedlib1/DEBIAN
+        echo misc:Depends= >> debian/libsharedlib1.substvars
+        echo misc:Pre-Depends= >> debian/libsharedlib1.substvars
+        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
         dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/control
         dpkg-gencontrol -pdebhello -ldebian/changelog -Tdebian/debhello.subst...
+        chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/cont...
+        dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
         chmod 0644 -- debian/libsharedlib-dev/DEBIAN/control
         chmod 0644 -- debian/debhello/DEBIAN/control
         chmod 0644 -- debian/libsharedlib1/DEBIAN/control
    dh_md5sums
         install -m0755 -d debian/debhello/DEBIAN
-        cd debian/debhello >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^...
         install -m0755 -d debian/libsharedlib1/DEBIAN
-        install -m0755 -d debian/libsharedlib-dev/DEBIAN
+        cd debian/debhello >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^...
         cd debian/libsharedlib1 >/dev/null && xargs -r0 md5sum | perl -pe 'if...
-        cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
+        install -m0755 -d debian/libsharedlib-dev/DEBIAN
         chmod 0644 -- debian/debhello/DEBIAN/md5sums
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
-        cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
-        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
+        cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
         chmod 0644 -- debian/libsharedlib1/DEBIAN/md5sums
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
+        cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
         cd debian/.debhelper/libsharedlib1/dbgsym-root >/dev/null && xargs -r...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
+        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
         chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/md5s...
    dh_builddeb
         dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
-        dpkg-deb --root-owner-group --build debian/libsharedlib1 ..
         dpkg-deb --root-owner-group --build debian/.debhelper/libsharedlib1/d...
+        dpkg-deb --root-owner-group --build debian/libsharedlib1 ..
         dpkg-deb --root-owner-group --build debian/libsharedlib-dev ..
 dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_2.1-1_amd...
-dpkg-deb: building package 'libsharedlib1' in '../libsharedlib1_2.1-1_amd64.d...
 dpkg-deb: building package 'debhello' in '../debhello_2.1-1_amd64.deb'.
-dpkg-deb: building package 'libsharedlib1-dbgsym' in '../libsharedlib1-dbgsym...
 dpkg-deb: building package 'libsharedlib-dev' in '../libsharedlib-dev_2.1-1_a...
+dpkg-deb: building package 'libsharedlib1-dbgsym' in '../libsharedlib1-dbgsym...
+dpkg-deb: building package 'libsharedlib1' in '../libsharedlib1_2.1-1_amd64.d...
  dpkg-genbuildinfo -O../debhello_2.1-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_2.1-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-2.1_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-2.1_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/64/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/64/e2b8a45b6b57f31abeca1f...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/9f/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/9f/cc0c025fd92c5cd6b024ec...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-2.1_build-2/step200.slog
+++ debmake-doc-1.21/examples/debhello-2.1_build-2/step200.slog
@@ -84,6 +84,29 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/libsharedlib1.symbols
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1dev_pack...
 I: creating => debian/libsharedlib-dev.install
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+--- Modified files ---
+debian/control
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-2.1_build-2/step203.slog
+++ debmake-doc-1.21/examples/debhello-2.1_build-2/step203.slog
@@ -3,8 +3,10 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: bin
  This package contains the compiled binary executable.
  .
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: lib
  This package contains the shared library.
 
@@ -35,7 +41,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: auto-generated package by debmake: dev
  This package contains the development files.
 
--- debmake-doc-1.21.orig/examples/debhello-2.1_build-2/step302.slog
+++ debmake-doc-1.21/examples/debhello-2.1_build-2/step302.slog
@@ -5,7 +5,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the compiled binary executable.
  .
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This package contains the shared library.
 
@@ -35,7 +41,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This package contains the development files.
 
--- debmake-doc-1.21.orig/examples/debhello-2.1_build-2/step500.slog
+++ debmake-doc-1.21/examples/debhello-2.1_build-2/step500.slog
@@ -40,11 +40,12 @@ dh_auto_configure -- \
       -DCMAKE_LIBRARY_ARCHITECTURE="x86_64-linux-gnu"
         cd obj-x86_64-linux-gnu && DEB_PYTHON_INSTALL_LAYOUT=deb PKG_CONFIG=/...
 CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
-  Compatibility with CMake < 3.5 will be removed from a future version of
+  Compatibility with CMake < 3.10 will be removed from a future version of
   CMake.
 
-  Update the VERSION argument <min> value or use a ...<max> suffix to tell
-  CMake that the project does not need compatibility with older versions.
+  Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated...
+  to work with policies introduced by <max> or earlier.
 
 
 -- The C compiler identification is GNU 14.2.0
@@ -114,7 +115,7 @@ make[2]: Leaving directory '/path/to/deb
 /usr/bin/cmake -E cmake_progress_start /path/to/debhello-2.1/obj-x86_64-linux...
 make[1]: Leaving directory '/path/to/debhello-2.1/obj-x86_64-linux-gnu'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-CXSFk7ic
+        rm -fr -- /tmp/dh-xdg-rundir-8XWNQTnK
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars debian/libsharedlib1.substvars deb...
@@ -161,12 +162,12 @@ dh_installdocs: warning: Could not parse
         install -m0755 -d debian/libsharedlib-dev/usr/share/doc/libsharedlib-...
         install -p -m0644 debian/copyright debian/libsharedlib-dev/usr/share/...
    dh_installchangelogs
+        install -m0755 -d debian/libsharedlib-dev/usr/share/doc/libsharedlib-...
+        install -p -m0644 debian/.debhelper/generated/libsharedlib-dev/dh_ins...
         install -m0755 -d debian/debhello/usr/share/doc/debhello
         install -p -m0644 debian/.debhelper/generated/debhello/dh_installchan...
         install -m0755 -d debian/libsharedlib1/usr/share/doc/libsharedlib1
         install -p -m0644 debian/.debhelper/generated/libsharedlib1/dh_instal...
-        install -m0755 -d debian/libsharedlib-dev/usr/share/doc/libsharedlib-...
-        install -p -m0644 debian/.debhelper/generated/libsharedlib-dev/dh_ins...
    dh_installexamples
    dh_installman
         man-recode --to-code UTF-8 --suffix .dh-new debian/debhello/usr/share...
@@ -188,28 +189,28 @@ dh_installdocs: warning: Could not parse
         chmod a-x usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
         chmod a-x usr/share/doc/libsharedlib1/changelog.Debian
         gzip -9nf usr/share/doc/libsharedlib-dev/changelog.Debian
-        gzip -9nf usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
         gzip -9nf usr/share/doc/libsharedlib1/changelog.Debian
+        gzip -9nf usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
         cd '/path/to/debhello-2.1'
         cd '/path/to/debhello-2.1'
         cd '/path/to/debhello-2.1'
    dh_fixperms
-        find debian/libsharedlib1 ! -type l -a -true -a -true -print0 2>/dev/...
         find debian/debhello ! -type l -a -true -a -true -print0 2>/dev/null ...
+        find debian/libsharedlib1 ! -type l -a -true -a -true -print0 2>/dev/...
         find debian/libsharedlib-dev ! -type l -a -true -a -true -print0 2>/d...
         find debian/debhello/usr/share/doc -type f -a -true -a ! -regex 'debi...
-        find debian/libsharedlib-dev/usr/share/doc -type f -a -true -a ! -reg...
         find debian/libsharedlib1/usr/share/doc -type f -a -true -a ! -regex ...
-        find debian/libsharedlib-dev/usr/share/doc -type d -a -true -a -true ...
+        find debian/libsharedlib-dev/usr/share/doc -type f -a -true -a ! -reg...
         find debian/debhello/usr/share/doc -type d -a -true -a -true -print0 ...
         find debian/libsharedlib1/usr/share/doc -type d -a -true -a -true -pr...
+        find debian/libsharedlib-dev/usr/share/doc -type d -a -true -a -true ...
         find debian/libsharedlib-dev/usr/include -type f -a -true -a -true -p...
         find debian/debhello/usr/share/man -type f -a -true -a -true -print0 ...
         find debian/libsharedlib1 -type f \( -name '*.so.*' -o -name '*.so' -...
-        find debian/debhello -type f \( -name '*.so.*' -o -name '*.so' -o -na...
         find debian/libsharedlib-dev -type f \( -name '*.so.*' -o -name '*.so...
-        find debian/libsharedlib-dev/usr/lib -type f -name '*.ali' -a -true -...
         find debian/libsharedlib1/usr/lib -type f -name '*.ali' -a -true -a -...
+        find debian/debhello -type f \( -name '*.so.*' -o -name '*.so' -o -na...
+        find debian/libsharedlib-dev/usr/lib -type f -name '*.ali' -a -true -...
         find debian/debhello/usr/bin -type f -a -true -a -true -print0 2>/dev...
    dh_missing
    dh_dwz -a
@@ -220,18 +221,18 @@ dh_installdocs: warning: Could not parse
         objcopy --only-keep-debug --compress-debug-sections debian/debhello/u...
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/usr/lib...
         objcopy --only-keep-debug --compress-debug-sections debian/libsharedl...
-        chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/usr/lib/deb...
-        strip --remove-section=.comment --remove-section=.note --strip-unneed...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/usr/lib/debug/.b...
         strip --remove-section=.comment --remove-section=.note debian/debhell...
-        objcopy --add-gnu-debuglink debian/.debhelper/libsharedlib1/dbgsym-ro...
+        chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/usr/lib/deb...
+        strip --remove-section=.comment --remove-section=.note --strip-unneed...
         objcopy --add-gnu-debuglink debian/.debhelper/debhello/dbgsym-root/us...
-        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/usr/sha...
-        ln -s libsharedlib1 debian/.debhelper/libsharedlib1/dbgsym-root/usr/s...
-        install -m0755 -d debian/.debhelper/libsharedlib1
+        objcopy --add-gnu-debuglink debian/.debhelper/libsharedlib1/dbgsym-ro...
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/usr/share/do...
         ln -s debhello debian/.debhelper/debhello/dbgsym-root/usr/share/doc/d...
         install -m0755 -d debian/.debhelper/debhello
+        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/usr/sha...
+        ln -s libsharedlib1 debian/.debhelper/libsharedlib1/dbgsym-root/usr/s...
+        install -m0755 -d debian/.debhelper/libsharedlib1
    dh_makeshlibs -a
         rm -f debian/debhello/DEBIAN/shlibs
         rm -f debian/libsharedlib1/DEBIAN/shlibs
@@ -252,15 +253,15 @@ dh_installdocs: warning: Could not parse
         install -p -m0644 debian/.debhelper/generated/libsharedlib1/triggers ...
         install -m0755 -d debian/libsharedlib-dev/DEBIAN
    dh_gencontrol
+        install -m0755 -d debian/libsharedlib-dev/DEBIAN
+        echo misc:Depends= >> debian/libsharedlib-dev.substvars
+        echo misc:Pre-Depends= >> debian/libsharedlib-dev.substvars
+        dpkg-gencontrol -plibsharedlib-dev -ldebian/changelog -Tdebian/libsha...
         install -m0755 -d debian/libsharedlib1/DEBIAN
         echo misc:Depends= >> debian/libsharedlib1.substvars
         echo misc:Pre-Depends= >> debian/libsharedlib1.substvars
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
         dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
-        install -m0755 -d debian/libsharedlib-dev/DEBIAN
-        echo misc:Depends= >> debian/libsharedlib-dev.substvars
-        echo misc:Pre-Depends= >> debian/libsharedlib-dev.substvars
-        dpkg-gencontrol -plibsharedlib-dev -ldebian/changelog -Tdebian/libsha...
         install -m0755 -d debian/debhello/DEBIAN
         echo misc:Depends= >> debian/debhello.substvars
         echo misc:Pre-Depends= >> debian/debhello.substvars
@@ -274,32 +275,32 @@ dh_installdocs: warning: Could not parse
         chmod 0644 -- debian/libsharedlib1/DEBIAN/control
         chmod 0644 -- debian/debhello/DEBIAN/control
    dh_md5sums
+        install -m0755 -d debian/libsharedlib1/DEBIAN
         install -m0755 -d debian/debhello/DEBIAN
         cd debian/debhello >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^...
-        install -m0755 -d debian/libsharedlib-dev/DEBIAN
-        install -m0755 -d debian/libsharedlib1/DEBIAN
-        cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
         cd debian/libsharedlib1 >/dev/null && xargs -r0 md5sum | perl -pe 'if...
+        install -m0755 -d debian/libsharedlib-dev/DEBIAN
         chmod 0644 -- debian/debhello/DEBIAN/md5sums
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
-        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
+        cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
         cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
         chmod 0644 -- debian/libsharedlib1/DEBIAN/md5sums
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
         cd debian/.debhelper/libsharedlib1/dbgsym-root >/dev/null && xargs -r...
+        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
         chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/md5s...
    dh_builddeb
         dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
-        dpkg-deb --root-owner-group --build debian/.debhelper/libsharedlib1/d...
-        dpkg-deb --root-owner-group --build debian/libsharedlib1 ..
         dpkg-deb --root-owner-group --build debian/libsharedlib-dev ..
+        dpkg-deb --root-owner-group --build debian/libsharedlib1 ..
+        dpkg-deb --root-owner-group --build debian/.debhelper/libsharedlib1/d...
+dpkg-deb: building package 'libsharedlib-dev' in '../libsharedlib-dev_2.1-1_a...
+dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_2.1-1_amd...
+dpkg-deb: building package 'debhello' in '../debhello_2.1-1_amd64.deb'.
 dpkg-deb: building package 'libsharedlib1' in '../libsharedlib1_2.1-1_amd64.d...
 dpkg-deb: building package 'libsharedlib1-dbgsym' in '../libsharedlib1-dbgsym...
-dpkg-deb: building package 'debhello' in '../debhello_2.1-1_amd64.deb'.
-dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_2.1-1_amd...
-dpkg-deb: building package 'libsharedlib-dev' in '../libsharedlib-dev_2.1-1_a...
  dpkg-genbuildinfo -O../debhello_2.1-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_2.1-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-2.1_build-2/step700.slog
+++ debmake-doc-1.21/examples/debhello-2.1_build-2/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/fc/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/fc/709f0177cbcdc2beb6579d...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/99/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/99/74e3998ec94910256f5bd6...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-3.0/debian/control
+++ debmake-doc-1.21/examples/debhello-3.0/debian/control
@@ -2,7 +2,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +11,8 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-3.0_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-3.0_build-1/step200.slog
@@ -63,6 +63,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-3.0_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-3.0_build-1/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,8 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-3.0_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-3.0_build-1/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,8 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-3.0_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-3.0_build-1/step500.slog
@@ -57,7 +57,7 @@ msgfmt ja.po -o ja.mo
 make[2]: Leaving directory '/path/to/debhello-3.0/po'
 make[1]: Leaving directory '/path/to/debhello-3.0'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-FpOng6rA
+        rm -fr -- /tmp/dh-xdg-rundir-qNV940U1
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
--- debmake-doc-1.21.orig/examples/debhello-3.2/debian/control
+++ debmake-doc-1.21/examples/debhello-3.2/debian/control
@@ -2,7 +2,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +11,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-3.2_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-3.2_build-1/step200.slog
@@ -65,6 +65,17 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/install
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1single_l...
 I: creating => debian/links
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/dirs
+debian/install
+debian/links
+--- Modified files ---
+debian/control
+debian/dirs
+debian/install
+debian/links
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-3.2_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-3.2_build-1/step203.slog
@@ -3,8 +3,9 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake
  This Debian binary package was auto-generated by the
  debmake(1) command provided by the debmake package.
--- debmake-doc-1.21.orig/examples/debhello-3.2_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-3.2_build-1/step302.slog
@@ -5,7 +5,8 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends:
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,7 +14,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/examples/debhello-3.2_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-3.2_build-1/step500.slog
@@ -70,7 +70,7 @@ msgfmt ja.po -o ja.mo
 make[2]: Leaving directory '/path/to/debhello-3.2/po'
 make[1]: Leaving directory '/path/to/debhello-3.2'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-bP9Xa8kC
+        rm -fr -- /tmp/dh-xdg-rundir-ZMMdRABE
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars
@@ -163,8 +163,8 @@ make[1]: Leaving directory '/path/to/deb
    dh_builddeb
         dpkg-deb --root-owner-group --build debian/debhello ..
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
-dpkg-deb: building package 'debhello' in '../debhello_3.2-1_amd64.deb'.
 dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_3.2-1_amd...
+dpkg-deb: building package 'debhello' in '../debhello_3.2-1_amd64.deb'.
  dpkg-genbuildinfo -O../debhello_3.2-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_3.2-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-3.2_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-3.2_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/e4/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/e4/6462c8b24dcaa9c3386c34...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/74/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/74/2f527e0343d3c6f6b8469c...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-3.3/debian/control
+++ debmake-doc-1.21/examples/debhello-3.3/debian/control
@@ -2,7 +2,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,9 +12,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
@@ -41,7 +47,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
--- debmake-doc-1.21.orig/examples/debhello-3.3_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-3.3_build-1/step200.slog
@@ -91,6 +91,29 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/libsharedlib1.symbols
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1dev_pack...
 I: creating => debian/libsharedlib-dev.install
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+--- Modified files ---
+debian/control
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-3.3_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-3.3_build-1/step203.slog
@@ -3,8 +3,10 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
-Standards-Version: 4.6.2
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: bin
  This package contains the compiled binary executable.
  .
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: lib
  This package contains the shared library.
 
@@ -35,7 +41,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: auto-generated package by debmake: dev
  This package contains the development files.
 
--- debmake-doc-1.21.orig/examples/debhello-3.3_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-3.3_build-1/step302.slog
@@ -5,7 +5,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-autoreconf
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-autoreconf,
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
@@ -29,8 +32,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
@@ -44,7 +50,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
--- debmake-doc-1.21.orig/examples/debhello-3.3_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-3.3_build-1/step500.slog
@@ -399,7 +399,7 @@ make[2]: Leaving directory '/path/to/deb
 make[2]: Entering directory '/path/to/debhello-3.3'
 make[2]: Leaving directory '/path/to/debhello-3.3'
 make[1]: Leaving directory '/path/to/debhello-3.3'
-        rm -fr -- /tmp/dh-xdg-rundir-kUNowHg0
+        rm -fr -- /tmp/dh-xdg-rundir-l0WpqqIc
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars debian/libsharedlib1.substvars deb...
@@ -487,10 +487,10 @@ dh_installdocs: warning: Could not parse
    dh_installchangelogs
         install -m0755 -d debian/debhello/usr/share/doc/debhello
         install -p -m0644 debian/.debhelper/generated/debhello/dh_installchan...
-        install -m0755 -d debian/libsharedlib-dev/usr/share/doc/libsharedlib-...
-        install -p -m0644 debian/.debhelper/generated/libsharedlib-dev/dh_ins...
         install -m0755 -d debian/libsharedlib1/usr/share/doc/libsharedlib1
         install -p -m0644 debian/.debhelper/generated/libsharedlib1/dh_instal...
+        install -m0755 -d debian/libsharedlib-dev/usr/share/doc/libsharedlib-...
+        install -p -m0644 debian/.debhelper/generated/libsharedlib-dev/dh_ins...
    dh_installexamples
    dh_installman
         man-recode --to-code UTF-8 --suffix .dh-new debian/debhello/usr/share...
@@ -508,35 +508,35 @@ dh_installdocs: warning: Could not parse
         Normalizing debian/debhello/usr/share/locale/fr/LC_MESSAGES/debhello....
         Normalized debian/debhello/usr/share/locale/fr/LC_MESSAGES/debhello.m...
    dh_compress
-        cd debian/debhello
-        cd debian/libsharedlib1
         cd debian/libsharedlib-dev
+        cd debian/libsharedlib1
+        cd debian/debhello
         chmod a-x usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
-        chmod a-x usr/share/doc/libsharedlib1/changelog.Debian
         gzip -9nf usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
-        gzip -9nf usr/share/doc/libsharedlib1/changelog.Debian
-        cd '/path/to/debhello-3.3'
         cd '/path/to/debhello-3.3'
+        chmod a-x usr/share/doc/libsharedlib1/changelog.Debian
         chmod a-x usr/share/doc/libsharedlib-dev/changelog.Debian
+        gzip -9nf usr/share/doc/libsharedlib1/changelog.Debian
         gzip -9nf usr/share/doc/libsharedlib-dev/changelog.Debian
         cd '/path/to/debhello-3.3'
+        cd '/path/to/debhello-3.3'
    dh_fixperms
-        find debian/debhello ! -type l -a -true -a -true -print0 2>/dev/null ...
         find debian/libsharedlib1 ! -type l -a -true -a -true -print0 2>/dev/...
+        find debian/debhello ! -type l -a -true -a -true -print0 2>/dev/null ...
         find debian/libsharedlib-dev ! -type l -a -true -a -true -print0 2>/d...
         find debian/libsharedlib1/usr/share/doc -type f -a -true -a ! -regex ...
         find debian/libsharedlib-dev/usr/share/doc -type f -a -true -a ! -reg...
         find debian/debhello/usr/share/doc -type f -a -true -a ! -regex 'debi...
         find debian/libsharedlib-dev/usr/share/doc -type d -a -true -a -true ...
         find debian/libsharedlib1/usr/share/doc -type d -a -true -a -true -pr...
-        find debian/debhello/usr/share/doc -type d -a -true -a -true -print0 ...
         find debian/libsharedlib-dev/usr/include -type f -a -true -a -true -p...
+        find debian/debhello/usr/share/doc -type d -a -true -a -true -print0 ...
         find debian/libsharedlib1 -type f \( -name '*.so.*' -o -name '*.so' -...
-        find debian/debhello/usr/share/man -type f -a -true -a -true -print0 ...
         find debian/libsharedlib-dev -type f \( -name '*.so.*' -o -name '*.so...
+        find debian/debhello/usr/share/man -type f -a -true -a -true -print0 ...
         find debian/libsharedlib1/usr/lib -type f -name '*.ali' -a -true -a -...
-        find debian/debhello -type f \( -name '*.so.*' -o -name '*.so' -o -na...
         find debian/libsharedlib-dev/usr/lib -type f -name '*.ali' -a -true -...
+        find debian/debhello -type f \( -name '*.so.*' -o -name '*.so' -o -na...
         find debian/debhello/usr/bin -type f -a -true -a -true -print0 2>/dev...
    debian/rules override_dh_missing
 make[1]: Entering directory '/path/to/debhello-3.3'
@@ -556,12 +556,12 @@ make[1]: Leaving directory '/path/to/deb
         strip --remove-section=.comment --remove-section=.note debian/debhell...
         objcopy --add-gnu-debuglink debian/.debhelper/libsharedlib1/dbgsym-ro...
         objcopy --add-gnu-debuglink debian/.debhelper/debhello/dbgsym-root/us...
-        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/usr/sha...
-        ln -s libsharedlib1 debian/.debhelper/libsharedlib1/dbgsym-root/usr/s...
-        install -m0755 -d debian/.debhelper/libsharedlib1
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/usr/share/do...
         ln -s debhello debian/.debhelper/debhello/dbgsym-root/usr/share/doc/d...
         install -m0755 -d debian/.debhelper/debhello
+        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/usr/sha...
+        ln -s libsharedlib1 debian/.debhelper/libsharedlib1/dbgsym-root/usr/s...
+        install -m0755 -d debian/.debhelper/libsharedlib1
    dh_makeshlibs -a
         rm -f debian/debhello/DEBIAN/shlibs
         rm -f debian/libsharedlib1/DEBIAN/shlibs
@@ -582,11 +582,6 @@ make[1]: Leaving directory '/path/to/deb
         install -p -m0644 debian/.debhelper/generated/libsharedlib1/triggers ...
         install -m0755 -d debian/libsharedlib-dev/DEBIAN
    dh_gencontrol
-        install -m0755 -d debian/debhello/DEBIAN
-        echo misc:Depends= >> debian/debhello.substvars
-        echo misc:Pre-Depends= >> debian/debhello.substvars
-        install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
-        dpkg-gencontrol -pdebhello -ldebian/changelog -Tdebian/debhello.subst...
         install -m0755 -d debian/libsharedlib-dev/DEBIAN
         echo misc:Depends= >> debian/libsharedlib-dev.substvars
         echo misc:Pre-Depends= >> debian/libsharedlib-dev.substvars
@@ -596,40 +591,45 @@ make[1]: Leaving directory '/path/to/deb
         echo misc:Pre-Depends= >> debian/libsharedlib1.substvars
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
         dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
-        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/control
-        chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/control
+        install -m0755 -d debian/debhello/DEBIAN
+        echo misc:Depends= >> debian/debhello.substvars
+        echo misc:Pre-Depends= >> debian/debhello.substvars
+        install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
         dpkg-gencontrol -pdebhello -ldebian/changelog -Tdebian/debhello.subst...
         chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/cont...
         dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
-        chmod 0644 -- debian/debhello/DEBIAN/control
+        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/control
+        chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/control
+        dpkg-gencontrol -pdebhello -ldebian/changelog -Tdebian/debhello.subst...
         chmod 0644 -- debian/libsharedlib1/DEBIAN/control
+        chmod 0644 -- debian/debhello/DEBIAN/control
    dh_md5sums
         install -m0755 -d debian/libsharedlib1/DEBIAN
         install -m0755 -d debian/debhello/DEBIAN
-        install -m0755 -d debian/libsharedlib-dev/DEBIAN
-        cd debian/libsharedlib1 >/dev/null && xargs -r0 md5sum | perl -pe 'if...
-        cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
         cd debian/debhello >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^...
-        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
+        cd debian/libsharedlib1 >/dev/null && xargs -r0 md5sum | perl -pe 'if...
+        install -m0755 -d debian/libsharedlib-dev/DEBIAN
         chmod 0644 -- debian/libsharedlib1/DEBIAN/md5sums
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
+        cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
+        cd debian/.debhelper/libsharedlib1/dbgsym-root >/dev/null && xargs -r...
         chmod 0644 -- debian/debhello/DEBIAN/md5sums
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
-        cd debian/.debhelper/libsharedlib1/dbgsym-root >/dev/null && xargs -r...
+        chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
         cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
         chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/md5s...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
    dh_builddeb
         dpkg-deb --root-owner-group --build debian/debhello ..
-        dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
         dpkg-deb --root-owner-group --build debian/libsharedlib1 ..
+        dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
         dpkg-deb --root-owner-group --build debian/.debhelper/libsharedlib1/d...
         dpkg-deb --root-owner-group --build debian/libsharedlib-dev ..
-dpkg-deb: building package 'libsharedlib1' in '../libsharedlib1_3.3-1_amd64.d...
-dpkg-deb: building package 'libsharedlib1-dbgsym' in '../libsharedlib1-dbgsym...
-dpkg-deb: building package 'libsharedlib-dev' in '../libsharedlib-dev_3.3-1_a...
 dpkg-deb: building package 'debhello' in '../debhello_3.3-1_amd64.deb'.
+dpkg-deb: building package 'libsharedlib1-dbgsym' in '../libsharedlib1-dbgsym...
 dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_3.3-1_amd...
+dpkg-deb: building package 'libsharedlib1' in '../libsharedlib1_3.3-1_amd64.d...
+dpkg-deb: building package 'libsharedlib-dev' in '../libsharedlib-dev_3.3-1_a...
  dpkg-genbuildinfo -O../debhello_3.3-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_3.3-1_amd64.changes
 dpkg-genchanges: info: including full source code in upload
--- debmake-doc-1.21.orig/examples/debhello-3.3_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-3.3_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/41/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/41/449d5c024186b970e20b83...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/4d/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/4d/694acaf017e35545493642...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/debhello-3.4/debian/control
+++ debmake-doc-1.21/examples/debhello-3.4/debian/control
@@ -2,7 +2,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,9 +12,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
@@ -41,7 +47,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
--- debmake-doc-1.21.orig/examples/debhello-3.4_build-1/step200.slog
+++ debmake-doc-1.21/examples/debhello-3.4_build-1/step200.slog
@@ -85,6 +85,29 @@ I: substituting => /usr/lib/python3/dist
 I: creating => debian/libsharedlib1.symbols
 I: substituting => /usr/lib/python3/dist-packages/debmake/data/extra1dev_pack...
 I: creating => debian/libsharedlib-dev.install
-I: $ wrap-and-sort
-I: $ wrap-and-sort complete.  Now, debian/* may have a blank line at the top....
+I: $ wrap-and-sort -vast
+debian/control
+debian/tests/control
+debian/copyright
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+--- Modified files ---
+debian/control
+debian/debhello.dirs
+debian/debhello.docs
+debian/debhello.examples
+debian/debhello.info
+debian/debhello.install
+debian/debhello.links
+debian/debhello.manpages
+debian/libsharedlib-dev.install
+debian/libsharedlib1.install
+I: $ wrap-and-sort -vast complete.  Now, debian/* may have a blank line at th...
 
--- debmake-doc-1.21.orig/examples/debhello-3.4_build-1/step203.slog
+++ debmake-doc-1.21/examples/debhello-3.4_build-1/step203.slog
@@ -3,8 +3,10 @@ Source: debhello
 Section: unknown
 Priority: optional
 Maintainer: "Osamu Aoki" <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
-Standards-Version: 4.6.2
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
+Standards-Version: 4.7.0
 Homepage: <insert the upstream URL, if relevant>
 Rules-Requires-Root: no
 #Vcs-Git: https://salsa.debian.org/debian/debhello.git
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: bin
  This package contains the compiled binary executable.
  .
@@ -26,8 +29,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: auto-generated package by debmake: lib
  This package contains the shared library.
 
@@ -35,7 +41,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: auto-generated package by debmake: dev
  This package contains the development files.
 
--- debmake-doc-1.21.orig/examples/debhello-3.4_build-1/step302.slog
+++ debmake-doc-1.21/examples/debhello-3.4_build-1/step302.slog
@@ -5,7 +5,9 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: cmake, debhelper-compat (= 13)
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -13,9 +15,10 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: any
 Multi-Arch: foreign
-Depends: libsharedlib1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
@@ -29,8 +32,11 @@ Package: libsharedlib1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
@@ -44,7 +50,9 @@ Package: libsharedlib-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libsharedlib1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libsharedlib1 (= ${binary:Version}),
+ ${misc:Depends},
 Description: Simple packaging example for debmake
  This is an example package to demonstrate Debian packaging using
  the debmake command.
--- debmake-doc-1.21.orig/examples/debhello-3.4_build-1/step500.slog
+++ debmake-doc-1.21/examples/debhello-3.4_build-1/step500.slog
@@ -40,11 +40,12 @@ dh_auto_configure -- \
       -DCMAKE_LIBRARY_ARCHITECTURE="x86_64-linux-gnu"
         cd obj-x86_64-linux-gnu && DEB_PYTHON_INSTALL_LAYOUT=deb PKG_CONFIG=/...
 CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
-  Compatibility with CMake < 3.5 will be removed from a future version of
+  Compatibility with CMake < 3.10 will be removed from a future version of
   CMake.
 
-  Update the VERSION argument <min> value or use a ...<max> suffix to tell
-  CMake that the project does not need compatibility with older versions.
+  Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated...
+  to work with policies introduced by <max> or earlier.
 
 
 -- The C compiler identification is GNU 14.2.0
@@ -60,7 +61,7 @@ CMake Deprecation Warning at CMakeLists.
 -- Detecting CXX compile features
 -- Detecting CXX compile features - done
 -- Found Gettext: /usr/bin/msgmerge (found version "0.22.5")
--- Configuring done (0.6s)
+-- Configuring done (0.7s)
 -- Generating done (0.0s)
 CMake Warning:
   Manually-specified variables were not used by the project:
@@ -97,45 +98,45 @@ cd /path/to/debhello-3.4/obj-x86_64-linu
 make[3]: Entering directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
 cd /path/to/debhello-3.4/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depe...
 make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
-make  -f po/CMakeFiles/desktop.dir/build.make po/CMakeFiles/desktop.dir/build...
-make[3]: Entering directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
-make[3]: Circular data/hello.desktop <- data/hello.desktop dependency dropped...
-make[3]: Nothing to be done for 'po/CMakeFiles/desktop.dir/build'.
-make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
-make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
-make  -f po/CMakeFiles/translations_1.dir/build.make po/CMakeFiles/translatio...
 make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
+make  -f po/CMakeFiles/pot.dir/build.make po/CMakeFiles/pot.dir/build
 make  -f lib/CMakeFiles/sharedlib.dir/build.make lib/CMakeFiles/sharedlib.dir...
-[ 12%] Built target desktop
-make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
 make[3]: Entering directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
-make  -f po/CMakeFiles/pot.dir/build.make po/CMakeFiles/pot.dir/build
 make[3]: Entering directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
+make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
+make  -f po/CMakeFiles/translations_1.dir/build.make po/CMakeFiles/translatio...
 make[3]: Entering directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
-[ 37%] Generating debhello.pot
-[ 37%] Building C object lib/CMakeFiles/sharedlib.dir/sharedlib.c.o
-[ 50%] Generating debhello.pot
-cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/lib && /usr/bin/cc -Dsharedlib_...
-cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && touch /path/to/debhello-3...
+make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
+make  -f po/CMakeFiles/desktop.dir/build.make po/CMakeFiles/desktop.dir/build...
+[ 25%] Generating debhello.pot
+[ 25%] Building C object lib/CMakeFiles/sharedlib.dir/sharedlib.c.o
 cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && touch /path/to/debhello-3...
+cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/lib && /usr/bin/cc -Dsharedlib_...
+make[3]: Entering directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
+make[3]: Circular data/hello.desktop <- data/hello.desktop dependency dropped...
+make[3]: Nothing to be done for 'po/CMakeFiles/desktop.dir/build'.
+make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
 cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && xgettext -o /path/to/debh...
-cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && xgettext -o /path/to/debh...
+[ 37%] Generating debhello.pot
+cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && touch /path/to/debhello-3...
 Warning: program compiled against libxml 212 using older 209
 cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && xgettext -L Desktop -j -o...
+cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && xgettext -o /path/to/debh...
 Warning: program compiled against libxml 212 using older 209
-cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && xgettext -L Desktop -j -o...
+[ 50%] Built target desktop
+make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
 Warning: program compiled against libxml 212 using older 209
+cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && xgettext -L Desktop -j -o...
 Warning: program compiled against libxml 212 using older 209
-make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
+[ 50%] Built target pot
 [ 62%] Generating ja.gmo
 cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && /usr/bin/msgmerge --quiet...
 [ 75%] Linking C shared library libsharedlib.so
 cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/lib && /usr/bin/cmake -E cmake_...
-[ 75%] Built target pot
 cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/po && /usr/bin/msgfmt -o /path/...
-/usr/bin/cc -fPIC -g -O2 -Werror=implicit-function-declaration -ffile-prefix-...
 make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
 [ 75%] Built target translations_1
+/usr/bin/cc -fPIC -g -O2 -Werror=implicit-function-declaration -ffile-prefix-...
 cd /path/to/debhello-3.4/obj-x86_64-linux-gnu/lib && /usr/bin/cmake -E cmake_...
 make[3]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
 [ 75%] Built target sharedlib
@@ -156,7 +157,7 @@ make[2]: Leaving directory '/path/to/deb
 /usr/bin/cmake -E cmake_progress_start /path/to/debhello-3.4/obj-x86_64-linux...
 make[1]: Leaving directory '/path/to/debhello-3.4/obj-x86_64-linux-gnu'
    dh_auto_test
-        rm -fr -- /tmp/dh-xdg-rundir-CvX5t4YF
+        rm -fr -- /tmp/dh-xdg-rundir-0rUca0EP
    create-stamp debian/debhelper-build-stamp
    dh_prep
         rm -f -- debian/debhello.substvars debian/libsharedlib1.substvars deb...
@@ -231,33 +232,33 @@ dh_installdocs: warning: Could not parse
         cd debian/debhello
         cd debian/libsharedlib1
         cd debian/libsharedlib-dev
-        chmod a-x usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
-        chmod a-x usr/share/doc/libsharedlib-dev/changelog.Debian
         chmod a-x usr/share/doc/libsharedlib1/changelog.Debian
-        gzip -9nf usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
+        chmod a-x usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
         gzip -9nf usr/share/doc/libsharedlib1/changelog.Debian
-        gzip -9nf usr/share/doc/libsharedlib-dev/changelog.Debian
+        gzip -9nf usr/share/doc/debhello/changelog.Debian usr/share/man/man1/...
+        chmod a-x usr/share/doc/libsharedlib-dev/changelog.Debian
         cd '/path/to/debhello-3.4'
+        gzip -9nf usr/share/doc/libsharedlib-dev/changelog.Debian
         cd '/path/to/debhello-3.4'
         cd '/path/to/debhello-3.4'
    dh_fixperms
-        find debian/debhello ! -type l -a -true -a -true -print0 2>/dev/null ...
         find debian/libsharedlib1 ! -type l -a -true -a -true -print0 2>/dev/...
         find debian/libsharedlib-dev ! -type l -a -true -a -true -print0 2>/d...
+        find debian/debhello ! -type l -a -true -a -true -print0 2>/dev/null ...
         find debian/libsharedlib1/usr/share/doc -type f -a -true -a ! -regex ...
-        find debian/debhello/usr/share/doc -type f -a -true -a ! -regex 'debi...
         find debian/libsharedlib-dev/usr/share/doc -type f -a -true -a ! -reg...
-        find debian/debhello/usr/share/doc -type d -a -true -a -true -print0 ...
-        find debian/libsharedlib-dev/usr/share/doc -type d -a -true -a -true ...
+        find debian/debhello/usr/share/doc -type f -a -true -a ! -regex 'debi...
         find debian/libsharedlib1/usr/share/doc -type d -a -true -a -true -pr...
-        find debian/debhello/usr/share/man debian/debhello/usr/share/applicat...
+        find debian/libsharedlib-dev/usr/share/doc -type d -a -true -a -true ...
+        find debian/debhello/usr/share/doc -type d -a -true -a -true -print0 ...
         find debian/libsharedlib1 -type f \( -name '*.so.*' -o -name '*.so' -...
         find debian/libsharedlib-dev/usr/include -type f -a -true -a -true -p...
-        find debian/debhello -type f \( -name '*.so.*' -o -name '*.so' -o -na...
+        find debian/debhello/usr/share/man debian/debhello/usr/share/applicat...
         find debian/libsharedlib1/usr/lib -type f -name '*.ali' -a -true -a -...
         find debian/libsharedlib-dev -type f \( -name '*.so.*' -o -name '*.so...
-        find debian/debhello/usr/bin -type f -a -true -a -true -print0 2>/dev...
+        find debian/debhello -type f \( -name '*.so.*' -o -name '*.so' -o -na...
         find debian/libsharedlib-dev/usr/lib -type f -name '*.ali' -a -true -...
+        find debian/debhello/usr/bin -type f -a -true -a -true -print0 2>/dev...
         rm -f debian/debhello.debhelper.log debian/libsharedlib-dev.debhelper...
    debian/rules override_dh_missing
 make[1]: Entering directory '/path/to/debhello-3.4'
@@ -267,22 +268,22 @@ make[1]: Leaving directory '/path/to/deb
         dwz -- debian/debhello/usr/bin/hello
         dwz -- debian/libsharedlib1/usr/lib/x86_64-linux-gnu/libsharedlib.so....
    dh_strip -a
-        install -m0755 -d debian/.debhelper/debhello/dbgsym-root/usr/lib/debu...
-        objcopy --only-keep-debug --compress-debug-sections debian/debhello/u...
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/usr/lib...
         objcopy --only-keep-debug --compress-debug-sections debian/libsharedl...
-        chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/usr/lib/debug/.b...
-        strip --remove-section=.comment --remove-section=.note debian/debhell...
-        objcopy --add-gnu-debuglink debian/.debhelper/debhello/dbgsym-root/us...
+        install -m0755 -d debian/.debhelper/debhello/dbgsym-root/usr/lib/debu...
+        objcopy --only-keep-debug --compress-debug-sections debian/debhello/u...
         chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/usr/lib/deb...
         strip --remove-section=.comment --remove-section=.note --strip-unneed...
+        chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/usr/lib/debug/.b...
+        strip --remove-section=.comment --remove-section=.note debian/debhell...
         objcopy --add-gnu-debuglink debian/.debhelper/libsharedlib1/dbgsym-ro...
-        install -m0755 -d debian/.debhelper/debhello/dbgsym-root/usr/share/do...
-        ln -s debhello debian/.debhelper/debhello/dbgsym-root/usr/share/doc/d...
-        install -m0755 -d debian/.debhelper/debhello
+        objcopy --add-gnu-debuglink debian/.debhelper/debhello/dbgsym-root/us...
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/usr/sha...
         ln -s libsharedlib1 debian/.debhelper/libsharedlib1/dbgsym-root/usr/s...
         install -m0755 -d debian/.debhelper/libsharedlib1
+        install -m0755 -d debian/.debhelper/debhello/dbgsym-root/usr/share/do...
+        ln -s debhello debian/.debhelper/debhello/dbgsym-root/usr/share/doc/d...
+        install -m0755 -d debian/.debhelper/debhello
    dh_makeshlibs -a
         rm -f debian/debhello/DEBIAN/shlibs
         rm -f debian/libsharedlib1/DEBIAN/shlibs
@@ -293,21 +294,16 @@ make[1]: Leaving directory '/path/to/deb
         mv debian/.debhelper/generated/libsharedlib1/triggers.new debian/.deb...
         rm -f debian/libsharedlib-dev/DEBIAN/shlibs
    dh_shlibdeps -a
-        install -m0755 -d debian/debhello/DEBIAN
-        dpkg-shlibdeps -Tdebian/debhello.substvars debian/debhello/usr/bin/he...
         install -m0755 -d debian/libsharedlib1/DEBIAN
         dpkg-shlibdeps -Tdebian/libsharedlib1.substvars debian/libsharedlib1/...
+        install -m0755 -d debian/debhello/DEBIAN
+        dpkg-shlibdeps -Tdebian/debhello.substvars debian/debhello/usr/bin/he...
    dh_installdeb
         install -m0755 -d debian/debhello/DEBIAN
         install -m0755 -d debian/libsharedlib1/DEBIAN
         install -p -m0644 debian/.debhelper/generated/libsharedlib1/triggers ...
         install -m0755 -d debian/libsharedlib-dev/DEBIAN
    dh_gencontrol
-        install -m0755 -d debian/libsharedlib1/DEBIAN
-        echo misc:Depends= >> debian/libsharedlib1.substvars
-        echo misc:Pre-Depends= >> debian/libsharedlib1.substvars
-        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
-        dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
         install -m0755 -d debian/libsharedlib-dev/DEBIAN
         echo misc:Depends= >> debian/libsharedlib-dev.substvars
         echo misc:Pre-Depends= >> debian/libsharedlib-dev.substvars
@@ -317,39 +313,44 @@ make[1]: Leaving directory '/path/to/deb
         echo misc:Pre-Depends= >> debian/debhello.substvars
         install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
         dpkg-gencontrol -pdebhello -ldebian/changelog -Tdebian/debhello.subst...
-        chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/cont...
+        install -m0755 -d debian/libsharedlib1/DEBIAN
+        echo misc:Depends= >> debian/libsharedlib1.substvars
+        echo misc:Pre-Depends= >> debian/libsharedlib1.substvars
+        install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
         dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
         chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/control
         dpkg-gencontrol -pdebhello -ldebian/changelog -Tdebian/debhello.subst...
+        chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/cont...
+        dpkg-gencontrol -plibsharedlib1 -ldebian/changelog -Tdebian/libshared...
         chmod 0644 -- debian/libsharedlib-dev/DEBIAN/control
         chmod 0644 -- debian/debhello/DEBIAN/control
         chmod 0644 -- debian/libsharedlib1/DEBIAN/control
    dh_md5sums
-        install -m0755 -d debian/debhello/DEBIAN
         install -m0755 -d debian/libsharedlib-dev/DEBIAN
         cd debian/libsharedlib-dev >/dev/null && xargs -r0 md5sum | perl -pe ...
-        cd debian/debhello >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^...
+        install -m0755 -d debian/debhello/DEBIAN
         install -m0755 -d debian/libsharedlib1/DEBIAN
         cd debian/libsharedlib1 >/dev/null && xargs -r0 md5sum | perl -pe 'if...
+        cd debian/debhello >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^...
         chmod 0644 -- debian/libsharedlib-dev/DEBIAN/md5sums
-        chmod 0644 -- debian/debhello/DEBIAN/md5sums
-        install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
-        cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
         chmod 0644 -- debian/libsharedlib1/DEBIAN/md5sums
         install -m0755 -d debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN
-        chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
         cd debian/.debhelper/libsharedlib1/dbgsym-root >/dev/null && xargs -r...
+        chmod 0644 -- debian/debhello/DEBIAN/md5sums
+        install -m0755 -d debian/.debhelper/debhello/dbgsym-root/DEBIAN
         chmod 0644 -- debian/.debhelper/libsharedlib1/dbgsym-root/DEBIAN/md5s...
+        cd debian/.debhelper/debhello/dbgsym-root >/dev/null && xargs -r0 md5...
+        chmod 0644 -- debian/.debhelper/debhello/dbgsym-root/DEBIAN/md5sums
    dh_builddeb
         dpkg-deb --root-owner-group --build debian/.debhelper/debhello/dbgsym...
         dpkg-deb --root-owner-group --build debian/debhello ..
-        dpkg-deb --root-owner-group --build debian/.debhelper/libsharedlib1/d...
         dpkg-deb --root-owner-group --build debian/libsharedlib1 ..
         dpkg-deb --root-owner-group --build debian/libsharedlib-dev ..
-dpkg-deb: building package 'libsharedlib1-dbgsym' in '../libsharedlib1-dbgsym...
+        dpkg-deb --root-owner-group --build debian/.debhelper/libsharedlib1/d...
+dpkg-deb: building package 'debhello' in '../debhello_3.4-1_amd64.deb'.
 dpkg-deb: building package 'libsharedlib-dev' in '../libsharedlib-dev_3.4-1_a...
 dpkg-deb: building package 'debhello-dbgsym' in '../debhello-dbgsym_3.4-1_amd...
-dpkg-deb: building package 'debhello' in '../debhello_3.4-1_amd64.deb'.
+dpkg-deb: building package 'libsharedlib1-dbgsym' in '../libsharedlib1-dbgsym...
 dpkg-deb: building package 'libsharedlib1' in '../libsharedlib1_3.4-1_amd64.d...
  dpkg-genbuildinfo -O../debhello_3.4-1_amd64.buildinfo
  dpkg-genchanges -O../debhello_3.4-1_amd64.changes
--- debmake-doc-1.21.orig/examples/debhello-3.4_build-1/step700.slog
+++ debmake-doc-1.21/examples/debhello-3.4_build-1/step700.slog
@@ -4,8 +4,8 @@ drwxr-xr-x root/root ...  ./usr/
 drwxr-xr-x root/root ...  ./usr/lib/
 drwxr-xr-x root/root ...  ./usr/lib/debug/
 drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/
-drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/f3/
--rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/f3/86bf6e37dd2fe101467425...
+drwxr-xr-x root/root ...  ./usr/lib/debug/.build-id/84/
+-rw-r--r-- root/root ...  ./usr/lib/debug/.build-id/84/4bf00f98956b1a0cccf049...
 drwxr-xr-x root/root ...  ./usr/share/
 drwxr-xr-x root/root ...  ./usr/share/doc/
 lrwxrwxrwx root/root ...  ./usr/share/doc/debhello-dbgsym -> debhello
--- debmake-doc-1.21.orig/examples/zzz_DISABLED_debhello-3.1/debian/control
+++ debmake-doc-1.21/examples/zzz_DISABLED_debhello-3.1/debian/control
@@ -2,7 +2,10 @@ Source: debhello
 Section: devel
 Priority: optional
 Maintainer: Osamu Aoki <osamu@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-python, python3-all
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-python,
+ python3-all,
 Standards-Version: 4.6.2
 Homepage: https://salsa.debian.org/debian/debmake-doc
 Rules-Requires-Root: no
@@ -10,7 +13,9 @@ Rules-Requires-Root: no
 Package: debhello
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
 Description: Simple packaging example for debmake
  This Debian binary package is an example package.
  (This is an example only)
--- debmake-doc-1.21.orig/po4a/po/README.md
+++ debmake-doc-1.21/po4a/po/README.md
@@ -2,29 +2,9 @@
 
 ## SITUATION
 
-FIX quotation inconsistency
-
-CORRECT?
-<quote><enphasis> .... </enphasis></quote>
-
-
-NEEDS_FIX?
-\" *<enphasis> .... </enphasis> *\"
- *<enphasis> .... </enphasis> *
-
-DE
-»<emphasis role="strong">dh $@</emphasis>«
-ZH
-“<emphasis role="strong">make dist</emphasis>”
-
-
-CORRECT
-<superscript><emphasis role="strong">-x3</emphasis></superscript>'
-
-NEEDS_FIX
-^<emphasis role="strong">-x3</emphasis>^
-
+`...` is converted into `…​` (U+8230 U+200B) Ellipsis + Zerowidth space
 
+Translator are usually expected to put Zerowidth space.
 
 ENGLISH
 "<emphasis role="strong">:wq</emphasis>"
@@ -37,6 +17,11 @@ CORRECT
 
 HTML and PDF results for <quote>...</quote>
 
+DE
+»<emphasis role="strong">dh $@</emphasis>«
+ZH
+“<emphasis role="strong">make dist</emphasis>”
+
 ## CONVERT
 
 ????
--- debmake-doc-1.21.orig/po4a/po/pt.po
+++ debmake-doc-1.21/po4a/po/pt.po
@@ -226,8 +226,8 @@ msgid ""
 "in the <quote><link xl:href=\"https://tracker.debian.org/pkg/debmake-"
 "doc\">debmake-doc package</link></quote> and"
 msgstr ""
-"no <ulink url=\"https://tracker.debian.org/pkg/debmake-doc\">pacote debmake-"
-"doc</ulink> e"
+"no <quote><link xl:href=\"https://tracker.debian.org/pkg/debmake-doc\">pacote debmake-"
+"doc</link></quote> e"
 
 #. type: Content of: <book><info><legalnotice><itemizedlist><listitem><simpara>
 #: debmake-doc.en.x03:73
@@ -235,8 +235,8 @@ msgid ""
 "at the <quote><link xl:href=\"https://www.debian.org/doc/devel-"
 "manuals\">Debian Documentation web site</link></quote>."
 msgstr ""
-"no <ulink url=\"https://www.debian.org/doc/devel-manuals\">Sitio Web "
-"Documentação de Debian</ulink>."
+"no <quote><link xl:href=\"https://www.debian.org/doc/devel-manuals\">Sitio Web "
+"Documentação de Debian</link></quote>."
 
 #. type: Content of: <book><info><abstract><simpara>
 #: debmake-doc.en.x03:79
@@ -810,7 +810,7 @@ msgid ""
 msgstr ""
 "<emphasis role=\"strong\">debian/control</emphasis>: suporte a <emphasis "
 "role=\"strong\">substvar</emphasis>, suporte a <emphasis "
-"role=\"strong\">multiarch</emphasis>, pacotes multi binário, …"
+"role=\"strong\">multiarch</emphasis>, pacotes multi binário, …​"
 
 #. type: Content of: <book><chapter><itemizedlist><listitem><itemizedlist><listitem><simpara>
 #: debmake-doc.en.x03:210
@@ -819,7 +819,7 @@ msgid ""
 "role=\"strong\">dh</emphasis> syntax, compiler hardening options, …​"
 msgstr ""
 "<emphasis role=\"strong\">debian/rules</emphasis>: sintaxe <emphasis "
-"role=\"strong\">dh</emphasis>, opções de melhoramento de compilação, …"
+"role=\"strong\">dh</emphasis>, opções de melhoramento de compilação, …​"
 
 #. type: Content of: <book><chapter><itemizedlist><listitem><simpara>
 #: debmake-doc.en.x03:215
@@ -1486,17 +1486,6 @@ msgstr ""
 
 #. type: Content of: <book><chapter><section><simpara>
 #: debmake-doc.en.x03:446
-#, fuzzy
-#| msgid ""
-#| "All these documents are published to <link xl:href=\"https://www.debian."
-#| "org\">https://www.debian.org</link> using the <emphasis "
-#| "role=\"strong\">unstable</emphasis> suite versions of corresponding "
-#| "Debian packages.  If you wish to have local accesses to all these "
-#| "documents from your base system, please consider to use techniques such "
-#| "as <quote><link xl:href=\"https://www.debian.org/doc/manuals/debian-"
-#| "reference/ch02.en.html#_tweaking_candidate_version\">apt-pinning</link></"
-#| "quote> and <quote><link xl:href=\"https://en.wikipedia.org/wiki/"
-#| "Chroot\">chroot</link></quote>."
 msgid ""
 "All these documents are published on <link xl:href=\"https://www.debian."
 "org\">https://www.debian.org</link> using the <emphasis "
@@ -1508,7 +1497,7 @@ msgid ""
 "<quote><link xl:href=\"https://en.wikipedia.org/wiki/Chroot\">chroot</link></"
 "quote>."
 msgstr ""
-"Todos estes documentos são publicados em href=\"https://www.debian."
+"Todos estes documentos são publicados em <link xl:href=\"https://www.debian."
 "org\">https://www.debian.org</link> usando as versões da suite <emphasis "
 "role=\"strong\">unstable</emphasis> dos pacotes Debian correspondentes. Se "
 "você deseja ter acesso local a todos estes documentos a partir do seu "
@@ -2167,7 +2156,7 @@ msgstr "Documentação"
 #. type: Content of: <book><chapter><section><itemizedlist><listitem><itemizedlist><listitem><simpara>
 #: debmake-doc.en.x03:678
 msgid "Basics of text markups (XML, ReST, Wiki, …​)."
-msgstr "Bases sobre marcações de texto (XML, ReST, Wiki, …)."
+msgstr "Bases sobre marcações de texto (XML, ReST, Wiki, …​)."
 
 #. type: Content of: <book><chapter><section><simpara>
 #: debmake-doc.en.x03:683
@@ -9637,7 +9626,7 @@ msgstr ""
 "role=\"strong\">DEB_PARENT_VENDOR</emphasis>; e macro <emphasis "
 "role=\"strong\">dpkg_vendor_derives_from</emphasis> obtidas de <emphasis "
 "role=\"strong\">dpkg-vendor</emphasis>(1). (úteis para suporte a fornecedor "
-"(Debian, Ubuntu, …).)"
+"(Debian, Ubuntu, …​).)"
 
 #. type: Content of: <book><chapter><section><variablelist><varlistentry><term>
 #: debmake-doc.en.x03:2665
@@ -12926,7 +12915,7 @@ msgid ""
 msgstr ""
 "interactivamente a partir da interface de menu (<emphasis "
 "role=\"strong\">dialog</emphasis>, <emphasis role=\"strong\">gnome</"
-"emphasis>, <emphasis role=\"strong\">kde</emphasis>, …)"
+"emphasis>, <emphasis role=\"strong\">kde</emphasis>, …​)"
 
 #. type: Content of: <book><chapter><section><itemizedlist><listitem><itemizedlist><listitem><simpara>
 #: debmake-doc.en.x03:3677
@@ -13384,11 +13373,6 @@ msgstr ""
 
 #. type: Content of: <book><chapter><section><itemizedlist><listitem><itemizedlist><listitem><simpara>
 #: debmake-doc.en.x03:3814
-#, fuzzy
-#| msgid ""
-#| "old style: <emphasis role=\"strong\">master</emphasis> (or <emphasis "
-#| "role=\"strong\">debian</emphasis>, <emphasis role=\"strong\">main</"
-#| "emphasis>, <emphasis role=\"strong\">latest</emphasis>, …​)"
 msgid ""
 "old style: <emphasis role=\"strong\">master</emphasis> (or <emphasis "
 "role=\"strong\">debian</emphasis>, <emphasis role=\"strong\">main</"
@@ -13396,7 +13380,7 @@ msgid ""
 msgstr ""
 "estilo antigo: <emphasis role=\"strong\">master</emphasis> (ou <emphasis "
 "role=\"strong\">debian</emphasis>, <emphasis role=\"strong\">main</"
-"emphasis>, <emphasis role=\"strong\">latest</emphasis>, …​)"
+"emphasis>, …​)"
 
 #. type: Content of: <book><chapter><section><itemizedlist><listitem><itemizedlist><listitem><simpara>
 #: debmake-doc.en.x03:3817
@@ -15027,7 +15011,7 @@ msgid ""
 "role=\"strong\">-3</emphasis>, …​ revisions."
 msgstr ""
 "Isto é basicamente para revisões <emphasis role=\"strong\">-2</emphasis>, "
-"<emphasis role=\"strong\">-3</emphasis>, …​ ."
+"<emphasis role=\"strong\">-3</emphasis>, …​."
 
 #. type: Content of: <book><chapter><section><title>
 #: debmake-doc.en.x03:4337
@@ -15445,14 +15429,6 @@ msgstr "Vamos gerar a quantidade máxima
 
 #. type: Content of: <book><chapter><section><simpara>
 #: debmake-doc.en.x03:4431
-#, fuzzy
-#| msgid ""
-#| "Let’s also use the <quote><emphasis role=\"strong\">-p</emphasis> "
-#| "<emphasis>debhello</emphasis> <emphasis role=\"strong\">-t -u</emphasis> "
-#| "<emphasis>0.1</emphasis> <emphasis role=\"strong\">-r</emphasis> "
-#| "<emphasis>1</emphasis></quote> options to make the missing upstream "
-#| "tarball with default <emphasis role=\"strong\">-x3</emphasis> and "
-#| "<emphasis role=\"strong\">T</emphasis> options."
 msgid ""
 "Let’s also use the <quote><emphasis role=\"strong\">-p</emphasis> "
 "<emphasis>debhello</emphasis> <emphasis role=\"strong\">-t -u</emphasis> "
@@ -15464,7 +15440,7 @@ msgstr ""
 "Vamos também usar as opções <quote><emphasis role=\"strong\">-p</emphasis> "
 "<emphasis>debhello</emphasis> <emphasis role=\"strong\">-t -u</emphasis> "
 "<emphasis>0.1</emphasis> <emphasis role=\"strong\">-r</emphasis> "
-"<emphasis>1</emphasis><quote> para criar o tarball de autor em falta com as "
+"<emphasis>1</emphasis></quote> para criar o tarball de autor em falta com as "
 "opções predefinidas <emphasis role=\"strong\">-x3</emphasis> e <emphasis "
 "role=\"strong\">T</emphasis>."
 
@@ -17008,9 +16984,9 @@ msgstr ""
 "<emphasis role=\"strong\">Makefile</emphasis> baseado no ficheiro <emphasis "
 "role=\"strong\">CMakeLists.txt</emphasis> e a sua opção <emphasis "
 "role=\"strong\">-D</emphasis>. Também configura o ficheiro como especificado "
-"no seu <emphasis role=\"strong\">configure_file(…)</emphasis> ao substituir "
-"strings com <emphasis role=\"strong\">@…@</emphasis> e alterando a linha "
-"<emphasis role=\"strong\">#cmakedefine …</emphasis>."
+"no seu <emphasis role=\"strong\">configure_file(…​)</emphasis> ao substituir "
+"strings com <emphasis role=\"strong\">@…​@</emphasis> e alterando a linha "
+"<emphasis role=\"strong\">#cmakedefine …​</emphasis>."
 
 #. type: Content of: <book><chapter><section><simpara>
 #: debmake-doc.en.x03:5023
@@ -20025,7 +20001,7 @@ msgstr ""
 "dependências de biblioteca. Infelizmente, isto é muito lento. Se você "
 "conhece as dependências de biblioteca a partir de outras fontes como o "
 "ficheiro SPEC na fonte, você pode apenas correr o comando \"<emphasis "
-"role=\"strong\">debmake</emphasis> …\" sem a opção <emphasis "
+"role=\"strong\">debmake</emphasis> …​\" sem a opção <emphasis "
 "role=\"strong\">-j</emphasis> e correr o comando <quote><emphasis "
 "role=\"strong\">debian/rules install</emphasis></quote> para verificar os "
 "caminhos de instalação dos ficheiros gerados."
@@ -29723,7 +29699,7 @@ msgstr ""
 #~ "vez do predefinido <emphasis role=\"strong\">origin</emphasis>.  Depois "
 #~ "você pode facilmente recolher alterações do autor recentes para a revisão "
 #~ "Debian ao pega-las com o comando <emphasis role=\"strong\">gitk</"
-#~ "emphasis> e usando o comando <emphasis role=\"strong\">gbp-pq</emphasis."
+#~ "emphasis> e usando o comando <emphasis role=\"strong\">gbp-pq</emphasis>."
 
 #~ msgid ""
 #~ "The “<emphasis role=\"strong\">gbp import-orig --upstream-vcs-tag</"
