Skip to content

Ubuntu patches DEP-3 header related adjustments#653

Open
athos-ribeiro wants to merge 5 commits into
ubuntu:mainfrom
athos-ribeiro:dep3-adjustments
Open

Ubuntu patches DEP-3 header related adjustments#653
athos-ribeiro wants to merge 5 commits into
ubuntu:mainfrom
athos-ribeiro:dep3-adjustments

Conversation

@athos-ribeiro

Copy link
Copy Markdown
Collaborator

Improve the dep3 headers to avoid confusion on its usage. In special, see https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2026-June/019806.html

The "backport" value in the Origin DEP-3 field should be used to inform
that the patch was retrieved from the upstream project and adjusted to
be applied to the current Ubuntu package version.
If dropping the quit headers is indeed desired, it should be proposed in
quilt itself. The reason some Debian Developers do not use that header
is that they do not use quilt to manage their patches.
The DEP-3 Bug-Ubuntu field should always be used when a patch is
addressing an existing launchpad bug. Let's drop this documentation bit
which may suggest otherwise.
The "no" value should be used whenever the patch was "not yet"
forwarded, whereas the "not-needed" value should be used when the change
is vendor specific.

@enr0n enr0n left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. Thanks!

@maxgmr

maxgmr commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

I'm happy with the Rust docs changes.

@cpaelzer

cpaelzer commented Jul 1, 2026

Copy link
Copy Markdown
Collaborator

Good already, could I ask you to
=> fix https://ubuntu.com/project/docs/maintainers/niche-package-maintenance/openjdk/patch-openjdk/ by making the ref to dep-3 a link like in many other places

Could we have a table in https://ubuntu.com/project/docs/how-ubuntu-is-made/concepts/deb-3-patch-file-headers/ about all the combinations we can think of:

column 1 - change in file.c, debian/rules, debian/patches/foo.patch
column 2 - upstream is a project elsewhre
column 3 - upstream is Debian (native package)
Then each cell in column 2 and 3 should list what "Forwarded" (and other fields if necessary) should be set to

Asd anything you can tihnk of, I'm not sure where the following fits:

  • upstream is on github/foo
  • debian has salsa/foo to add packaging
  • Problem and fix is in debian/rules
  • fix is provided via salsa PR
    My problem
  • it is not forwarded (not upstream)
  • it is Bug-Debian (no bug)
  • where would it be referenced?
    Please make sure this is in your table :-)

@rkratky rkratky left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @athos-ribeiro! Just a couple of nitpicks.

In order to fix certain bugs, it's likely you'll need to create your own patch at some point. It's important that this patch contains enough information for other people to understand _what_ it's doing and _why_ it's doing it.

First, ensure that [Debian](https://salsa.debian.org/rust-team/rust/-/tree/debian/experimental?ref_type=heads) has not already created an equivalent patch. If so, you can simply use their patch directly. If you need to modify the patch in any way, make sure to add `Origin: backport, <Debian VCS patch URL>` to the patch header.
First, ensure that neither the upstream project nor [Debian](https://salsa.debian.org/rust-team/rust/-/tree/debian/experimental?ref_type=heads) has already created an equivalent patch. If so, you can simply use their patch directly. In such cases, make sure to include [DEP-3](https://dep-team.pages.debian.net/deps/dep3/) headers when appropriate.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
First, ensure that neither the upstream project nor [Debian](https://salsa.debian.org/rust-team/rust/-/tree/debian/experimental?ref_type=heads) has already created an equivalent patch. If so, you can simply use their patch directly. In such cases, make sure to include [DEP-3](https://dep-team.pages.debian.net/deps/dep3/) headers when appropriate.
First, ensure that neither the upstream project nor [Debian](https://salsa.debian.org/rust-team/rust/-/tree/debian/experimental?ref_type=heads) has already created an equivalent patch. If so, use their patch directly. In such cases, make sure to include [DEP-3](https://dep-team.pages.debian.net/deps/dep3/) headers when appropriate.

useful for vendor-specific patches.
: Information about how the patch was sent to the upstream project in case it
was not originated from there. When present, this should be a URL proving
that the patch was forwarded (e.g., a Pull Request or a patch in a bug

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
that the patch was forwarded (e.g., a Pull Request or a patch in a bug
that the patch was forwarded (e.g., a pull request or a patch in a bug

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants