This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=6e8da469da76a5576d84b80c1feac4f10ade9397

commit 6e8da469da76a5576d84b80c1feac4f10ade9397 (HEAD -> main)
Author: Guillem Jover <[email protected]>
AuthorDate: Sun Oct 9 03:26:55 2022 +0200

    doc: Reword vendor file and module lookup logic to make it more clear
    
    Changelog: silent
    Prompted-by: Helge Kreutzmann <[email protected]>
---
 man/deb-origin.pod     | 24 +++++++++++++++++-------
 scripts/Dpkg/Vendor.pm | 19 +++++++++++++------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/man/deb-origin.pod b/man/deb-origin.pod
index 4621d4357..61a564a00 100644
--- a/man/deb-origin.pod
+++ b/man/deb-origin.pod
@@ -42,13 +42,23 @@ the field.
 The file should be named according to the vendor name.
 The usual convention is to name the vendor file using the vendor name
 in all lowercase, but some variation is permitted.
-Namely, non-alphanumeric characters (‘B<[^A-Za-z0-9]>’) are mapped to
-dashes (‘B<->’), and lower-cased, as-is, lower-cased then capitalized
-and capitalized (since dpkg 1.21.10).
-In addition, for historical and backwards compatibility, the above
-casing attempts will be tried first as-is with no remapping, and then
-by remapping spaces to dashes (‘B<->’). But these will be removed
-during the dpkg 1.22.x release cycle.
+
+Namely (since dpkg 1.21.10), first, non-alphanumeric characters
+(‘B<[^A-Za-z0-9]>’) are mapped to dashes (‘B<->’), then the resulting
+name will be tried in sequence by lower-casing it, keeping it as is,
+lower-casing then capitalizing it (that is upper-casing the first character),
+and only capitalizing it.
+
+In addition, for historical and backwards compatibility, the name will
+be tried keeping it as is without non-alphanumeric characters remapping,
+then the resulting name will be tried in sequence by lower-casing it,
+keeping it as is, lower-casing then capitalizing it, and only capitalizing it.
+And finally the name will be tried by remapping spaces to dashes (‘B<->’),
+then the resulting name will be tried in sequence by lower-casing it,
+keeping it as is, lower-casing then capitalizing it, and only capitalizing it.
+
+But these backwards compatible module lookups will be removed during the
+dpkg 1.22.x release cycle.
 
 =head1 FIELDS
 
diff --git a/scripts/Dpkg/Vendor.pm b/scripts/Dpkg/Vendor.pm
index c7bb55556..cb818833e 100644
--- a/scripts/Dpkg/Vendor.pm
+++ b/scripts/Dpkg/Vendor.pm
@@ -116,12 +116,19 @@ name.
 
 The vendor filename will be derived from the vendor name, by replacing any
 number of non-alphanumeric characters (that is B<[^A-Za-z0-9]>) into "B<->",
-then lower-casing, as-is, lower-casing then capitalizing, and capitalizing.
-
-In addition, for historical and backwards compatibility, the above casing
-attempts will be tried also first as-is with no replacements, and then by
-replacing only spaces to "B<->".
-But these name lookups will be removed during the 1.22.x release cycle.
+then the resulting name will be tried in sequence by lower-casing it,
+keeping it as is, lower-casing then capitalizing it, and capitalizing it.
+
+In addition, for historical and backwards compatibility, the name will
+be tried keeping it as is without non-alphanumeric characters remapping,
+then the resulting name will be tried in sequence by lower-casing it,
+keeping it as is, lower-casing then capitalizing it, and capitalizing it.
+And finally the name will be tried by replacing only spaces to "B<->",
+then the resulting name will be tried in sequence by lower-casing it,
+keeping it as is, lower-casing then capitalizing it, and capitalizing it.
+
+But these backwards compatible name lookups will be removed during
+the dpkg 1.22.x release cycle.
 
 =cut
 

-- 
Dpkg.Org's dpkg

Reply via email to