Conversation
|
Also, sorry for the 3,000 lines addition! I did not think it reasonable to split it into multiple PRs as of the reference dependencies between chapters and sections. |
|
@mwhudson, @basak, @seb128, please, have a look at this addition. The PR introduces the Ubuntu Policy to this docs set as agreed upon in #devel:ubuntu.com. @BAMF0 has done an awesome job of separating the Ubuntu delta from the last published version of the Policy and then structuring it into an easily navigable document with links to the Debian Policy where the content is the same. (Not to mention the conversion from XML/HTML.) I believe this will allow for a much easier maintenance and updates (and it will make the Policy actually available outside of the Provided you're OK with the way this looks (preview build), let me know how restricted you'd like future modifications of this content. Should the Technical Board be the owner? |
|
Ack. The approach here seems reasonable to me, but it will take a long time to review! |
|
@BAMF0, it just occurred to me that this should link to https://documentation.ubuntu.com/project/how-ubuntu-is-made/concepts/debian-policy/ (and vice versa). |
mwhudson
left a comment
There was a problem hiding this comment.
This is mostly a collection of thoughts and side comments than a review, I'll try to work our way through the more substantive bits eventually! Thanks so much for starting this!
| The Ubuntu branch of this manual is maintained by the `ubuntu-devel mailing | ||
| list <mailto:ubuntu-devel@lists.ubuntu.com>`_. In 2026 Simon Johnsson reduced |
There was a problem hiding this comment.
I don't know if this is 100% the right thing to say, either in the sense of it being true in practice or if we want it to be true in practice. OTOH I'm not sure I know who to put here instead! Ideally we'd have an "ubuntu policy" group but I guess the fallback is the techboard. Maybe I can ask the TB about this this week.
| - If the package is in ``main`` or ``restricted``, the ``Maintainer`` field | ||
| should be set to Ubuntu Core Developers | ||
| mailto:ubuntu-devel-discuss@lists.ubuntu.com. | ||
|
|
||
| - If the package is in ``universe`` or ``multiverse``, the ``Maintainer`` | ||
| field should be set to Ubuntu MOTU Developers | ||
| mailto:ubuntu-motu@lists.ubuntu.com. |
There was a problem hiding this comment.
This is all news to me :-)
There was a problem hiding this comment.
The proper solution would be to use update-maintainer from ubuntu-dev-tools which handles all this anyways. This is also, I believe, not necessarily actual policy. We should evaluate what ubuntu-dev-tools and update-maintainer scripts do before accepting this part.
There was a problem hiding this comment.
| mailing`` list first, as explained below. | ||
|
|
||
| When in doubt about a copyright, send mail to | ||
| mailto:ubuntu-archive@lists.ubuntu.com. Be prepared to provide us with the |
There was a problem hiding this comment.
til this mailing list exists
| applications. The important packages are just a bare minimum of | ||
| commonly-expected and necessary tools. | ||
|
|
||
| ``standard`` |
There was a problem hiding this comment.
I don't think priority standard/optional/extra makes any real difference in Ubuntu
| ``standard`` | ||
| These packages provide a reasonably small but not too limited | ||
| character-mode system. This is what will be installed by default if the | ||
| user doesn't select anything else. It doesn't include many large |
There was a problem hiding this comment.
Certainly this language is not relevant to Ubuntu
| (*Modifies*: `Debian Policy Manual, Section 4.10 | ||
| <https://www.debian.org/doc/debian-policy/ch-source.html#variable-substitutions-debian-substvars>`_) |
There was a problem hiding this comment.
I don't see how this is different from Debian...
There was a problem hiding this comment.
Ah yes you are right, the difference was that the Debian article contained extra information, but now in hindsight they say exactly the same thing.
|
|
||
| This is an optional, recommended control file for the :pkg:`uscan` utility | ||
| which defines how to automatically scan ftp or http sites for newly available | ||
| updates of the package. This is used by http://dehs.alioth.debian.org/ and |
There was a problem hiding this comment.
I'm sure that URL isn't right :-)
There was a problem hiding this comment.
It's not, it should probably be removed if there's no equivalent for Ubuntu.
|
|
||
| The Ubuntu distribution differs from its parent Debian distribution in a | ||
| number of significant ways. In this document, these are marked with the tag | ||
| *Ubuntu*:. |
There was a problem hiding this comment.
In general for the sections that modify the Debian policy section it would be great to indicate how
There was a problem hiding this comment.
That's a good point. For now, I think that most sections that are described as modifying Debian are really out-of-sync rather than the "modification" being an intentional change. Having the modifications as a bulleted list of some kind might be a good idea?
There was a problem hiding this comment.
I suspect yes most differences are just us being behind. Maybe we can make the sections like this somehow and try to work our way through deciding whether we want to just take the updates? (which I suspect we will, mostly)
| List of the names and email addresses of co-maintainers of the package, if any. | ||
| If the package has other maintainers beside the one named in the | ||
| :ref:`Maintainer field <ubuntu-policy-maintainer-field>`, their names and email | ||
| addresses should be listed here. The format is the same as that of the | ||
| Maintainer tag, and multiple entries should be comma separated. Currently, this | ||
| field is restricted to a single line of data. This is an optional field. | ||
|
|
||
| Any parser that interprets the Uploaders field in :file:`debian/control` must | ||
| permit it to span multiple lines. Line breaks in an Uploaders field that spans | ||
| multiple lines are not significant and the semantics of the field are the same | ||
| as if the line breaks had not been present. |
There was a problem hiding this comment.
Somewhere we should talk about how all packages in Ubuntu are team maintained I guess.
| Ubuntu: The string "ubuntu" in a version number instructs the archive | ||
| management software not to copy newer versions of the package from Debian | ||
| automatically. It should therefore be used when modifying packages relative to | ||
| Debian, taking care that the Ubuntu version number compares less than the next | ||
| expected version in Debian. For example, the first Ubuntu modification of | ||
| version ``1.0-1`` in Debian would be ``1.0-1ubuntu1``. |
There was a problem hiding this comment.
Ah OK we can ignore one of my previous comments then :-)
|
@mwhudson, thanks for looking through it. I'd like to suggest that the review for this PR be limited to the publishing approach and related aspects (such as the manner of cross-linking the Debian Policy). All other content concerns can (and should, I believe) be dealt with after this PR is merged. Two reasons:
cc @basak |
|
I think the only change I would like to see before merging is some kind of annotation as to when a section that diverges from debian is simply where debian has changed and we have not followed or where there is some kind of ubuntu delta. Is that possible to achieve without too much tedium? |
@mwhudson, I'd like to push back against that request (on Simon's behalf ;-)) This would go significantly beyond the scope of this task (which was to get the Ubuntu Policy -- in its current state -- from the forgotten I realize quite a lot more effort will need to go into the Ubuntu Policy in the future to make it usable and on par with the Debian counterpart again. But that really should be dealt with in subsequent PRs. My suggestion would be to file a new issue describing (potential) next steps. As it is, the work that Simon has done already constitutes a huge improvement over the current state of affairs, so I think it would be fair to merge it. |
|
FYI as a member of the TB I think parts of this need revised before we can even approach 'merge approval' state. Things in the policy are not accurate or need updated (and have had no movement on the comments for > 2 weeks). |
|
At the TB meeting today we agreed to spend some time looking at this over the next week or so -- we don't want to leave you and Simon hanging forever. But also this is an area where care is required! |
That sounds reasonable! Given the scale, I have waited with addressing comments until we have a notion of what is essential for an initial publishing. As Robert pointed out, I think it would be a good idea to consider how we can split this up more easily. Some parts might need rewriting for example, and introducing rewrites in this PR may not give them the proper attention for review. |
@teward, I'm not disputing the need to update the content. My point in suggesting to merge now is that the Policy has -- officially -- been out there and in this outdated state for over 12 years. So, merging this PR wouldn't be a step back in that regard. But it would allow subsequent work on it to be done with the relative comfort of Git(Hub).
Yes, my proposal would be to address those comments in follow up PRs that the TB could own. Given that we (Simon, myself) do not know what and how should be modified, nor do we have the authority to do so, it leads to this rather inefficient process where TB members would leave comments basically saying "edit this, edit that".
@mwhudson, thank you. My concern is that while the actual content of the Policy is being dealt with in this PR, the onus is on Simon to make modifications. Correcting the Policy content and bringing it up-to-date is not what Simon signed up for ;) Once this is merged, the CODEOWNERS would be modified to make the TB the sole owners of the content, which would allow you to work on getting the content into a desired state without having to go through an intermediary. |
|
Hey @BAMF0, thanks again for the work you have put into these changes, and sorry for the delay in reviewing them. We discussed this PR during the TB meeting earlier this week (you can find the details of the conversation in the log). The situation is currently blocked because the changes are complex to review, and everyone's bandwidth is limited right now. We feel it is going to be difficult to make progress on what is currently proposed, so we would like to suggest an alternative approach to help move things forward. Our proposal is to:
This approach should give us reviewable units and allow for easier iteration. Additionally, we would like to propose that the Ubuntu Policy not try to copy the Debian sections. Instead, it should take a form similar to: Let me know what you think. I'm also happy to have a meeting to discuss the proposal if you'd prefer to discuss this on a call. |
|
Thanks for the response @seb128! No worries for the delay, with the coming release and all there are definitely other priorities on the table. I read through the TB meeting log and think I understand the rationale behind your proposal. You are of course the owners and have final say, but I do not really think this is the best way to go about it. I considered the approach suggested at first, however by comparing it to the Debian Policy version it is based on, we do not reflect on what has changed since it's publication. What if there is new delta for instance? Would only listing the old differences encourage this line of thought? One key detail to point out with this PR is that it, by itself, does not introduce any intentional changes to the Ubuntu Policy. The changes are instead indirect as a dependency on the current Debian Policy, and are in that case not contained within this document. Furthermore it is worth considering that the article's current appearance is in no way to be considered final, it is rather an initial draft for aiding reiteration. Copying Debian sections for instance, is done with the intention of rethinking whether there is something that Ubuntu should differ from in those subject areas. I absolutely agree that we should not duplicate these in this manner for a more "official" publication. I would instead propose that this PR is included as a draft, and we could in that case remove links to it until it is deemed ready. You know more of course, but the workflow I would suggest is to:
In other words, this workflow should be with the aim to review what we currently say, what we want to say, and strip away what is unnecessary to keep. I would be happy to discuss this over a call as well! I think that would be a bit easier probably. |
|
I'm just going to reply to that specific point for now
Comparing to the policy version it's currently based on would only to split and document the delta we had at the time. You can see it as a standard merge with Debian/rebase exercise. The first step is document our changes, then next one is to rebase which is the time where was ask the question of whether the change "still apply / needs to be reworked / can be dropped". Or said different, each of those commits would lead to a PR which we would review in the lens of "let's look at what the current Debian policy says about the topic and evaluate if that delta still makes sense" |
Edit: Reread, scrap my assumption about the Yes exactly, I definitely agree! I think this is a first good step. A point I am not entirely understanding is: what is preventing a similar process for the contents of this PR? Perhaps it is rather where we want the "ground truth" for the policy to be? I am certain we would be able to derive and document the specific changes we had at the time in addition to this PR in order to aid in revising the policy. If only the old Ubuntu specific modifications are considered, wouldn't the task of finding new delta be even more insurmountable using that approach? |
|
@seb128 Thanks for the context and details (as well as sharing the conversation log). I believe both @BAMF0 and I now understand better your concerns. As a preface, I'd like to clarify that we're not trying to sidestep the review process with this PR. The intention was to pull the content, as is, from the package, provide all the scaffolding needed for proper review/updates in the future (refs to Debian Policy etc.), and then leave it to the TB to do as it would. To sum it up, from the log of the meeting, I gather there seem to be two main problems with this PR:
As for the first, I think we could do what you've discussed in the meeting: there's a "staging" area in the repo where we've been dumping things that went through initial conversion/migration but still needed work. The content in the staging area can be selectively published on the website (still outside of the main navig. structure), or it can stay hidden -- i.e. sit on I think this could be a good solution. As for the second concern, I'm afraid we can't really address that without closing this and doing what @basak suggested, i.e. either creating a conversion script for you to review (instead of having to review the whole thing), or iterating slowly over small PRs. Still, I'd like to highlight that Simon approached the work on this with exemplary diligence, so -- unless we'd be talking about intentional corruption of the content -- I'd say the chance of there being unaccounted changes is minimal. Bottom line: the decision is yours to make, but I honestly don't think it would be fair to ask Simon or anyone else to do the PR-by-PR thing. If that's the way the TB would like to proceed, I'd propose just closing this PR and leaving it to the TB to deal with on their own (on a schedule that fits your expectation and requirements/capacity). But I think it would be a pity to ditch the work Simon has done so far (though I understand the concerns raised). Would the TB consider the "staging" area approach? (One last thing: While I tried to explain why we were "neglecting" the comments on the specific details of the contents, I understand it may have looked as if we were just ignoring it. Would it make the "staging" approach acceptable if Simon and I addressed the specific comments left by @mwhudson and @teward first (with their input)? I realize that won't fix the Policy, but at least it could remove the problems that were deemed to be most glaring.) |
Description
This pull request will add the Ubuntu Policy Manual to the Ubuntu project docs in the form of the delta between the current Debian Policy Manual.
Important changes to the published Ubuntu Policy Manual:
Chapter/Section/Appendix<link>"project).
Related issue
Checklist
Additional notes (optional)
Footnotes still use their original absolute numbering as in the Ubuntu Policy Manual package, i.e. new chapters will start counting from the previous footnote within the reStructuredText file. This is to more easily cross-reference footnotes from the original.
Some sections labeled "Modifies" may seem obviously outdated and are to be considered unnecessary delta. These should be thought of as a motivation for re-review if it actually warrants a delta, otherwise these can trivially be considered shared with Debian.