Re: Bug#1100960: bookworm-pu: package lintian/2.116.3+deb12u1

[Adrian Bunk <bunk@debian.org>]

On Fri, Mar 21, 2025 at 09:23:44AM +0800, Maytham Alsudany wrote:
> Package: release.debian.org
> Severity: normal
> Tags: bookworm
> User: release.debian.org@packages.debian.org
> Usertags: pu
> X-Debbugs-Cc: lintian@packages.debian.org, pollo@debian.org
> Control: affects -1 + src:lintian
>...
> [ Reason ]
> Fix for #1051140; make lintian in bookworm know about bookworm.


I'd like to suggest a slightly larger update with two changes instead:


  * data/changes-file/known-dists: Add releases bookworm to duke.
    (Closes: #1051140)

All releases up to what is in trixie:
https://salsa.debian.org/lintian/lintian/-/commit/d16a8f67ba842b8c395d2e983b2a7560a5866856

E.g. running bookworm lintian on trixie-pu updates will not emit this 
tag now.


  * Don't emit source-nmu-has-incorrect-version-number for stable updates.
    (Closes: #1022759)

That's two commits, changing Nmu.pm to its version in trixie:
https://salsa.debian.org/lintian/lintian/-/commit/79d146acb7b4784cea4e7cd705de9f9854e98bd6
https://salsa.debian.org/lintian/lintian/-/commit/809dd16a279e43cc351c2831f6456f519cf3f810


Together this makes this upload of lintian lintian-clean, by fixing both
E: lintian changes: bad-distribution-in-changes-file bookworm
W: lintian source: source-nmu-has-incorrect-version-number 2.116.3+deb12u1 [debian/changelog:1]


cu
Adrian

diffstat for lintian-2.116.3 lintian-2.116.3+deb12u1

 data/changes-file/known-dists |    4 ++++
 debian/changelog              |   10 ++++++++++
 lib/Lintian/Check/Nmu.pm      |    2 ++
 3 files changed, 16 insertions(+)

diff -Nru lintian-2.116.3/data/changes-file/known-dists lintian-2.116.3+deb12u1/data/changes-file/known-dists
--- lintian-2.116.3/data/changes-file/known-dists	2019-07-10 18:54:56.000000000 +0300
+++ lintian-2.116.3+deb12u1/data/changes-file/known-dists	2025-07-06 23:41:42.000000000 +0300
@@ -11,6 +11,10 @@
 stretch
 buster
 bullseye
+bookworm
+trixie
+forky
+duke
 sid
 
 # Aliases
diff -Nru lintian-2.116.3/debian/changelog lintian-2.116.3+deb12u1/debian/changelog
--- lintian-2.116.3/debian/changelog	2023-02-05 10:10:20.000000000 +0200
+++ lintian-2.116.3+deb12u1/debian/changelog	2025-07-06 23:41:42.000000000 +0300
@@ -1,3 +1,13 @@
+lintian (2.116.3+deb12u1) bookworm; urgency=medium
+
+  * Non-maintainer upload.
+  * data/changes-file/known-dists: Add releases bookworm to duke.
+    (Closes: #1051140)
+  * Don't emit source-nmu-has-incorrect-version-number for stable updates.
+    (Closes: #1022759)
+
+ -- Adrian Bunk <bunk@debian.org>  Sun, 06 Jul 2025 23:41:42 +0300
+
 lintian (2.116.3) unstable; urgency=medium
 
   The "FFP3 (Fixing False Positives, Three Small Changes)" Release.
diff -Nru lintian-2.116.3/lib/Lintian/Check/Nmu.pm lintian-2.116.3+deb12u1/lib/Lintian/Check/Nmu.pm
--- lintian-2.116.3/lib/Lintian/Check/Nmu.pm	2022-07-02 16:47:11.000000000 +0300
+++ lintian-2.116.3+deb12u1/lib/Lintian/Check/Nmu.pm	2025-07-06 23:41:42.000000000 +0300
@@ -102,6 +102,7 @@
     my $version_nmuness = 0;
     my $version_local = 0;
     my $upload_is_backport = $version =~ m/~bpo(\d+)\+(\d+)$/;
+    my $upload_is_stable_update = $version =~ m/[~|\+]deb(\d+)u(\d+)$/;
 
     if ($version =~ /-[^.-]+(\.[^.-]+)?(\.[^.-]+)?$/) {
         $version_nmuness = 1 if defined $1;
@@ -158,6 +159,7 @@
                 $pointer, $version)
               if $upload_is_nmu
               && $version_nmuness != 1
+              && !$upload_is_stable_update
               && !$upload_is_backport;
         }