Move debian under distribution.packaging.debian

This required moving the existing distribution.packaging.debian
key to distribution.packaging.debian.package.

14 files changed, 99 insertions, 80 deletions

diff --git a/Changes b/Changes
index c3d83bc..691ad68 100644
--- a/Changes
+++ b/Changes
@@ -14,10 +14,12 @@ DocKnot 4.00 (unreleased)
     about Lancaster Consensus environment variables.
 
     Move bootstrap metadata to build.bootstrap, build.lancaster to
-    test.lancaster, packaging to distribution.packaging, and
-    readme.sections to sections to clean up some old issues with the
-    schema now that there's an upgrade process.  If readme.sections
-    defined a testing section, move that to test.override.
+    test.lancaster, packaging to distribution.packaging, packaging.debian
+    to distribution.packaging.debian.package, debian to
+    distribution.packaging.debian, and readme.sections to sections to
+    clean up some old issues with the schema now that there's an upgrade
+    process.  If readme.sections defined a testing section, move that to
+    test.override.
 
     Drop support for the support.cpan metadata key, since the CPAN RT
     instance is going away.  For packages with support.cpan set, if
diff --git a/docs/docknot.yaml b/docs/docknot.yaml
index 1659f4b..8595021 100644
--- a/docs/docknot.yaml
+++ b/docs/docknot.yaml
@@ -28,11 +28,12 @@ build:
   type: Module::Build
 distribution:
   cpan: App-DocKnot
+  packaging:
+    debian:
+      personal: true
   section: devel
   tarname: App-DocKnot
   version: docknot
-debian:
-  personal: true
 support:
   email: rra@cpan.org
   github: rra/docknot
diff --git a/lib/App/DocKnot/Update.pm b/lib/App/DocKnot/Update.pm
index f56cf07..7c7895c 100644
--- a/lib/App/DocKnot/Update.pm
+++ b/lib/App/DocKnot/Update.pm
@@ -218,8 +218,21 @@ sub update {
         delete $data_ref->{build}{lancaster};
     }
 
-    # Move packaging to distribution.packaging.
+    # Move packaging.debian to packaging.debian.package, move debian to
+    # packaging.debian, and move packaging to distribution.packaging.
     if (defined($data_ref->{packaging})) {
+        if (defined($data_ref->{packaging}{debian})) {
+            my $package = $data_ref->{packaging}{debian};
+            $data_ref->{packaging}{debian} = { package => $package };
+        }
+    }
+    if (defined($data_ref->{debian})) {
+        $data_ref->{packaging}{debian} //= {};
+        $data_ref->{packaging}{debian}
+          = { $data_ref->{debian}->%*, $data_ref->{packaging}{debian}->%* };
+        delete $data_ref->{debian};
+    }
+    if ($data_ref->{packaging}) {
         $data_ref->{distribution}{packaging} = $data_ref->{packaging};
         delete $data_ref->{packaging};
     }
diff --git a/share/schema/docknot.yaml b/share/schema/docknot.yaml
index 4f0b3ec..d205d2e 100644
--- a/share/schema/docknot.yaml
+++ b/share/schema/docknot.yaml
@@ -71,13 +71,6 @@ mapping:
           years:
             type: text
             required: true
-  debian:
-    type: map
-    mapping:
-      personal:
-        type: bool
-      summary:
-        type: text
   description:
     type: text
     required: true
@@ -94,7 +87,14 @@ mapping:
         type: map
         mapping:
           debian:
-            type: text
+            type: map
+            mapping:
+              package:
+                type: text
+              personal:
+                type: bool
+              summary:
+                type: text
           extra:
             type: text
       section:
