[Pkg-giraffe-maintainers] Mailing lists created - branch layout in giraffe.git Re: Upstreaming patches Re: zarafa in Debian

[Guido Günther]

Hi Christian,

I've added the mailing list to the recipients but did not drop the other
recipients yet since not everybody might be subscribed yet.

On Thu, Nov 10, 2011 at 01:53:00PM +0100, Christian Leutloff wrote:
[..snip..] 

> This leads to these (my) action items:
> 
> 1) remove existing giraffe.git and create empty new one
>    (these on git.debian.org, the other commands on my PC:
>     rm giraffe.git && git init giraffe.git)

Could you: 

	rm -rf /git/pkg-giraffe/giraffe_remove/

on git.debian.org please. The directory belongs to you.

> 2) create branch upstream/7.0 in giraffe.git and clone from
> https://git.zarafa.com/zcp/zcp/commits/7.0
>    (git clone https://git.zarafa.com/zcp/zcp/commits/7.0 upstream/7.0)

[..snip..] 

I've created a branch based on the above git repo and added:

	upstream/sid
	dfsg-clean/sid
	debian/sid

I picked /sid instead of /0.7 since we want to indicate in the branch
for what version of Debian we're packaging (later we might need things
loke debian/wheeze for stable point releases, etc. or ubuntu/whatever),
the version of zaraffa we're trackingn will be visible from the tags.

> 1) Will the tar file automatically generated from the upstream branch
> or dfsg-clean branch?

Yes and in fact I did with:

	git-buildpackage --git-no-pristine-tar

I have also renamed the _source_ package to giraffe in debian/control so
the tools look for and generate the correct tarball. To ease our start I
have also committed a snapshot changelog entry (check the SNAPSHOT line
and version number in the changelog). So to create the release
we can just call:

	git-dch -R -a

and git-dch will pick up the changes. We don't need to commit the
changelog (except at release time) in the future but this will make it
easier to get this bootstrapped. To recreate the tarball you can just
run
	git-buildpackage --git-pristine-tar

(or make pristine-tar your default via gbp.conf).


> 2) Is there an example available for another project where the used
> git commands are shown that leads to the desired structure? Or is git
> - --help enough?

You might want to check the git-buildpackage manual
(/usr/share/doc/git-buildpackage).

> The other project organizational action item would be to remove
> pkg-giraffe.git from alioth and add giraffe.git and to d-push.git to
> the scm page (or a least to a project web page). The alioth related
> part will be performed by Guido?
See above. I've worked around pkg-giraffe by touching an empty file.

I've changed the maintainer to pkg-giraffe at lists.alioth.debian.org and
moved Jobn to Uploaders. This is just to make sure that any upload
related emails go to the list instead of an individual person. I hope
you don't mind John!
Cheers,
 -- Guido