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

[Steve Beattie]

Hey intrigeri,

On Fri, Aug 14, 2015 at 12:48:42AM +0200, intrigeri wrote:
> I wanted to reconcile our histories
[bzr tale of woe elided]

Yes, unfortunately bzr doesn't handle merges across trees without common
ancestors very well. And unfortunately, when the citrain branch was
started, it didn't base off of the bzr package branch.

> As a result, our Vcs-Bzr history in Debian now contains Ubuntu's,
> woohoo :)

Woot!

> (especially with Git support landing into Launchpad, hint, hint ;)

It's more than git has landed, but that bzr is going to be deprecated.
And yes, I'm overdue on an announcement about git and apparmor, but the
plan is to move everything (upstream apparmor, the profiles repo, and
the packaging branches) to git. I wish I could be at debconf, because it
would be a natural place to discuss it.

> Time to look at the remaining changes we've introduced, and make the
> delta smaller?

I think there's 3 extra patches in the debian package. The iceweasel
patch can be dropped, as the paths were incorporated directly via
regexs. I still need to look at the LD_FLAGS patch to see if it's needed
upstream, I think it should go, but need to verify it. The third patch
to make things build on kfreebsd, I've waffled about taking upstream.
I'll look at your branch again to see what else can be eliminated.

Thanks. Have fun at debconf!
-- 
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/20150814/61483fd3/attachment.sig>