[Pkg-samba-maint] Merging upstream releases

[Andrew Bartlett]

On Sun, 2013-08-11 at 08:23 +0000, Ivo De Decker wrote:
> This is an automated email from the git hooks/post-receive script.
> 
> idd-guest pushed a commit to branch samba_4.0
> in repository samba.
> 
> commit ca433345486e72f8b5fb25c355ad99649406b194
> Author: Ivo De Decker <ivo.dedecker at ugent.be>
> Date:   Sun Aug 11 10:22:25 2013 +0200
> 
>     Update documentation for git repo
> ---
>  debian/README.source |   53 ++++++++++++++++++++++++++++++--------------------
>  1 file changed, 32 insertions(+), 21 deletions(-)
> 
> diff --git a/debian/README.source b/debian/README.source
> index 98e8c36..e878b8d 100644
> --- a/debian/README.source
> +++ b/debian/README.source
> @@ -1,24 +1,35 @@
> +
> +The packaging is kept in git://git.debian.org/git/pkg-samba/samba.git (web
> +interface: http://git.debian.org/?p=pkg-samba/samba.git).
> +
> +The version in unstable is on the 'master' branch, with the corresponding
> +upstream version in the 'upstream' branch (with pristine-tar information in
> +the pristine-tar branch). The packaging for samba version 4.0 is in a separate
> +'samba_4.0' branch, with corresponding 'upstream_4.0' branch.  These should
> +move to master/upstream as soon as samba 4.0 gets into unstable.
> +
> +It should be possible to build the package by just running 'git-buildpackage'.
> +
> +
>  Merging upstream releases
>  =========================
>  
> -$ svn-load -t tags/samba/upstream_${version} \
> -svn+ssh://svn.debian.org/svn/pkg-samba branches/samba/upstream .
> -
> -The svn-load command is in the aptly-named "svn-load" package.  The 
> -above is the simplest use of svn-load to merge a new upstream version
> -into the "upstream" branch and copy it to a per-version tag directory;
> -please see "svn-load --help" for a list of other options that are of
> -interest.  In particular, you may find that the --wc option saves time
> -if you're on a slow connection, and the "-m" option may be needed if
> -files are moved around in the upstream repository and this needs to be
> -indicated to prevent subversion treating this as addition and deletion
> -of unrelated files.
> -
> -Note that this only imports the new upstream version into the branch, it
> -doesn't merge it onto the trunk.  For this, you should go to your
> -(clean) working copy of the trunk and run:
> -
> -$ svn merge \
> -svn+ssh://svn.debian.org/svn/pkg-samba/tags/samba/upstream_{prev_version,new_version}
> -$ svn diff # (to make sure the diff makes sense)
> -$ svn commit -m "merge upstream $version"
> +Importing a new upstream version can be done like this:
> +
> +# 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 :)

If this is the official procedure, can debian/build-orig.sh be updated
to match, or be removed, or something?

Thanks,

-- 
Andrew Bartlett
http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Samba Developer, Catalyst IT                   http://catalyst.net.nz