|Deletions are marked like this.||Additions are marked like this.|
|Line 153:||Line 153:|
|* Add Launchpad package bugs to Debian developer's package overview|| * Handling of '''Ubuntu-specific patches''':
* Improve changelogs entry to better describe changes (seb128 said he will push the desktop policy)
* sometimes a link to $wiki_page which explains why ubuntu is changing this.
* link explanation in changelog to specific changes (or patches).
* File Debian release goals when applicable (makes NMU a lot easier)
* Improve http://patches.ubuntu.com/ . Code is available under GPLv3 on https://launchpad.net/merge-o-matic and bugs can be filed.
* Handling of '''Ubuntu bugs''' that also apply to Debian:
* Add Launchpad package bugs to Debian developer's package overview (hidden by default, probably)
This document is intended to provide practical information about Ubuntu specifically for Debian developers.
- Ubuntu is proud to be based on Debian.
- Ubuntu developers want to maintain a healthy and collaborative relationship with Debian developers.
- Ubuntu has brought new users and developers to the GNU/Linux community. Some day, those new users might become Free Software developers, advocates or DD's.
How does Ubuntu differ from Debian?
Purpose and Scope
Ubuntu has a narrower focus than Debian in many ways. For example, Ubuntu supports only a subset of the architectures that Debian does, and targets specific users (for example, desktop users and server administrators), while Debian seeks to be more universal.
Ubuntu has its own [http://www.ubuntu.com/community/processes community government structure], in some ways inspired by Debian's but in other ways different. There are different governing bodies, procedures for becoming a developer, upload privileges, and more.
Ubuntu has four [http://ubuntu.com/ubuntu/components components] (like Debian's main, contrib and non-free), distinguished by [http://www.ubuntu.com/ubuntu/licensing licence policy] and support terms. The following table summarizes the differences:
Source packages in Ubuntu components:
main (~2000 packages)
restricted (~5 packages)
Officially supported packages (main and restricted) receive security updates sponsored by Canonical, and more rigorous QA relative to the Ubuntu release cycle. The efforts of the Ubuntu core team are focused there.
The ["MOTU"] team cares for the packages in universe and multiverse (which are comprised mostly of packages from the Debian archive) on a best-effort basis, as there are a large number of packages relative to the resources of the team. Therefore, a vast majority of these packages are used unchanged from Debian, rebuilt in an Ubuntu build environment, and do not receive personal attention from an Ubuntu developer.
Most source packages in all Ubuntu components (about 4 in 5 at the time of this writing) are copied unmodified from Debian, but other sources include [http://www.apt-get.org/ apt-get.org], [http://revu.tauware.de/ REVU], directly from organisations such as Blackdown and WineHQ, software which has been packaged by Ubuntu developers, and packages created specifically for Ubuntu.
In some cases, the same upstream software is packaged separately in Ubuntu and in Debian, though this is to be avoided unless there is a justifiable reason to do so.
Where packages in Debian and Ubuntu have a common heritage, the packages use [:UbuntuDevelopment#UbuntuPackages:version numbers which reflect this].
Unlike Debian, Ubuntu packages usually do not have a designated maintainer. In effect, all packages in Ubuntu are maintained by teams. Packages in Ubuntu main and restricted are maintained by the [https://launchpad.net/~ubuntu-core-dev Ubuntu Core Development Team], while packages in Ubuntu universe and multiverse are maintained by the [https://launchpad.net/~ubuntu-dev Ubuntu Development Team]. If you need to discuss a specific change, try poking the last person who changed the package (see the changelog at [http://changelogs.ubuntu.com/]).
Ubuntu tracks bugs in [http://bugs.ubuntu.com Launchpad]. The Launchpad bug tracker makes it possible to keep track of bugs in multiple contexts, for example, if a bug is fixed upstream but not in Debian, or fixed in Debian but not in Ubuntu. It can also store links to bugs filed upstream and in Debian, and notify Ubuntu developers when their status changes. More information about bug tracking in Launchpad can be found at https://help.launchpad.net/BugTrackingHighlights and the documentation for the email interface is at https://help.launchpad.net/UsingMaloneEmail.
Relationship to Canonical
Ubuntu, like Debian, is a free software project which is open to anyone to participate. However, it differs from Debian in that many key project resources, including servers, bandwidth and a number of core developers, are provided by Canonical. Canonical is a for-profit company which derives revenue primarily from services related to Ubuntu, such as support contracts.
What is MOTU?
With the creation of the universe component, volunteers were needed to look after these packages. A team called The Masters of the Universe (["MOTU"]) was formed for this purpose. MOTUs sync (import without modification) or merge (import with Ubuntu-specific changes) packages from Debian. MOTUs also sometimes construct Debian-format source packages for use in Ubuntu universe directly from upstream sources. MOTUs handle bugs reported on software inside universe and multiverse.
See also: [http://www.ubuntu.com/ubuntu/components ubuntu/components] and ["MOTU"].
The process to join the ["MOTU"] team is explained over [:MOTU/Hopeful/Recruitment:here]. As a Debian developer you won't have much trouble with the technical side of packaging, so the process will be a bit quicker. When applying for becoming a MOTU, two criteria are evaluated: technical skills and teamplay + knowledge of Ubuntu processes.
Why does Ubuntu need to change my packages? What kind of changes are made?
There are many reasons why packages in Ubuntu diverge from Debian, including:
- Policy differences between Debian and Ubuntu (for example, dependencies, build-time options, etc.)
- Bug fixes
- Development of new features
- Transitions: Ubuntu routinely carries out packaging transitions ahead of Debian, in collaboration with Debian representatives where a consistent policy is needed
- Modular X.org
- Library SONAME changes
- Newer upstream versions: Ubuntu packages new upstream releases before Debian in some cases
- Toolchain (GCC et al)
What can I do if I feel that an Ubuntu developer or member is behaving inappropriately?
Technical issues should be raised with the [mailto:firstname.lastname@example.org Ubuntu Technical Board]. Non-technical issues should be raised with the [mailto:email@example.com Ubuntu Community Council]. Information about both bodies may be found on the [http://www.ubuntu.com/community/processes/governance governance page].
How does Ubuntu cooperate with Debian?
For many packages in main, Ubuntu has good working relationships with the Debian maintainer(s) and is involved with the core Debian development. Many volunteer developers are active in both Debian and Ubuntu camps.
Some resources can be found at the end of this page.
How can I obtain patches from Ubuntu?
Patches for Ubuntu packages are generated regularly and forwarded to the [http://packages.qa.debian.org Debian Package Tracking System] (derivatives keyword) and the [http://lists.ubuntu.com/mailman/listinfo/ubuntu-patches ubuntu-patches mailing list]. By using these resources, you can receive timely notification of incremental patches to your Debian packages, or to all packages in Ubuntu.
The complete delta between Debian and Ubuntu for a given package is published in Ubuntu's [http://patches.ubuntu.com Debian patches repository]
Sometimes, patches are manually placed in a [http://patches.ubuntu.com/patches/ patch archive]
- In the future, Ubuntu plans to maintain this delta using distributed revision control tools, providing a convenient way to review and merge changes
You can make use of the [http://www.debian.org/doc/manuals/developers-reference/ch-resources.en.html#s-pkg-tracking-system PTS] and use the derivatives keyword.
Bugs tagged with origin-ubuntu or ubuntu-patch, cf. ["Bugs/Debian/Usertagging"]:
Why aren't *all* patches submitted to the Debian BTS?
Doesn't scale: Ubuntu developers regularly make changes across a range of packages in the distribution, including transitions which touch hundreds of packages. Individually filing these patches can take more time than the work itself.
Differences of opinion: Debian developers have different preferences about how they wish to receive patches, and some object to receiving them at all. By providing subscription mechanisms, Ubuntu allows Debian developers to express their preferences and have them respected automatically.
Difficult to track: A great deal of bookkeeping is required in order to keep track of which patches have been merged into Debian, either modified or unmodified. Our long-term strategy is to apply proper revision control tools to this problem, but in the meantime, the bug tracker has too much overhead.
How can I minimize the Ubuntu delta for my packages?
- In some cases it currently works very well to have the Debian and Ubuntu developers comaintain the package. By using a common source code repository, Ubuntu developers can apply general bug fixes directly to the Debian branch and then just merge the fix into the Ubuntu branch. For obvious reasons this can only work for a very small number of packages/maintainers.
Packages which originate in Ubuntu are generally maintained in the [http://bazaar-vcs.org/ Bazaar] revision control system. Debian developers who modify these packages in Debian are encouraged to use a Bazaar branch for this work in order to make it easy to merge in both directions with Ubuntu.
Avoid assuming that the name of the operating system in use is Debian. A substantial amount of work was done in Ubuntu to simplify the use of debian-installer in derivatives (which naturally don't want to claim that they're Debian during the installation), which has now been merged into Debian. This work can provide an example of how to accomplish this.
Why does Ubuntu have an older/buggy version of my package?
Because Ubuntu has a different release cycle than Debian, freezes occur at different times. Near the beginning of an Ubuntu release cycle, packages from Debian unstable are automatically copied to Ubuntu on a regular basis, but later, this is only done if the package is explicitly copied by an Ubuntu developer after being reviewed for compliance with the current freeze guidelines. Under some circumstances, the approval of a third party is required.
An outline of a normal Ubuntu release schedule can be found on ReleaseScheduleTemplate.
ContributingToDebian : Wiki page explaining to MOTU and MOTU Hopefuls how to help Debian benefit from their work.
[http://wiki.debian.org/Utnubu Utnubu] : Debian team aiming at collaboration between Ubuntu and Debian
[http://wiki.debian.org/CollaborativeMaintenance Collaborative Maintenance] : Raphael Hertzog's proposal about collaboration between Ubuntu and Debian
[http://mako.cc/writing/to_fork_or_not_to_fork.html To Fork or Not To Fork : Lessons From Ubuntu and Debian] : article by Benjamin Mako Hill about the Ubuntu development model.
- ["Bugs/Debian"] : Coordinating bug fixes with Debian
DebianPatchFeeding : Spec about feeding Ubuntu patches to Debian. Unfinished work.
[https://launchpad.net/distros/ubuntu/+spec/motu-debian Universe, MOTU, Debian] : spec written by ajmitch. Unfinished work.
Work in progress (please help) :
DebianDemystification : Explaining the inner workings of Debian to Ubuntu developers
If you have questions about the material on this page, or have an issue regarding collaboration between Debian and Ubuntu, please contact firstname.lastname@example.org.
Content which should be added to this page:
- Syncs and merges, when and how they happen
- Link to more about Launchpad?
- Patch tagging
- Separate out FAQ from other content?
Ideas which require further discussion or development:
Handling of Ubuntu-specific patches:
- Improve changelogs entry to better describe changes (seb128 said he will push the desktop policy)
- sometimes a link to $wiki_page which explains why ubuntu is changing this.
- link explanation in changelog to specific changes (or patches).
- File Debian release goals when applicable (makes NMU a lot easier)
- Improve changelogs entry to better describe changes (seb128 said he will push the desktop policy)
Handling of Ubuntu bugs that also apply to Debian:
- Add Launchpad package bugs to Debian developer's package overview (hidden by default, probably)
Ubuntu benefits from a strong Debian, and Debian benefits from a strong Ubuntu. - MarkShuttleworth
Every Debian developer is also an Ubuntu developer, because one way to contribute to Ubuntu is to contribute to Debian. - MarkShuttleworth
We incorporate Debian changes regularly, because that introduces the latest work, the latest upstream code, and the newest packaging efforts from a huge and competent open source community. Without Debian, Ubuntu would not be possible. - MarkShuttleworth