[Pkg-samba-maint] (forw) [Samba] [Announce] Samba 4.0.6 Available for Download

[Ivo De Decker]

Hi,

On Tue, May 21, 2013 at 06:12:58PM +0200, Christian PERRIER wrote:
> That seems to be a good opportunity to document the "merge new
> upstream version" process into git.

First of all, I renamed to samba_4.0_bubulle branch back to samba_4.0, as it
isn't really a private branch.

I updated the gbp.conf to include the filtering options. With these, the
workflow is as follows:


# recompress tarball
gunzip samba-4.0.6.tar.gz
xz samba-4.0.6.tar
# go to git repo
cd $GIT_DIR
# make sure to be on the right branch
git checkout samba_4.0
git-import-orig --upstream-version=4.0.6+dfsg ../samba-4.0.6.tar.xz
# all done :)

> Of course, "git-import-orig" will certainly do the job, but wouldn't
> there be a possibility to "link" to upstream's git and merge the
> difference from there?

Why would you want to do that? That would mix our repo and the upstream one
and make it more difficult to keep track of what originated where. In the
current repo, there is some similarity between certain branch or tag names
that are used in both repos for different things. This would need to be
clarified. Also, we would need a workflow to fix the dfsg repackaging.


Cheers,

Ivo