[Pkg-opennebula-devel] Packaging opennebula 3.6 in parallel with git-buildpackage

[Guido Günther]

On Mon, Jul 30, 2012 at 04:30:18PM +0200, Martin Steigerwald wrote:
> Hi!
> 
> After adding that dependency for opennebula-sunstone and doing some other 
> minor changes, I created a new experimental branch for packaging OpenNebula 
> 3.6.
> 
> But now I am stuck:
> 
> git-import-orig -u3.6.0 --filter "*.jar" --filter-pristine-tar --pristine-tar 
> ../opennebula-3.6.0.tar.gz
> 
> is obviously not what I want.
> 
> Since it changes master/pristine-tar/upstream branches.
> 
> I can switch upstream and master branches to something else by the --upstream-
> branch and --debian-branch options, but I am not yet sure whether this is a 
> nicely working approach to take.
> 
> If I add this different branch settings to the gbp configuration file
> 
> ms at mango:~/lokal/Debian/OpenNebula/opennebula> cat debian/gbp.conf 
> [DEFAULT]
> # use pristine-tar:
> pristine-tar = True
> 
> in the experimental branch, git-buildpackage should theoretically work with 
> that branches only.
> 
> Then at some point in time it would be needed to merge back experimental and 
> say upstream-3.6 branches into master and upstream.
>
> Would that be an approach that makes sense to you?

I usually set up things like:

upstream/wheezy
upstream/sid
upstream/experimental

debian/wheezy
debian/sid
debian/experimental

Where each upstream branch corresponds with a Debian packaging branch.

So you can package for different releases. In this case this would be:

git-buildpackage --git-debian-branch=debian/experimental --git-upstream-branch=upstream/experimental

In order to avoid branch renaming I'd use:

debian/experimental -> experimental
upstream/experimental -> upstream-experimental

instead for now. I'd do this by starting with:

git branch experimental master
git branch upstream-experimental upstream

and then put the branch names into debian/gbp.conf. 

> I am not sure whether a different pristine-tar branch is needed. Maybe not, 
> cause git-import-orig has option for setting it.

You can use the same pristine-tar branch since pristine-tar picks up
things by commit name.

Hope this helps.
Cheers,
 -- Guido

> I see no mention of maintaining mutiple versions in parallel with git-
> buildpackage, thus I'd thought I better ask here first before creating havoc 
> ;).
> 
> I think I forward this to the git-buildpackage maintainer as well to get some 
> hints.
> 
> Ciao,
> -- 
> Martin Steigerwald - teamix GmbH - http://www.teamix.de
> gpg: 19E3 8D42 896F D004 08AC A0CA 1E10 C593 0399 AE90
> 
> _______________________________________________
> Pkg-opennebula-devel mailing list
> Pkg-opennebula-devel at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-opennebula-devel
>