Version in base suite: 20.10.1-1 Base version: command-not-found_20.10.1-1 Target version: command-not-found_20.10.1-1+deb11u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/c/command-not-found/command-not-found_20.10.1-1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/c/command-not-found/command-not-found_20.10.1-1+deb11u1.dsc changelog | 8 +++ patches/0001-creator.py-add-new-non-free-firmware-component.patch | 25 ++++++++++ patches/series | 1 tests/control | 2 tests/smoke | 2 5 files changed, 36 insertions(+), 2 deletions(-) diff -Nru command-not-found-20.10.1/debian/changelog command-not-found-20.10.1/debian/changelog --- command-not-found-20.10.1/debian/changelog 2021-01-06 10:44:18.000000000 +0000 +++ command-not-found-20.10.1/debian/changelog 2023-02-22 15:09:19.000000000 +0000 @@ -1,3 +1,11 @@ +command-not-found (20.10.1-1+deb11u1) bullseye; urgency=medium + + * creator.py: add new non-free-firmware component (Closes: #1029803) + * debian/tests: Add adduser dependency, fix test to not assume vim-tiny + matches for vim. (from bookworm branch) + + -- Paul Gevers Wed, 22 Feb 2023 16:09:19 +0100 + command-not-found (20.10.1-1) unstable; urgency=medium * Trim trailing whitespace. diff -Nru command-not-found-20.10.1/debian/patches/0001-creator.py-add-new-non-free-firmware-component.patch command-not-found-20.10.1/debian/patches/0001-creator.py-add-new-non-free-firmware-component.patch --- command-not-found-20.10.1/debian/patches/0001-creator.py-add-new-non-free-firmware-component.patch 1970-01-01 00:00:00.000000000 +0000 +++ command-not-found-20.10.1/debian/patches/0001-creator.py-add-new-non-free-firmware-component.patch 2023-02-22 15:09:19.000000000 +0000 @@ -0,0 +1,25 @@ +From 95e94853f4abff33f576e58ebeab795f6cb1a62e Mon Sep 17 00:00:00 2001 +From: Paul Gevers +Date: Sun, 19 Feb 2023 21:45:07 +0100 +Subject: [PATCH] creator.py: add new non-free-firmware component + +Closes: #1029803 +--- + CommandNotFound/db/creator.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CommandNotFound/db/creator.py b/CommandNotFound/db/creator.py +index 75d01f1..8f6ef70 100755 +--- a/CommandNotFound/db/creator.py ++++ b/CommandNotFound/db/creator.py +@@ -20,6 +20,7 @@ component_priorities = { + 'universe': 100, + 'contrib': 80, + 'restricted': 60, ++ 'non-free-firmware': 50, + 'non-free': 40, + 'multiverse': 20, + } +-- +2.39.1 + diff -Nru command-not-found-20.10.1/debian/patches/series command-not-found-20.10.1/debian/patches/series --- command-not-found-20.10.1/debian/patches/series 2021-01-06 10:44:18.000000000 +0000 +++ command-not-found-20.10.1/debian/patches/series 2023-02-22 15:09:19.000000000 +0000 @@ -1,2 +1,3 @@ bts.diff 0003-cnf-update-db-Add-support-for-Contents-files.patch +0001-creator.py-add-new-non-free-firmware-component.patch diff -Nru command-not-found-20.10.1/debian/tests/control command-not-found-20.10.1/debian/tests/control --- command-not-found-20.10.1/debian/tests/control 2021-01-06 10:44:18.000000000 +0000 +++ command-not-found-20.10.1/debian/tests/control 2023-02-22 15:09:19.000000000 +0000 @@ -1,4 +1,4 @@ Tests: smoke Restrictions: needs-root -Depends: command-not-found +Depends: command-not-found, adduser diff -Nru command-not-found-20.10.1/debian/tests/smoke command-not-found-20.10.1/debian/tests/smoke --- command-not-found-20.10.1/debian/tests/smoke 2021-01-06 10:44:18.000000000 +0000 +++ command-not-found-20.10.1/debian/tests/smoke 2023-02-22 15:09:19.000000000 +0000 @@ -10,7 +10,7 @@ echo "Ensure we have results from c-n-f" /usr/lib/command-not-found --ignore-installed vim 2>&1 | grep vim -/usr/lib/command-not-found --ignore-installed vim 2>&1 | grep vim-tiny +/usr/lib/command-not-found --ignore-installed vim 2>&1 | grep "command '.*' from deb " echo "Add testuser"