MDEV-38371: Deb: Format files with debputy reformat --style black
#4481
+1,078
−958
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gkodinov
added
the
External Contribution
gkodinov
changed the title
debputy reformat --style blackdebputy reformat --style black
grooverdan
approved these changes
Dec 22, 2025
This formats and sorts the files the same way they are in the official Debian packaging, making it easier to compare the files in Debian vs upstream using commands such as `git difftool --dir-diff main -- debian`. Comparing the contents at least once a year is important in ensuring all packaging improvements get their way into both Debian official and upstream Debian packaging. See https://salsa.debian.org/mariadb-team/mariadb-server/-/tree/debian/latest/debian The formatting done by `debputy reformat --style black` is basically the same as running `wrap-and-sort -vast`. There are no functional changes, this is a pure formatting change. This is intentionally done on the `main` branch in MariaDB. The stable release branches are unlikely to ever get any changes in the `debian/control` file, and thus formatting or maintaining it is irrelevant. The merges from stable releases to latest `main` should not bring any `debian/control` file changes, as adding or removing dependencies, changing Debian compat levels or other changes are invasive and shouldn't be done in stable releases at all.
ottok
force-pushed
the
format-upstream-debian-files
branch
from
6e867b2 to
01ea344
Compare
Contributor
Author
|
Rebased on latest 'main'. |
Member
|
Thanks for the rebase Otto. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description (=git commit message body)
This formats and sorts the files the same way they are in the official Debian packaging, making it easier to compare the files in Debian vs upstream using commands such as
git difftool --dir-diff main -- debian. Comparing the contents at least once a year is important in ensuring all packaging improvements get their way into both Debian official and upstream Debian packaging.See https://salsa.debian.org/mariadb-team/mariadb-server/-/tree/debian/latest/debian
The formatting done by
debputy reformat --style blackis basically the same as runningwrap-and-sort -vast.There are no functional changes, this is a pure formatting change.
This is intentionally done on the
mainbranch in MariaDB. The stable release branches are unlikely to ever get any changes in thedebian/controlfile, and thus formatting or maintaining it is irrelevant. The merges from stable releases to latestmainshould not bring anydebian/controlfile changes, as adding or removing dependencies, changing Debian compat levels or other changes are invasive and shouldn't be done in stable releases at all.Release Notes
Not applicable.
How can this PR be tested?
There should be no functional changes. This is formatting only.
Basing the PR against the correct MariaDB version
mainbranch.PR quality check