[Pkg-opennebula-devel] Questions about merging with Ubuntu

[Damien Raude-Morvan]

Hi Jaime,

Le mardi 14 décembre 2010 18:59:20, Jaime Melis a écrit :
> I have a few questions, which I believe are beginner's questions.
> 
> 1) What is the correct way to try this out? I mean, following Debian's
> policy. I've checked out the git repo, and there are three branches:
>  remotes/origin/master
>  remotes/origin/pristine-tar
>  remotes/origin/upstream
> 
> After reading this article: http://wiki.debian.org/PackagingWithGit
> I'm working directly on top of the master branch. Is that correct?
> After modifying the debian dir, if it works, I should send the git
> patch, correct?
>
> 2) When I run "debuild" it complains because
> opennebula_2.0.1.orig.tar.gz doesn't exist in the parent directory.
> I've downloaded the source code and renamed it, but I don't know if
> that's what I'm supposed to do. maybe there's a script which generates
> the source code?

My building process is really simple :
git clone git+ssh://git.debian.org/git/pkg-opennebula/opennebula.git
cd opennebula/
git-buildpackage --git-builder="debuild"

To be more precise, here is content of each GIT branch :
- remotes/origin/upstream is just in "clean" import of opennebula-2.0.1.tar.gz 
(minus some *.jar files) is described in debian/README.source
- remotes/origin/pristine-tar store some delta files which are applied by git-
buildpackage to always get the same tarball (same md5 + sha256 sums) from GIT 
branch. See [2] for more info on this format.
- remotes/origin/master is our working branch = upstream + debian/ directory. 
You can freely commit to this one.

So during each build, git-buildpackage extract remotes/origin/upstream to 
opennebula_2.0.1.orig and apply pristine-tar to get the same .tar.gz. 
Then it call the x-builder of your choice : debuild or pbuilder/sbuild (for 
clean chroot build).

For each new "upstream" release, I just use git-import-dsc to :
- import tarball in upstream branch
- import binary-delta-diff from pristine-tar in pristine-tar branch
- merge back changes to master branch

> 3) I haven't reached the same error the Ubuntu guys report. In my case
> if I change the version of javahelper (applying the attached patch) it
> works perfectly. I'm trying it in an Ubuntu 10.04 64-bit, are they
> trying it in another release? Maybe it would be best if I ask someone
> at Ubuntu?

I'll setup a clean test env. on my personal box and retry this.

[2] http://manpages.debian.net/cgi-bin/man.cgi?query=pristine-tar

-- 
Damien
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.alioth.debian.org/pipermail/pkg-opennebula-devel/attachments/20101214/ef3f0015/attachment.pgp>