[pkg-apparmor] Ubuntu/Debian apparmor package maintenance in bzr

[Steve Beattie]

Hi!
On Thu, Apr 30, 2015 at 11:32:52AM +0200, intrigeri wrote:
> [disclaimer: I'm a bzr newbie.]
> 
> when packaging new AppArmor userspace releases for Debian, I generally
> merge Ubuntu's packaging branch in bzr, in order to keep our delta as
> small as possible. I'm now looking into packaging 2.9.2. I'm happy
> that 2.9.1-0ubuntu4 contains "Partial sync with debian apparmor
> package" -- thanks, this will make my job easier :)

Sure, the work you're doing is appreciated.

> Now, there are a few things I don't quite understand and need help
> with:
> 
> 1. Many of the commits in your bzr packaging VCS are done by "Package
>    Import Robot", and I can't find where the corresponding set of
>    atomic commits are. Could anyone please enlighten me?
> 
> 2. You've imported some of the packaging improvements we've done in
>    Debian, which is good. But as far as I can see, this is not
>    apparent at the bzr level: I can't find traces of my atomic commits
>    in your bzr history. Assuming I didn't miss anything: could this
>    workflow be changed, so that I can more easily check what you add
>    on top of Debian's packaging, and what Debian's packaging adds on
>    top of yours? (Ideally, I'd love to be able to do the equivalent of
>    `git log ubuntu/vivid..debian/experimental' and vice-versa.) E.g.
>    when I've merged Ubuntu changes up to 2.8.98-0ubuntu2, I did it
>    with `bzr merge', so if you look at r1526 on the
>    https://alioth.debian.org/scm/loggerhead/collab-maint/apparmor-experimental
>    branch, you'll see that this branch's history explicitly embeds
>    your packaging VCS' history. See what I mean?

Yes, in particular, using bzr qlog (from the qbzr package) really
lets one see the distinct branches and paths through them.

Unfortunately, Jamie and I don't use the package importer branch [0]
as a basis for working off of; it's an essentially auto-generated
bzr branch generated from package uploads. People can and do work
from it, but it's a bit awkward because it commits everything with
the debian quilt patches applied, which I find makes quilt easy to
get out of sync with itself. (Since I'm a long time quilt user due
to its VCS agnosticism, I'm quite comfortable knowing that I need to
quilt apply patches after I've grabbed a branch. I recognize that may
not be true of everyone, and the intent behind the package importer
setup was to get things in a state ready for people to add patches,
but IMO it causes more usability problems than it gains.)

Instead, we've been working off of the
lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain branch [1];
unfortunately I wasn't as diligent as I should have been in breaking
out the individual commits that I cherry-picked to bring us closer
together [2], though in later commits where I pulled something from
your branch, I was better about it [3][4], which I intend to do
continuing forward.  (Ideally, we'd get to a point where ubuntu could
just sync from debian.)  I didn't take everything that you had fixed
upstream, as I wasn't able to confirm it was relevant or wouldn't
break something in ubuntu. I'd already updated our branch (but not
uploaded to the ubuntu archive, due to the imminent release of 15.04)
with the 2.9.2 release. I'll merge what I can from your 2.9.2 packages.

Hope this helps clarify things. Sorry it's all a bit of a confusing
mess. Thanks!

[0] https://code.launchpad.net/ubuntu/+source/apparmor
[1] https://code.launchpad.net/~apparmor-dev/apparmor/apparmor-ubuntu-citrain
[2] https://bazaar.launchpad.net/~apparmor-dev/apparmor/apparmor-ubuntu-citrain/revision/1534
[3] http://bazaar.launchpad.net/~apparmor-dev/apparmor/apparmor-ubuntu-citrain/revision/1536
[4] http://bazaar.launchpad.net/~apparmor-dev/apparmor/apparmor-ubuntu-citrain/revision/1537

-- 
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: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-apparmor-team/attachments/20150505/933b769b/attachment.sig>