Hi! On Fri, 2023-06-16 at 20:59:52 +0000, Thorsten Glaser wrote: > reassign 1038121 dpkg-dev > thanks
> Raphael Hertzog dixit: > >So maybe it's dpkg-source that needs to be tweaked so that such patches > >have a field "Forwarded: not-needed" and an explanation that the patch > >is an auto-generated mess that can't be forwarded as is. > > I guess so. I was thinking along these lines, and if the patch tracker > has no other way to distinguish these (it’s in local-options, so it > probably does not) then yes, that’s most likely the right solution. While using «Forwarded: not-needed» for now seems ok, I think we need a better marking, because IMO the contents should be ideally be forwarded, just not in that form. Perhaps we should add a new field called «Autogenerated: yes», or a new value to «Origin: autogenerated», perhaps with something parseable appended «, <descriptive-keyword>» or similar. In any case I think I'll add this to my list of things to revisit in the patch tagging guidelines for when I start that discussion. For now I've queued the attached patch. Thanks, Guillem
From a4f63404cd0e6deb8e771bd5ebf9bc52b398e8d5 Mon Sep 17 00:00:00 2001 From: Guillem Jover <guil...@debian.org> Date: Sat, 17 Jun 2023 16:39:56 +0200 Subject: [PATCH] Dpkg::Source::Package::V2: Mark single-debian-patch as not needing forwarding These patches are autogenerated and in general should not be submitted upstream as is, as they are going to be a conglomerate of unrelated changes that need to be submitted upstream in atomic pieces. So applying the patch tagging guidelines in this situation is not very helpful. Closes: #1038121 --- scripts/Dpkg/Source/Package/V2.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm index 4aad9ba8c..1f0946128 100644 --- a/scripts/Dpkg/Source/Package/V2.pm +++ b/scripts/Dpkg/Source/Package/V2.pm @@ -621,11 +621,13 @@ sub _get_patch_header { if ($self->{options}->{single_debian_patch}) { return <<'AUTOGEN_HEADER'; -This is an autogenerated patch header for a single-debian-patch file. The -delta against upstream is either kept as a single patch, or maintained -in some VCS, and exported as a single patch instead of more manageable -atomic patches. +Description: Autogenerated patch header for a single-debian-patch file. + The delta against upstream is either kept as a single patch, or maintained + in some VCS, and exported as a single patch instead of more manageable + atomic patches. +Forwarded: not-needed +--- AUTOGEN_HEADER } -- 2.40.1