Package: devscripts
Version: 2.25.19
Severity: wishlist

Dear Maintainer,

The manpages for debian-watch version 5 format seem to prefer
Capitalized-Hyphened names as canonical names, but some examples still
uses the old variant (e.g. Searchmode, instead of Search-Mode).  The
attached proposed patch changes those to the preferred version.

(I tried to create an MR but currently Salsa gave me an error saying the
source branch didn't exist.  Hopefully this will be fixed soon.)

-- System Information:
Debian Release: forky/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (200, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.16.3+deb14-amd64 (SMP w/2 CPU threads; PREEMPT)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages devscripts depends on:
ii  dpkg-dev              1.22.21
ii  file                  1:5.46-5
ii  gpg                   2.4.8-3
ii  gpg-agent             2.4.8-3
ii  gpgv                  2.4.8-3
ii  libdpkg-perl          1.22.21
ii  libfile-dirlist-perl  0.05-3
ii  libfile-homedir-perl  1.006-2
ii  libfile-touch-perl    0.12-2
ii  libio-string-perl     1.08-4
ii  libmoo-perl           2.005005-1
ii  libwww-perl           6.78-1
ii  patchutils            0.4.2-1
ii  perl                  5.40.1-6
ii  python3               3.13.7-1
ii  sensible-utils        0.0.26
ii  wdiff                 1.2.2-9

Versions of packages devscripts recommends:
ii  apt                         3.1.5
ii  curl                        8.16.0~rc2-1
ii  dctrl-tools                 2.24-3+b1
ii  debian-keyring              2025.07.26
ii  debian-tag2upload-keyring   1.1
ii  dput                        1.2.4
ii  equivs                      2.3.2
ii  git-debpush                 13.13
ii  libdistro-info-perl         1.14
ii  libencode-locale-perl       1.05-3
ii  libgitlab-api-v4-perl       0.27-1
ii  libjson-perl                4.10000-1
ii  liblwp-protocol-https-perl  6.14-1
ii  libmetacpan-client-perl     2.033000-1
ii  libsoap-lite-perl           1.27-3
ii  libstring-shellquote-perl   1.04-3
ii  liburi-perl                 5.30-1
ii  licensecheck                3.3.9-1
ii  lintian                     2.123.0
ii  lzip                        1.25-3
ii  man-db                      2.13.1-1
ii  patch                       2.8-2
ii  pristine-tar                1.50+nmu2
ii  python3-apt                 3.0.0
ii  python3-debian              1.0.1
ii  python3-magic               2:0.4.27-3
ii  python3-requests            2.32.4+dfsg-1
ii  python3-unidiff             0.7.5-2
ii  python3-xdg                 0.28-2
ii  strace                      6.16+ds-2
ii  unzip                       6.0-29
ii  wget                        1.25.0-2
ii  xz-utils                    5.8.1-1

Versions of packages devscripts suggests:
ii  adequate                                  0.17.6+b1
pn  at                                        <none>
ii  autopkgtest                               5.50
pn  bls-standalone                            <none>
ii  build-essential                           12.12
pn  check-all-the-things                      <none>
ii  debhelper                                 13.26
pn  diffoscope                                <none>
pn  disorderfs                                <none>
pn  docker.io                                 <none>
ii  dose-extra                                7.0.0-6+b3
pn  duck                                      <none>
ii  elpa-devscripts                           40.7
pn  faketime                                  <none>
ii  gnuplot-nox [gnuplot]                     6.0.3+dfsg1-1
pn  how-can-i-help                            <none>
ii  libauthen-sasl-perl                       2.1900-1
pn  libdbd-pg-perl                            <none>
ii  libgitlab-api-v4-perl                     0.27-1
pn  libterm-size-perl                         <none>
ii  libtimedate-perl                          2.3300-2
ii  libyaml-libyaml-perl                      0.903.0+ds-1
ii  mailutils [mailx]                         1:3.20-1
ii  mmdebstrap                                1.5.7-3
ii  mutt                                      2.2.13-1
ii  openssh-client [ssh-client]               1:10.0p1-8
ii  piuparts                                  1.6.0
ii  postgresql-client-17 [postgresql-client]  17.6-1
pn  pristine-lfs                              <none>
ii  python3-debianbts                         4.1.1
pn  python3-pycurl                            <none>
ii  quilt                                     0.68-1
ii  ratt                                      0.0~git20250812.e11cf12-1
ii  reprotest                                 0.7.30
pn  svn-buildpackage                          <none>
ii  w3m                                       0.5.3+git20230121-2.1

-- no debconf information
>From 157b1894770ff4096cd4bf27a40a543cd6a6c4d1 Mon Sep 17 00:00:00 2001
From: Xiyue Deng <[email protected]>
Date: Wed, 27 Aug 2025 22:22:09 -0700
Subject: [PATCH] Use canonical field name in manpage

- Prefer capitalized and hyphened caninocal name over names without
hyphen.
---
 scripts/debian-watch.pod    | 26 +++++++++++++-------------
 scripts/uscan-templates.pod |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/debian-watch.pod b/scripts/debian-watch.pod
index 812524c3..0e248398 100644
--- a/scripts/debian-watch.pod
+++ b/scripts/debian-watch.pod
@@ -1253,7 +1253,7 @@ starting by C<v1>:
   Matching-Pattern: https://api.github.com/repos/[^/]+/[^/]+/git/refs/tags/@ANY_VERSION@
   Download-Url-Mangle: s%(api.github.com/repos/[^/]+/[^/]+)/git/refs/%$1/tarball/refs/%g
   Filename-Mangle: s%.*/@ANY_VERSION@%@PACKAGE@-$1.tar.gz%
-  Searchmode: plain
+  Search-Mode: plain
 
 Alternatives with releases only (if upstream does not delete tag after release):
 
@@ -1263,7 +1263,7 @@ Alternatives with releases only (if upstream does not delete tag after release):
   Matching-Pattern: https://api.github.com/repos/[^/]+/[^/]+/git/refs/tags/@ANY_VERSION@
   Download-Url-Mangle: s%api.github.com/repos/([^/]+/[^/]+)/git/refs/tags/@ANY_VERSION@%github.com/$1/archive/refs/tags/$2.tar.gz%g
   Filename-Mangle: s%.*/@ANY_VERSION@%@PACKAGE@-$1.tar.gz%
-  Searchmode: plain
+  Search-Mode: plain
 
 In case of release that does not use tags or deleted tags:
 
@@ -1272,7 +1272,7 @@ In case of release that does not use tags or deleted tags:
   Source: https://api.github.com/repos/<user>/<project>/releases?per_page=100
   Matching-Pattern: https://api.github.com/repos/<user>/<project>/tarball/@ANY_VERSION@
   Filename-Mangle: s%.*/@ANY_VERSION@%@PACKAGE@-$1.tar.gz%
-  Searchmode: plain
+  Search-Mode: plain
 
 If upstream releases alpha/beta tarballs, you will need to make use of the
 B<Uversion-Mangle> option: F<Uversion-Mangle: s/(a|alpha|b|beta|c|dev|pre|rc)/~$1/>
@@ -1289,7 +1289,7 @@ B<Download-Url-Mangle> options:
   Download-Url-Mangle: s%(api.github.com/repos/[^/]+/[^/]+)/git/refs/.*%$1/tarball/0123456789abcdf01234567890abcef012345678%g
   Filename-Mangle: s%.*%1.2.3~git.tar.gz%
   Oversion-Mangle: s/.*/1.2.3~git/g
-  Searchmode: plain
+  Search-Mode: plain
 
 Remember, in this case, after B<gbp> B<import-orig> B<--uscan> to revert
 the F<debian/watch> file.
@@ -1376,22 +1376,22 @@ a way to group them:
 
   Source: https://registry.npmjs.org/mongodb
   Matching-Pattern: https://registry.npmjs.org/mongodb/-/mongodb-@ANY_VERSION@@ARCHIVE_EXT@
-  Searchmode: plain
+  Search-Mode: plain
 
   Component: bson
   Source: https://registry.npmjs.org/bson
   Matching-Pattern: https://registry.npmjs.org/bson/-/bson-@ANY_VERSION@@ARCHIVE_EXT@
-  Searchmode: plain
+  Search-Mode: plain
 
   Component: mongodb-core
   Source: https://registry.npmjs.org/mongodb-core
   Matching-Pattern: https://registry.npmjs.org/mongodb-core/-/mongodb-core-@ANY_VERSION@@ARCHIVE_EXT@
-  Searchmode: plain
+  Search-Mode: plain
 
   Component: requireoptional
   Source: https://registry.npmjs.org/require_optional
   Matching-Pattern: https://registry.npmjs.org/require_optional/-/require_optional-@ANY_VERSION@@ARCHIVE_EXT@
-  Searchmode: plain
+  Search-Mode: plain
 
 Package version is then the concatenation of upstream versions separated by
 "+~".
@@ -1404,22 +1404,22 @@ In this case, the main source is automatically declared as "group":
 
   Source: https://registry.npmjs.org/mongodb
   Matching-Pattern: https://registry.npmjs.org/mongodb/-/mongodb-@ANY_VERSION@@ARCHIVE_EXT@
-  Searchmode: plain
+  Search-Mode: plain
 
   Component: bson
   Source: https://registry.npmjs.org/bson
   Matching-Pattern: https://registry.npmjs.org/bson/-/bson-@ANY_VERSION@@ARCHIVE_EXT@
-  Searchmode: plain
+  Search-Mode: plain
 
   Component: mongodb-core
   Source: https://registry.npmjs.org/mongodb-core
   Matching-Pattern: https://registry.npmjs.org/mongodb-core/-/mongodb-core-@ANY_VERSION@@ARCHIVE_EXT@
-  Searchmode: plain
+  Search-Mode: plain
 
   Component: requireoptional
   Source: https://registry.npmjs.org/require_optional
   Matching-Pattern: https://registry.npmjs.org/require_optional/-/require_optional-@ANY_VERSION@@ARCHIVE_EXT@
-  Searchmode: plain
+  Search-Mode: plain
 
 The "checksum" is made up of the separate sum of each number composing the
 component versions and prefixed with ~cs (short for checksum).  Following is an
@@ -1553,7 +1553,7 @@ For Fossil based projects, the tarball URL can be deduced from the taglist page.
   Matching-Pattern: /timeline\?t=@ANY_VERSION@
   Download-Url-Mangle: s#/timeline\?t=(@ANY_VERSION@)#/tarball/Grammalecte.tar.gz?r=$1#
   Filename-Mangle: s/timeline\?t=(@ANY_VERSION@)/@PACKAGE@-$1.tar.gz/
-  Searchmode: plain
+  Search-Mode: plain
 
 =head2 Gitlab
 
diff --git a/scripts/uscan-templates.pod b/scripts/uscan-templates.pod
index 331dd0d5..cc6088b1 100644
--- a/scripts/uscan-templates.pod
+++ b/scripts/uscan-templates.pod
@@ -100,7 +100,7 @@ by:
 
   Source: https://registry.npmjs.org/@lemonldapng/handler
   Matching-Pattern: https://registry.npmjs.org/@lemonldapng/handler/-/handler-@ANY_VERSION@@ARCHIVE_EXT@
-  Searchmode: plain
+  Search-Mode: plain
 
 =head3 Specific parameters
 
-- 
2.51.0

Reply via email to