diff --git a/share/templates/readme-md.tmpl b/share/templates/readme-md.tmpl
index f541f14..5535f31 100644
--- a/share/templates/readme-md.tmpl
+++ b/share/templates/readme-md.tmpl
@@ -4,7 +4,7 @@
 [% IF vcs.status.travis %][![Build status](https://travis-ci.org/[% vcs.status.travis %].svg?branch=master)](https://travis-ci.org/[% vcs.status.travis %]) [% END -%]
 [% IF vcs.status.workflow %][![Build status](https://github.com/[% vcs.github %]/workflows/[% vcs.status.workflow %]/badge.svg)](https://github.com/[% vcs.github %]/actions) [% END -%]
 [% IF distribution.cpan %][![CPAN version](https://img.shields.io/cpan/v/[% distribution.cpan %])](https://metacpan.org/release/[% distribution.cpan %])[% IF vcs.github %] [![License](https://img.shields.io/cpan/l/[% distribution.cpan %])](https://github.com/[% vcs.github %]/blob/master/LICENSE)[% END %] [% END -%]
-[% IF distribution.packaging.debian %][![Debian package](https://img.shields.io/debian/v/[% distribution.packaging.debian %]/unstable)](https://tracker.debian.org/pkg/[% distribution.packaging.debian %])[% END -%]
+[% IF distribution.packaging.debian.package %][![Debian package](https://img.shields.io/debian/v/[% distribution.packaging.debian.package %]/unstable)](https://tracker.debian.org/pkg/[% distribution.packaging.debian.package %])[% END -%]
 
 [% END %]
 [% FOREACH copr IN copyrights %]Copyright [% copr.years %]
diff --git a/share/templates/thread.tmpl b/share/templates/thread.tmpl
index 4d73dac..f46ae31 100644
--- a/share/templates/thread.tmpl
+++ b/share/templates/thread.tmpl
@@ -32,8 +32,8 @@
 
     \download[[% name %]][[% distribution.version %]]
         [[% distribution.section %]/[% distribution.tarname %]-\version[[% distribution.version %]]]
-[% IF distribution.packaging.debian %]
-    \link[https://packages.debian.org/source/sid/[% distribution.packaging.debian %]]
+[% IF distribution.packaging.debian.package %]
+    \link[https://packages.debian.org/source/sid/[% distribution.packaging.debian.package %]]
          [Debian packages] \break[% END %]
     \link[https://archives.eyrie.org/software/ARCHIVE/[% distribution.tarname %]/]
          [Archive]
@@ -64,8 +64,8 @@
     \link[https://metacpan.org/release/[% distribution.cpan %]]
          [MetaCPAN][% END %][% IF vcs.openhub %] \break
     \link[[% vcs.openhub %]]
-         [Open HUB code analysis][% END %][% IF distribution.packaging.debian %] \break
-    \link[https://tracker.debian.org/pkg/[% distribution.packaging.debian %]]
+         [Open HUB code analysis][% END %][% IF distribution.packaging.debian.package %] \break
+    \link[https://tracker.debian.org/pkg/[% distribution.packaging.debian.package %]]
          [Debian package tracker][% END %]
 ]
 [% IF orphaned %]
@@ -108,14 +108,14 @@ An \link[https://archives.eyrie.org/software/ARCHIVE/[% distribution.tarname %]/
 [archive of older releases] is also available.[% IF advisories %]
 \class(alert)[Versions older than [% advisories.0.threshold %] have known
 security vulnerabilities and should not be used.][% END %]
-[% IF debian.summary %]
-[% to_thread(debian.summary) | trim %][% IF debian.summary.match('\n\n') %]
+[% IF distribution.packaging.debian.summary %]
+[% to_thread(distribution.packaging.debian.summary) | trim %][% IF distribution.packaging.debian.summary.match('\n\n') %]
 
 [% ELSE %]  [% END %]See the \link[https://tracker.debian.org/pkg/[%
-distribution.packaging.debian %]][Debian package tracker] for more
+distribution.packaging.debian.package %]][Debian package tracker] for more
 information.
 
-[% ELSIF debian.personal %]
+[% ELSIF distribution.packaging.debian.personal %]
 A Debian package is available from my \link[../debian.html][personal
 repository].
 [% END %][% IF distribution.cpan %]
diff --git a/t/data/generate/lbcd/docknot.yaml b/t/data/generate/lbcd/docknot.yaml
index 0d23a54..6dbffa9 100644
--- a/t/data/generate/lbcd/docknot.yaml
+++ b/t/data/generate/lbcd/docknot.yaml
@@ -35,14 +35,15 @@ build:
   type: Autoconf
 distribution:
   packaging:
-    debian: lbcd
+    debian:
+      package: lbcd
+      summary: |
+        A Debian package is included in Debian 5.0 (lenny) and later
+        releases.  Thanks to Guido Guenther for doing the initial upload
+        to Debian.
   section: system
   tarname: lbcd
   version: lbcd
-debian:
-  summary: |
-    A Debian package is included in Debian 5.0 (lenny) and later releases.
-    Thanks to Guido Guenther for doing the initial upload to Debian.
 support:
   email: eagle@eyrie.org
   listname: lbnamed-users
diff --git a/t/data/generate/pam-krb5/docknot.yaml b/t/data/generate/pam-krb5/docknot.yaml
index a741190..cf4ce0b 100644
--- a/t/data/generate/pam-krb5/docknot.yaml
+++ b/t/data/generate/pam-krb5/docknot.yaml
@@ -34,15 +34,15 @@ build:
     module in `/lib/security` or `/lib64/security`.
   reduced_depends: true
   type: Autoconf
-debian:
-  summary: |
-    Debian packages are available from Debian in Debian 4.0 (etch) and later
-    releases as libpam-krb5 and libpam-heimdal.  The former packages are built
-    against the MIT Kerberos libraries and the latter against the Heimdal
-    libraries.
 distribution:
   packaging:
-    debian: libpam-krb5
+    debian:
+      package: libpam-krb5
+      summary: |
+        Debian packages are available from Debian in Debian 4.0 (etch) and
+        later releases as libpam-krb5 and libpam-heimdal.  The former
+        packages are built against the MIT Kerberos libraries and the
+        latter against the Heimdal libraries.
   section: kerberos
   tarname: pam-krb5
   version: pam-krb5
diff --git a/t/data/generate/pgp-sign/docknot.yaml b/t/data/generate/pgp-sign/docknot.yaml
index dcedcf1..dfaddd4 100644
--- a/t/data/generate/pgp-sign/docknot.yaml
+++ b/t/data/generate/pgp-sign/docknot.yaml
@@ -13,16 +13,16 @@ copyrights:
 
 build:
   type: Module::Build
-debian:
-  summary: |
-    PGP::Sign is packaged for Debian as libpgp-sign-perl.
 distribution:
   cpan: PGP-Sign
   ignore:
     - ^t/data/gnupg1/random_seed$
     - ^t/data/gnupg./trustdb\.gpg$
   packaging:
-    debian: libpgp-sign-perl
+    debian:
+      package: libpgp-sign-perl
+      summary: |
+        PGP::Sign is packaged for Debian as libpgp-sign-perl.
   section: perl
   tarname: PGP-Sign
   version: pgp-sign
diff --git a/t/data/generate/remctl/docknot.yaml b/t/data/generate/remctl/docknot.yaml
index 8ffe046..a588ee0 100644
--- a/t/data/generate/remctl/docknot.yaml
+++ b/t/data/generate/remctl/docknot.yaml
@@ -104,21 +104,22 @@ build:
     directories separately with `--with-gput-include` and `--with-gput-lib`.
   reduced_depends: true
   type: Autoconf
-debian:
-  summary: |
-    Debian packages are available from Debian as of Debian 3.1 (sarge).  For
-    Debian 4.0 (etch) and later, install remctl-server for the server and
-    remctl-client for the client.  (The sarge release had a single remctl
-    package that contained both.)
-
-    The Net::Remctl Perl module is available in Debian 5.0 (lenny) and newer;
-    install libnet-remctl-perl for it.  The PHP bindings (php5-remctl), Python
-    bindings (python-remctl), and Ruby bindings (ruby-remctl) are available in
-    Debian 6.0 (squeeze) and newer.  The Ruby bindings package is named
-    libremctl-ruby in Debian versions before 7.0 (wheezy).
 distribution:
   packaging:
-    debian: remctl
+    debian:
+      package: remctl
+      summary: |
+        Debian packages are available from Debian as of Debian 3.1
+        (sarge).  For Debian 4.0 (etch) and later, install remctl-server
+        for the server and remctl-client for the client.  (The sarge
+        release had a single remctl package that contained both.)
+
+        The Net::Remctl Perl module is available in Debian 5.0 (lenny) and
+        newer; install libnet-remctl-perl for it.  The PHP bindings
+        (php5-remctl), Python bindings (python-remctl), and Ruby bindings
+        (ruby-remctl) are available in Debian 6.0 (squeeze) and newer.
+        The Ruby bindings package is named libremctl-ruby in Debian
+        versions before 7.0 (wheezy).
     extra: |
       For those using Puppet, there is a [Puppet
       module](https://forge.puppetlabs.com/ccin2p3/remctl) available for
diff --git a/t/data/generate/wallet/docknot.yaml b/t/data/generate/wallet/docknot.yaml
index c50c6bb..5b05499 100644
--- a/t/data/generate/wallet/docknot.yaml
+++ b/t/data/generate/wallet/docknot.yaml
@@ -56,9 +56,10 @@ build:
     `--with-remctl-lib=DIR`.
   reduced_depends: true
   type: Autoconf
-debian:
-  personal: true
 distribution:
+  packaging:
+    debian:
+      personal: true
   section: kerberos
   tarname: wallet
   version: wallet
diff --git a/t/data/update/lbcd/docknot.yaml b/t/data/update/lbcd/docknot.yaml
index 8b76418..087c3a9 100644
--- a/t/data/update/lbcd/docknot.yaml
+++ b/t/data/update/lbcd/docknot.yaml
@@ -31,10 +31,6 @@ build:
 copyrights:
 - holder: The Board of Trustees of the Leland Stanford Junior University
   years: 1993-1994, 1996-1998, 2000, 2003-2009, 2012-2013
-debian:
-  summary: |
-    A Debian package is included in Debian 5.0 (lenny) and later releases.
-    Thanks to Guido Guenther for doing the initial upload to Debian.
 description: |
   lbcd provides a lightweight way to query a system via unauthenticated UDP
   for system load information plus some related information that may be
@@ -64,7 +60,11 @@ description: |
   standard portability layer.
 distribution:
   packaging:
-    debian: lbcd
+    debian:
+      package: lbcd
+      summary: |
+        A Debian package is included in Debian 5.0 (lenny) and later releases.
+        Thanks to Guido Guenther for doing the initial upload to Debian.
   section: system
   tarname: lbcd
   version: lbcd
diff --git a/t/data/update/pam-krb5/docknot.yaml b/t/data/update/pam-krb5/docknot.yaml
index 23b0d9c..f91ad1c 100644
--- a/t/data/update/pam-krb5/docknot.yaml
+++ b/t/data/update/pam-krb5/docknot.yaml
@@ -39,12 +39,6 @@ copyrights:
   years: '2005'
 - holder: Frank Cusack <fcusack@fcusack.com>
   years: 1999-2000
-debian:
-  summary: |
-    Debian packages are available from Debian in Debian 4.0 (etch) and later
-    releases as libpam-krb5 and libpam-heimdal.  The former packages are built
-    against the MIT Kerberos libraries and the latter against the Heimdal
-    libraries.
 description: |
   pam-krb5 provides a Kerberos PAM module that supports authentication, user
   ticket cache handling, simple authorization (via .k5login or checking
@@ -70,7 +64,13 @@ description: |
   know.
 distribution:
   packaging:
-    debian: libpam-krb5
+    debian:
+      package: libpam-krb5
+      summary: |
+        Debian packages are available from Debian in Debian 4.0 (etch) and later
+        releases as libpam-krb5 and libpam-heimdal.  The former packages are built
+        against the MIT Kerberos libraries and the latter against the Heimdal
+        libraries.
   section: kerberos
   tarname: pam-krb5
   version: pam-krb5
diff --git a/t/data/update/remctl/docknot.yaml b/t/data/update/remctl/docknot.yaml
index ba2e618..c64e868 100644
--- a/t/data/update/remctl/docknot.yaml
+++ b/t/data/update/remctl/docknot.yaml
@@ -101,18 +101,6 @@ copyrights:
   years: 2015-2016, 2018
 - holder: The Board of Trustees of the Leland Stanford Junior University
   years: 2002-2014
-debian:
-  summary: |
-    Debian packages are available from Debian as of Debian 3.1 (sarge).  For
-    Debian 4.0 (etch) and later, install remctl-server for the server and
-    remctl-client for the client.  (The sarge release had a single remctl
-    package that contained both.)
-
-    The Net::Remctl Perl module is available in Debian 5.0 (lenny) and newer;
-    install libnet-remctl-perl for it.  The PHP bindings (php5-remctl), Python
-    bindings (python-remctl), and Ruby bindings (ruby-remctl) are available in
-    Debian 6.0 (squeeze) and newer.  The Ruby bindings package is named
-    libremctl-ruby in Debian versions before 7.0 (wheezy).
 description: |
   remctl is a client/server application that supports remote execution of
   specific commands, using Kerberos GSS-API for authentication and
@@ -165,7 +153,19 @@ description: |
   somewhat out of date).
 distribution:
   packaging:
-    debian: remctl
+    debian:
+      package: remctl
+      summary: |
+        Debian packages are available from Debian as of Debian 3.1 (sarge).  For
+        Debian 4.0 (etch) and later, install remctl-server for the server and
+        remctl-client for the client.  (The sarge release had a single remctl
+        package that contained both.)
+
+        The Net::Remctl Perl module is available in Debian 5.0 (lenny) and newer;
+        install libnet-remctl-perl for it.  The PHP bindings (php5-remctl), Python
+        bindings (python-remctl), and Ruby bindings (ruby-remctl) are available in
+        Debian 6.0 (squeeze) and newer.  The Ruby bindings package is named
+        libremctl-ruby in Debian versions before 7.0 (wheezy).
     extra: |
       For those using Puppet, there is a
       [Puppet module](https://forge.puppetlabs.com/ccin2p3/remctl)