Merge ~fourdollars/pc-enablement/+git/oem-scripts:master into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Shih-Yuan Lee]

https://lintian.debian.org/tags/possible-unindented-list-in-extended-description

$ git diff
diff --git a/debian/control b/debian/control
index d67d898..acb520e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ XB-Modaliases: ${modaliases}
 XB-Ubuntu-OEM-Kernel-Flavour: oem
 Description: hardware support for Dell Inspiron 3501, Vostro 3400/3500
  This is a metapackage for Dell PCs:
- * Dell Inspiron 3501
- * Dell Vostro 3400
- * Dell Vostro 3500
+ * Dell Inspiron 3501
+ * Dell Vostro 3400
+ * Dell Vostro 3500
  It installs packages needed to support this hardware fully.

$ debuild -us -uc -tc
...
Now running lintian -i -I --show-overrides oem-somerville-beric-tgl-meta_20.04~ubuntu1_amd64.changes ...
E: oem-somerville-beric-tgl-meta: package-installs-apt-sources etc/apt/sources.list.d/oem-somerville-beric-tgl-meta.list
N:
N: Debian packages should not install files under /etc/apt/sources.list.d/
N: or install an /etc/apt/sources.list file.
N:
N: Package sources are under the control of the local administrator and
N: packages should not override local administrator choices.
N:
N: Packages whose names end in -apt-source or -archive-keyring are
N: permitted to install such files.
N:
N: Refer to the sources.list(5) manual page for details.
N:
N: Severity: error
N:
N: Check: apt
N:
I: oem-somerville-beric-tgl-meta: unknown-field-in-control modaliases
N:
N: See the Policy Manual for a list of the possible fields in a binary
N: package control file.
N:
N: In udeb packages the fields pre-depends, conflicts, essential and
N: suggests are disallowed, but they can contain the new fields
N: subarchitecture and installer-menu-item.
N:
N: Refer to Debian Policy Manual section 5.3 (Binary package control files
N: â DEBIAN/control) for details.
N:
N: Severity: info
N:
N: Check: fields/unknown
N:
I: oem-somerville-beric-tgl-meta: unknown-field-in-control ubuntu-oem-kernel-flavour
Finished running lintian.

package-installs-apt-sources, unknown-field-in-control modaliases and unknown-field-in-control ubuntu-oem-kernel-flavour are expected and we will ignores them in the Lintian CI jobs.

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta FAIL non-zero exit status 1
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta PASS
mir-bug FAIL non-zero exit status 1
oem-meta-packages SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.41-b31652b-in-linux-container-jammy

[Dirk Su (dirksu)]

LGTM

[Dirk Su (dirksu)]

review: Approve

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta PASS
mir-bug PASS
oem-meta-packages SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.41-9680561-in-linux-container-jammy

diff --git a/debian/tests/pkg-somerville-meta b/debian/tests/pkg-somerville-meta
index ec10955..3e476ba 100644
--- a/debian/tests/pkg-somerville-meta
+++ b/debian/tests/pkg-somerville-meta
@@ -30,7 +30,7 @@ grep "Depends: \${misc:Depends}, ubuntu-oem-keyring$" debian/control
 grep "XB-Ubuntu-OEM-Kernel-Flavour: oem" debian/control
 grep -v "Package: oem-somerville-factory-three-eyed-raven-meta" debian/control
 grep "^Description: hardware support for Dell XPS 13 7390\$" debian/control
-grep "^ \* Dell XPS 13 7390\$" -B 1 -A 1 debian/control
+grep "^  \* Dell XPS 13 7390\$" -B 1 -A 1 debian/control
 
 grep "Upstream-Name: oem-somerville-three-eyed-raven-meta" debian/copyright
 
@@ -63,7 +63,7 @@ grep "XB-Ubuntu-OEM-Kernel-Flavour: oem" debian/control
 grep "Package: oem-somerville-factory-three-eyed-raven-meta" debian/control
 grep "Depends: \${misc:Depends}, oem-somerville-factory-meta$" debian/control
 grep "^Description: hardware support for Dell XPS 13 7390\$" debian/control
-grep "^ \* Dell XPS 13 7390\$" -B 1 -A 1 debian/control
+grep "^  \* Dell XPS 13 7390\$" -B 1 -A 1 debian/control
 
 grep "Upstream-Name: oem-somerville-three-eyed-raven-meta" debian/copyright
 
diff --git a/pkg-oem-meta b/pkg-oem-meta
index b328951..640f76d 100755
--- a/pkg-oem-meta
+++ b/pkg-oem-meta
@@ -382,7 +382,7 @@ debian-tag = {branch}_%(version)s
         else:
             platformsStr = "PCs:"
         for product_name in product_names:
-            platformsStr += f"\n * {product_name}"
+            platformsStr += f"\n  * {product_name}"
     else:
         platformStr = Platform
         platformsStr = platformStr + "."