[Pkg-x2go-devel] Fwd: Re: Bug#609806: nxproxy prepared for build on Alioth

[Jonas Smedegaard]

On 11-06-07 at 09:05pm, Mike Gabriel wrote:
> Hi Reinhard,
> 
> On Di 07 Jun 2011 15:05:05 CEST Reinhard Tartler wrote:
> 
> >On Tue, Jun 07, 2011 at 11:37:48 (CEST), Jonas Smedegaard wrote:
> >
> >>On 11-06-01 at 06:07pm, Mike Gabriel wrote:
> >>>whenever you have time, may you please take a look at the NX 
> >>>packages I have placed on Alioth. With the mail below we have a go 
> >>>from the original package maintainer to co-maintain those packages.
> >>
> >>Sorry for the delay - not holiday, but swamped with work :-/
> >>
> >>It seems the gits lack pristine-tar branch.  I strongly favor 
> >>preserving as much history as possible, especially since we juggle 
> >>across multiple package maintainers and potentially multiple 
> >>upstreams as well.
> >>
> >
> >I have to admit that I'm surprised that you've decided to reimport 
> >Stephane's (final) package instead of updating the branches from 
> >i4git.informatik.uni-erlangen.de. Those branches match the workflow 
> >as proposed by git-buildpackage and contain at least some history.
> 
> I simply differentiate between the Debian packaging and our 
> developmental upstream hosting of NX code. X2go is not NX upstream 
> (though we a couple of weeks ago thought that we would be that as NX 
> seemed to be dead around NXv3).
> 
> Thus I chose the standard way:
> 
>   o take a tarball from upstream
>   o wrap Debian packaging stuff around
>   o (the above two points were actually done by Stéphane for Ubuntu)
>   o start a Git history (pkg-x2go, not upstream X2go) from here
> 
> What history has been lost (does anyone know where Matthew developed
> his packages?) is the history of packaging the NX <=3.2.x stuff for
> Debian...

I do not suggest hunting down development VCS used by Matthew.  I 
suggest to do this:

 a) Bootstrap from upstream pristine source:

 a1) if project exist in Debian with pristine-tar tracking, use
     "git clone ..."

 a2) if project exist in Debian without pristine-tar, use
     "git-import-dscs --debsnap --pristine-tar --sign-tags ..."

 a3) if project does not exist in Debian, use
     "git-import-orig --pristine-tar --sign-tags ..."

 b) Optionally mixin alternative Debian VCS if available:

    Rewrite history to apply upstream source and packaging commits 
    in proper order using "git rebase ..."

    It is tricky to do right, and I often skip it.

 c) Cherry-pick additions from external VCS:

    Prepare each external VCS source as a git (e.g. "git clone ...",
    "git svn clone --stdlayout ..." "git cvsimport" etc.), add each 
    with "git remote add somegit ../somegit", cherry-pick minimal 
    relevant commits onto the master branch, and make sure to remove 
    any temporary local branches before pushing the results.



 - Jonas

-- 
 * Jonas Smedegaard - idealist & Internet-arkitekt
 * Tlf.: +45 40843136  Website: http://dr.jones.dk/

 [x] quote me freely  [ ] ask before reusing  [ ] keep private
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-x2go-devel/attachments/20110607/49ccb1a3/attachment-0001.pgp>