[apparmor] Moving Debian/Ubuntu packaging to Git

[Tyler Hicks]

On 11/05/2017 05:55 AM, intrigeri wrote:
> Hi!
> 
> So far the Debian packaging lives in bzr and I regularly merge from
> the apparmor-ubuntu-citrain branch. I want to move it to Git ASAP.

+1

> 
> Does Ubuntu have a plan wrt. packaging src:apparmor in Git?

Not at this time.

> If not, I will set something up.
> 
> My preferred workflow is:
> 
>  - use git-buildpackage + pristine-tar

I have only a small amount of gbp + pristine-tar experience with two
packages so I've got some questions below.

> 
>  - always pass --upstream-vcs-tag to `gbp import-orig', so that the
>    upstream Git history is merged when importing the new release
>    tarball

When you say that the upstream git history is merged, do you mean that
it is squashed into a single commit with a message like "Import v2.12
from upstream"?

> 
>  - use `gbp pq' to manage the quilt patch series (but this is left to
>    personal preferences as the patch-queue branch is never pushed, and
>    debian/patches/ remains the common format used for sharing/storing
>    the patch series in Git)

I need to read some more about `gbp pq`. This is the first time I've
heard of it.

> 
> This is the workflow we're using on the Debian Perl team to maintain
> 3k+ packages. I've also been using it on a number of other Debian
> packaging teams. It's not perfect but I've found it works better than
> anything else I've tried. But I will consider using another workflow
> if you folks prefer something else.

Can you point us to the packaging git tree of a package that you are
particularly happy with?

> Additionally, when maintaining packages for more than 1 distro at
> a time, I've had good experience with the
> http://dep.debian.net/deps/dep14/ branch & tag naming conventions.
> It would allow us to share a single packaging Git repo between Debian,
> Ubuntu, and other derivatives, if we want to.
> 
> Thoughts?

I think we'd benefit from documentation on how many basic tasks should
be carried out (importing a new patch, importing a new upstream release,
etc.). Like git, gbp feels like a low level utility that everyone uses
differently and the general documentation doesn't explain the nuances.

> Wrt. the actual repository conversion:
> 
>  - I expect some trade-offs will be needed wrt. preserving history:
>    AFAICT you folks have been merging *by hand* my work into the
>    apparmor-ubuntu-citrain branch, so bzr is not aware of it, i.e.
>    my commits don't appear anywhere in your branch. But I've been
>    merging your branch into mine with bzr, so your commits do appear
>    in my branch and the merges are encoded as such. In other words, my
>    the history of my branch is a superset of yours.
>    So I think I'll convert my own Vcs-Bzr to Git.

That sounds reasonable.

Tyler

>  - Suggestions and hints welcome as I've never done bzr→Git
>    conversions. Steve, could you please share your scripts or notes?
> 
> Cheers,
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20171106/f02f66d3/attachment.sig>