[pkg-apparmor] Bug#888244: apparmor: Convert quilt patch series to per-topic subdirectories managed by gbp-pq
Steve Beattie
sbeattie at ubuntu.com
Wed Feb 28 09:55:50 UTC 2018
On Sun, Feb 25, 2018 at 03:13:21PM +0100, intrigeri wrote:
> Hi maintainers of src:apparmor in Ubuntu,
>
> [keeping Simon in Cc because I suspect he's interested in this topic
> for Apertis — whose fork of Ubuntu's src:apparmor is already
> maintained in Git.]
>
> intrigeri wrote (2018-01-29):
> > [explicitly Cc'ing the Ubuntu maintainers; if you missed the beginning
> > of this thread, for context see https://bugs.debian.org/888244]
>
> > I've prepared 2 PoC branches, both hosted in the Git repository on
> > Salsa where the Debian packaging now lives, and that would happily
> > welcome the Ubuntu packaging as well:
>
> > - debian/gbp-pq:
> > https://salsa.debian.org/apparmor-team/apparmor/tree/debian/gbp-pq/debian/patches
>
> > … that I'd like to merge into debian/master, ideally once we reach an
> > agreement with the Ubuntu maintainers.
>
> > - ubuntu/gbp-pq:
> > https://salsa.debian.org/apparmor-team/apparmor/tree/ubuntu/gbp-pq/debian/patches
>
> > … that I'd like to merge into ubuntu/master if the Ubuntu
> > maintainers are happy with it. I've done my best to preserve the
> > current Ubuntu delta on that branch but you should double-check
> > before uploading :)
>
> > Thoughts?
>
> Ping? I'd like to merge this in Debian soon but one of the main goal
> is to ease Debian/Ubuntu/derivatives' maintainers job; if this does
> not get buy in from you folks and you don't want to do this change in
> Ubuntu, doing this on Debian would actually be counter-productive.
>
> Is there anything I can do to ensure we do this switch in
> a coordinated way and in time for Ubuntu 18.04 LTS?
Sorry, I've been swamped coping with Meltdown/Spectre. I took a brief
look at the topic git branches and it seems like a modest enough
organizational improvement to me[1]. What would need to happen on the
Ubuntu side to go forward?
[1] At the end of the day, it's still quilt patches checked into a VCS.
But I'm not aware of any VCS that's good at keeping a patch series
or even multiple topic branches that aren't accepted (yet) upstream,
especially if you want to track the history of how individual
patches developed over time.
--
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-apparmor-team/attachments/20180228/7e6a7e8a/attachment.sig>
More information about the pkg-apparmor-team
mailing list