We're maintaining a forked gnome-settings-daemon since we want to add a custom wwan plugin. We're basing things on top of the Debian package and have our modifications as patch files in debian/patches.
debian/sid: Debian packaging
upstream/latest: latest upstream tarball
pristine-tar: binary delta to create a bit identical tarball (all 3 initially created via gbp import-orig)
master: GNOME's master
librem5: our modifications on top of GNOMEs master
While this is a single repo the upstream git history is disconnected from the Debian packaging history and the pristine-tar branches, so the repo has three root nodes. We could link packaging history and upstream history together using
- Close to what Debian does
- Upstream tarball is identical to upstream's released tarball
- Upstream git history and packaging history in a single repo
- Patches can be rebased
- Maintaining patches is a bit cumbersome since these need to be converted first (e.g. using
- Many branches, confusing for newcomers
For future versions we should better base our packaging on top of Debian's GNOME git. The layout is the same, it's just that we share the packaging load better.
For another packaging layout using fewer branches see wlroots.